From 904339370bdd35dd63df104db70aed8ad3de4d83 Mon Sep 17 00:00:00 2001
From: Erwin Ried <1091420+eried@users.noreply.github.com>
Date: Mon, 11 May 2020 14:19:39 +0200
Subject: [PATCH] Some new icons and colors

---
 firmware/application/bitmap.hpp        | 3072 ++++++++++++------------
 firmware/application/ui_navigation.cpp |   16 +-
 firmware/graphics/icon_btle.png        |  Bin 0 -> 174 bytes
 firmware/graphics/icon_camera.png      |  Bin 122 -> 147 bytes
 firmware/graphics/icon_capture.png     |  Bin 145 -> 143 bytes
 firmware/graphics/icon_debug.png       |  Bin 0 -> 175 bytes
 firmware/graphics/icon_ert.png         |  Bin 146 -> 180 bytes
 firmware/graphics/icon_gps_sim.png     |  Bin 0 -> 174 bytes
 firmware/graphics/icon_hackrf.png      |  Bin 133 -> 147 bytes
 firmware/graphics/icon_nrf.png         |  Bin 0 -> 147 bytes
 firmware/graphics/icon_previous.png    |  Bin 131 -> 147 bytes
 firmware/graphics/icon_receivers.png   |  Bin 141 -> 141 bytes
 firmware/graphics/icon_replay.png      |  Bin 145 -> 149 bytes
 firmware/graphics/icon_scanner.png     |  Bin 130 -> 151 bytes
 firmware/graphics/icon_search.png      |  Bin 0 -> 185 bytes
 firmware/graphics/icon_setup.png       |  Bin 108 -> 159 bytes
 firmware/graphics/icon_stealth.png     |  Bin 133 -> 165 bytes
 firmware/graphics/icon_tpms.png        |  Bin 157 -> 183 bytes
 firmware/graphics/icon_transmit.png    |  Bin 152 -> 144 bytes
 firmware/graphics/icon_utilities.png   |  Bin 144 -> 152 bytes
 firmware/graphics/record.png           |  Bin 127 -> 143 bytes
 21 files changed, 1544 insertions(+), 1544 deletions(-)
 create mode 100644 firmware/graphics/icon_btle.png
 create mode 100644 firmware/graphics/icon_debug.png
 create mode 100644 firmware/graphics/icon_gps_sim.png
 create mode 100644 firmware/graphics/icon_nrf.png
 create mode 100644 firmware/graphics/icon_search.png

diff --git a/firmware/application/bitmap.hpp b/firmware/application/bitmap.hpp
index b837d3d2..0ce80219 100644
--- a/firmware/application/bitmap.hpp
+++ b/firmware/application/bitmap.hpp
@@ -29,84 +29,94 @@
 
 namespace ui {
 
-static constexpr uint8_t bitmap_icon_bht_data[] = {
-	0x00, 0x00, 
-	0xE0, 0x07, 
-	0xF8, 0x08, 
-	0x9C, 0x07, 
-	0x0C, 0x00, 
-	0x8E, 0x0A, 
-	0x46, 0x12, 
-	0x26, 0x22, 
-	0x06, 0x02, 
-	0x06, 0x00, 
-	0x06, 0x00, 
-	0x06, 0x00, 
-	0x06, 0x00, 
-	0x06, 0x00, 
-	0x06, 0x00, 
-	0x00, 0x00, 
+static constexpr uint8_t bitmap_bulb_ignore_data[] = {
+	0x00, 0x3C, 0x00, 
+	0x00, 0xC3, 0x00, 
+	0x80, 0x00, 0x01, 
+	0x40, 0x3C, 0x02, 
+	0x20, 0x7E, 0x04, 
+	0x20, 0xE7, 0x04, 
+	0x10, 0xC3, 0x08, 
+	0x10, 0xE3, 0x08, 
+	0x10, 0x70, 0x08, 
+	0x10, 0x38, 0x08, 
+	0x10, 0x18, 0x08, 
+	0x20, 0x18, 0x04, 
+	0x20, 0x00, 0x04, 
+	0x40, 0x18, 0x02, 
+	0x80, 0x18, 0x01, 
+	0x00, 0xC3, 0x00, 
+	0x00, 0xFF, 0x00, 
+	0x00, 0xBD, 0x00, 
+	0x00, 0xC3, 0x00, 
+	0x00, 0xBD, 0x00, 
+	0x00, 0xC3, 0x00, 
+	0x00, 0xBD, 0x00, 
+	0x00, 0x42, 0x00, 
+	0x00, 0x3C, 0x00, 
 };
-static constexpr Bitmap bitmap_icon_bht {
-	{ 16, 16 }, bitmap_icon_bht_data
+static constexpr Bitmap bitmap_bulb_ignore {
+	{ 24, 24 }, bitmap_bulb_ignore_data
 };
 
-static constexpr uint8_t bitmap_icon_sd_data[] = {
-	0x00, 0x00, 
-	0x00, 0x00, 
-	0xC0, 0x1F, 
-	0xE0, 0x1F, 
-	0xF0, 0x1F, 
-	0xF8, 0x1F, 
-	0x98, 0x18, 
-	0xE8, 0x16, 
-	0xC8, 0x16, 
-	0x98, 0x16, 
-	0xB8, 0x16, 
-	0xC8, 0x18, 
-	0xF8, 0x1F, 
-	0xF8, 0x1F, 
-	0x00, 0x00, 
-	0x00, 0x00, 
+static constexpr uint8_t bitmap_bulb_off_data[] = {
+	0x00, 0x3C, 0x00, 
+	0x00, 0xC3, 0x00, 
+	0x80, 0x00, 0x01, 
+	0x40, 0x00, 0x02, 
+	0x20, 0x00, 0x04, 
+	0x20, 0x00, 0x04, 
+	0x10, 0x00, 0x08, 
+	0x10, 0x42, 0x08, 
+	0x10, 0x42, 0x08, 
+	0x10, 0x24, 0x08, 
+	0x10, 0x24, 0x08, 
+	0x20, 0x24, 0x04, 
+	0x20, 0x2C, 0x04, 
+	0x40, 0x34, 0x02, 
+	0x80, 0x3C, 0x01, 
+	0x00, 0xFF, 0x00, 
+	0x00, 0xE3, 0x00, 
+	0x00, 0xBD, 0x00, 
+	0x00, 0xC3, 0x00, 
+	0x00, 0xBD, 0x00, 
+	0x00, 0xC3, 0x00, 
+	0x00, 0xBD, 0x00, 
+	0x00, 0x42, 0x00, 
+	0x00, 0x3C, 0x00, 
 };
-static constexpr Bitmap bitmap_icon_sd {
-	{ 16, 16 }, bitmap_icon_sd_data
+static constexpr Bitmap bitmap_bulb_off {
+	{ 24, 24 }, bitmap_bulb_off_data
 };
 
-static constexpr uint8_t bitmap_sd_card_error_data[] = {
-	0x00, 0x00, 
-	0x00, 0x00, 
-	0xC0, 0x1F, 
-	0xE0, 0x1F, 
-	0xF0, 0x1F, 
-	0xF8, 0x1F, 
-	0xC8, 0x13, 
-	0x98, 0x19, 
-	0x38, 0x1C, 
-	0x78, 0x1E, 
-	0x38, 0x1C, 
-	0x98, 0x19, 
-	0xC8, 0x13, 
-	0xF8, 0x1F, 
-	0x00, 0x00, 
-	0x00, 0x00, 
+static constexpr uint8_t bitmap_bulb_on_data[] = {
+	0x04, 0x3C, 0x20, 
+	0x08, 0xFF, 0x10, 
+	0x90, 0xFF, 0x09, 
+	0xC0, 0xFF, 0x03, 
+	0xE0, 0xFF, 0x07, 
+	0xE0, 0xFF, 0x07, 
+	0xF0, 0xE7, 0x0F, 
+	0xF0, 0xBD, 0x0F, 
+	0xF7, 0xBD, 0xEF, 
+	0xF0, 0xDB, 0x0F, 
+	0xF0, 0xDB, 0x0F, 
+	0xE0, 0xDB, 0x07, 
+	0xE0, 0xCB, 0x07, 
+	0xC0, 0xD3, 0x03, 
+	0x90, 0xCB, 0x09, 
+	0x08, 0xFD, 0x10, 
+	0x04, 0xE3, 0x20, 
+	0x00, 0xBD, 0x00, 
+	0x00, 0xC3, 0x00, 
+	0x00, 0xBD, 0x00, 
+	0x00, 0xC3, 0x00, 
+	0x00, 0xBD, 0x00, 
+	0x00, 0x42, 0x00, 
+	0x00, 0x3C, 0x00, 
 };
-static constexpr Bitmap bitmap_sd_card_error {
-	{ 16, 16 }, bitmap_sd_card_error_data
-};
-
-static constexpr uint8_t bitmap_stripes_data[] = {
-	0xFF, 0x03, 0xC0, 
-	0xFF, 0x01, 0xE0, 
-	0xFF, 0x00, 0xF0, 
-	0x7F, 0x00, 0xF8, 
-	0x3F, 0x00, 0xFC, 
-	0x1F, 0x00, 0xFE, 
-	0x0F, 0x00, 0xFF, 
-	0x07, 0x80, 0xFF, 
-};
-static constexpr Bitmap bitmap_stripes {
-	{ 24, 8 }, bitmap_stripes_data
+static constexpr Bitmap bitmap_bulb_on {
+	{ 24, 24 }, bitmap_bulb_on_data
 };
 
 static constexpr uint8_t bitmap_icon_adsb_data[] = {
@@ -131,264 +141,6 @@ static constexpr Bitmap bitmap_icon_adsb {
 	{ 16, 16 }, bitmap_icon_adsb_data
 };
 
-static constexpr uint8_t bitmap_sd_card_unknown_data[] = {
-	0x00, 0x00, 
-	0x00, 0x00, 
-	0xC0, 0x1F, 
-	0xE0, 0x1F, 
-	0xF0, 0x1F, 
-	0xF8, 0x1F, 
-	0x38, 0x1C, 
-	0x98, 0x19, 
-	0xF8, 0x1C, 
-	0x78, 0x1E, 
-	0x78, 0x1E, 
-	0xF8, 0x1F, 
-	0x78, 0x1E, 
-	0xF8, 0x1F, 
-	0x00, 0x00, 
-	0x00, 0x00, 
-};
-static constexpr Bitmap bitmap_sd_card_unknown {
-	{ 16, 16 }, bitmap_sd_card_unknown_data
-};
-
-static constexpr uint8_t bitmap_icon_lora_data[] = {
-	0xC0, 0x03, 
-	0x30, 0x0C, 
-	0x00, 0x00, 
-	0xC0, 0x03, 
-	0x00, 0x00, 
-	0xC0, 0x03, 
-	0x60, 0x06, 
-	0x60, 0x06, 
-	0x60, 0x06, 
-	0x60, 0x06, 
-	0xC0, 0x03, 
-	0x00, 0x00, 
-	0xC0, 0x03, 
-	0x00, 0x00, 
-	0x30, 0x0C, 
-	0xC0, 0x03, 
-};
-static constexpr Bitmap bitmap_icon_lora {
-	{ 16, 16 }, bitmap_icon_lora_data
-};
-
-static constexpr uint8_t bitmap_play_data[] = {
-	0x00, 0x00, 
-	0x00, 0x00, 
-	0x0C, 0x00, 
-	0x3C, 0x00, 
-	0xFC, 0x00, 
-	0xFC, 0x03, 
-	0xFC, 0x0F, 
-	0xFC, 0x3F, 
-	0xFC, 0x3F, 
-	0xFC, 0x0F, 
-	0xFC, 0x03, 
-	0xFC, 0x00, 
-	0x3C, 0x00, 
-	0x0C, 0x00, 
-	0x00, 0x00, 
-	0x00, 0x00, 
-};
-static constexpr Bitmap bitmap_play {
-	{ 16, 16 }, bitmap_play_data
-};
-
-static constexpr uint8_t bitmap_icon_stealth_data[] = {
-	0x00, 0x00, 
-	0x00, 0x00, 
-	0x30, 0x1C, 
-	0xFC, 0x3F, 
-	0xFE, 0x7F, 
-	0xFE, 0x7F, 
-	0xC6, 0x63, 
-	0x86, 0x61, 
-	0xCE, 0x73, 
-	0xFC, 0x3F, 
-	0x7C, 0x3E, 
-	0x38, 0x1C, 
-	0x08, 0x00, 
-	0x08, 0x00, 
-	0x08, 0x00, 
-	0x00, 0x00, 
-};
-static constexpr Bitmap bitmap_icon_stealth {
-	{ 16, 16 }, bitmap_icon_stealth_data
-};
-
-static constexpr uint8_t bitmap_icon_sleep_data[] = {
-	0x00, 0x00, 
-	0x00, 0x00, 
-	0x00, 0x04, 
-	0x00, 0x08, 
-	0x00, 0x18, 
-	0x00, 0x18, 
-	0x00, 0x38, 
-	0x00, 0x3C, 
-	0x00, 0x3C, 
-	0x00, 0x3E, 
-	0x84, 0x1F, 
-	0xF8, 0x1F, 
-	0xF0, 0x0F, 
-	0xC0, 0x03, 
-	0x00, 0x00, 
-	0x00, 0x00, 
-};
-static constexpr Bitmap bitmap_icon_sleep {
-	{ 16, 16 }, bitmap_icon_sleep_data
-};
-
-static constexpr uint8_t bitmap_sig_cw_data[] = {
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0xFE, 0xFF, 0xFF, 0x7F, 
-	0xFE, 0xFF, 0xFF, 0x7F, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-};
-static constexpr Bitmap bitmap_sig_cw {
-	{ 32, 32 }, bitmap_sig_cw_data
-};
-
-static constexpr uint8_t bitmap_icon_speaker_data[] = {
-	0x00, 0x00, 
-	0x00, 0x20, 
-	0x00, 0x30, 
-	0x00, 0x38, 
-	0x00, 0x3C, 
-	0xDC, 0x3E, 
-	0xDC, 0x3F, 
-	0xDC, 0x3F, 
-	0xDC, 0x3F, 
-	0xDC, 0x3F, 
-	0xDC, 0x3E, 
-	0x00, 0x3C, 
-	0x00, 0x38, 
-	0x00, 0x30, 
-	0x00, 0x20, 
-	0x00, 0x00, 
-};
-static constexpr Bitmap bitmap_icon_speaker {
-	{ 16, 16 }, bitmap_icon_speaker_data
-};
-
-static constexpr uint8_t bitmap_icon_playdead_data[] = {
-	0x80, 0x01, 
-	0x80, 0x01, 
-	0xE0, 0x07, 
-	0xE0, 0x07, 
-	0x80, 0x01, 
-	0x80, 0x01, 
-	0x80, 0x01, 
-	0xE0, 0x07, 
-	0xB0, 0x0A, 
-	0x50, 0x0D, 
-	0xA8, 0x1A, 
-	0x58, 0x15, 
-	0xAC, 0x2A, 
-	0x54, 0x35, 
-	0x04, 0x20, 
-	0xF8, 0x1F, 
-};
-static constexpr Bitmap bitmap_icon_playdead {
-	{ 16, 16 }, bitmap_icon_playdead_data
-};
-
-static constexpr uint8_t bitmap_icon_fox_data[] = {
-	0x18, 0x18, 
-	0x28, 0x14, 
-	0x68, 0x16, 
-	0x68, 0x16, 
-	0xC8, 0x13, 
-	0x88, 0x11, 
-	0x04, 0x20, 
-	0x24, 0x24, 
-	0x22, 0x44, 
-	0x01, 0x80, 
-	0x06, 0x60, 
-	0x98, 0x19, 
-	0x20, 0x04, 
-	0x40, 0x02, 
-	0x80, 0x01, 
-	0x00, 0x00, 
-};
-static constexpr Bitmap bitmap_icon_fox {
-	{ 16, 16 }, bitmap_icon_fox_data
-};
-
-static constexpr uint8_t bitmap_record_data[] = {
-	0x00, 0x00, 
-	0x00, 0x00, 
-	0xC0, 0x03, 
-	0xF0, 0x0F, 
-	0xF8, 0x1F, 
-	0x18, 0x1C, 
-	0x9C, 0x39, 
-	0x9C, 0x39, 
-	0x1C, 0x3C, 
-	0x9C, 0x3C, 
-	0x98, 0x19, 
-	0xF8, 0x1F, 
-	0xF0, 0x0F, 
-	0xC0, 0x03, 
-	0x00, 0x00, 
-	0x00, 0x00, 
-};
-static constexpr Bitmap bitmap_record {
-	{ 16, 16 }, bitmap_record_data
-};
-
-static constexpr uint8_t bitmap_icon_file_text_data[] = {
-	0x00, 0x20, 
-	0x00, 0x30, 
-	0x00, 0x38, 
-	0x00, 0x38, 
-	0x00, 0x34, 
-	0x00, 0x32, 
-	0x00, 0x31, 
-	0x80, 0x30, 
-	0xC0, 0x30, 
-	0xE0, 0x3F, 
-	0x30, 0x30, 
-	0x18, 0x30, 
-	0x0C, 0x30, 
-	0x0E, 0x78, 
-	0x1F, 0xFC, 
-	0x00, 0x00, 
-};
-static constexpr Bitmap bitmap_icon_file_text {
-	{ 16, 16 }, bitmap_icon_file_text_data
-};
-
 static constexpr uint8_t bitmap_icon_ais_data[] = {
 	0x00, 0x01, 
 	0x80, 0x01, 
@@ -411,512 +163,48 @@ static constexpr Bitmap bitmap_icon_ais {
 	{ 16, 16 }, bitmap_icon_ais_data
 };
 
-static constexpr uint8_t bitmap_sig_square_data[] = {
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0xFE, 0x83, 0xFF, 0x60, 
-	0xFE, 0x83, 0xFF, 0x60, 
-	0x06, 0x83, 0xC1, 0x60, 
-	0x06, 0x83, 0xC1, 0x60, 
-	0x06, 0x83, 0xC1, 0x60, 
-	0x06, 0x83, 0xC1, 0x60, 
-	0x06, 0x83, 0xC1, 0x60, 
-	0x06, 0x83, 0xC1, 0x60, 
-	0x06, 0x83, 0xC1, 0x60, 
-	0x06, 0x83, 0xC1, 0x60, 
-	0x06, 0x83, 0xC1, 0x60, 
-	0x06, 0x83, 0xC1, 0x60, 
-	0x06, 0x83, 0xC1, 0x60, 
-	0x06, 0x83, 0xC1, 0x60, 
-	0x06, 0xFF, 0xC1, 0x7F, 
-	0x06, 0xFF, 0xC1, 0x7F, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-};
-static constexpr Bitmap bitmap_sig_square {
-	{ 32, 32 }, bitmap_sig_square_data
-};
-
-static constexpr uint8_t bitmap_icon_nuoptix_data[] = {
-	0x80, 0x01, 
-	0x80, 0x01, 
-	0x40, 0x02, 
-	0x40, 0x1A, 
-	0x40, 0x1A, 
-	0x20, 0x0C, 
-	0x20, 0x0F, 
-	0x20, 0x1E, 
-	0x10, 0x0E, 
-	0x10, 0x0B, 
-	0x10, 0x0B, 
-	0xF8, 0x1F, 
-	0xF8, 0x1F, 
-	0xF8, 0x1F, 
-	0xFC, 0x3F, 
-	0xFC, 0x3F, 
-};
-static constexpr Bitmap bitmap_icon_nuoptix {
-	{ 16, 16 }, bitmap_icon_nuoptix_data
-};
-
-static constexpr uint8_t bitmap_icon_lge_data[] = {
-	0x00, 0x00, 
-	0x80, 0x00, 
-	0xA4, 0x12, 
-	0xA8, 0x0A, 
-	0xD0, 0x05, 
-	0xEC, 0x1B, 
-	0xF0, 0x07, 
-	0xFE, 0xFF, 
-	0xF0, 0x07, 
-	0xEC, 0x1B, 
-	0xD0, 0x05, 
-	0xA8, 0x0A, 
-	0xA4, 0x12, 
-	0x80, 0x00, 
-	0x00, 0x00, 
-	0x00, 0x00, 
-};
-static constexpr Bitmap bitmap_icon_lge {
-	{ 16, 16 }, bitmap_icon_lge_data
-};
-
-static constexpr uint8_t bitmap_icon_file_iq_data[] = {
-	0x98, 0x00, 
-	0x24, 0x06, 
-	0xA4, 0x08, 
-	0x34, 0x10, 
-	0xB8, 0x20, 
-	0x20, 0x20, 
-	0x80, 0x00, 
-	0xD5, 0x55, 
-	0x80, 0x00, 
-	0x02, 0x70, 
-	0x82, 0x20, 
-	0x04, 0x20, 
-	0x88, 0x20, 
-	0x30, 0x70, 
-	0x80, 0x00, 
-	0x00, 0x00, 
-};
-static constexpr Bitmap bitmap_icon_file_iq {
-	{ 16, 16 }, bitmap_icon_file_iq_data
-};
-
-static constexpr uint8_t bitmap_icon_closecall_data[] = {
-	0x00, 0x00, 
-	0x00, 0x10, 
-	0x00, 0x38, 
-	0x00, 0x7C, 
-	0x00, 0x00, 
-	0x3E, 0x00, 
-	0xE3, 0x00, 
-	0x80, 0x01, 
-	0x1C, 0x03, 
-	0x22, 0x02, 
-	0x41, 0x06, 
-	0x88, 0x04, 
-	0x9C, 0x04, 
-	0x88, 0x04, 
-	0x41, 0x06, 
-	0x22, 0x02, 
-};
-static constexpr Bitmap bitmap_icon_closecall {
-	{ 16, 16 }, bitmap_icon_closecall_data
-};
-
-static constexpr uint8_t bitmap_icon_script_data[] = {
-	0xFC, 0x07, 
-	0xFA, 0x0F, 
-	0x19, 0x1A, 
-	0xF9, 0x1F, 
-	0x1E, 0x1D, 
-	0xF8, 0x1F, 
-	0x98, 0x1F, 
-	0xF8, 0x1F, 
-	0xF8, 0x1F, 
-	0x08, 0x14, 
-	0xF8, 0x1F, 
-	0x48, 0x1E, 
-	0xF8, 0xFF, 
-	0x78, 0x80, 
-	0x30, 0x40, 
-	0xE0, 0x3F, 
-};
-static constexpr Bitmap bitmap_icon_script {
-	{ 16, 16 }, bitmap_icon_script_data
-};
-
-static constexpr uint8_t bitmap_icon_pocsag_data[] = {
+static constexpr uint8_t bitmap_icon_aprs_data[] = {
 	0x00, 0x00, 
 	0x00, 0x00, 
 	0x00, 0x00, 
-	0xFC, 0x3F, 
-	0xFE, 0x7F, 
-	0x02, 0x40, 
-	0xBA, 0x45, 
-	0x02, 0x40, 
-	0xFE, 0x7F, 
-	0xFE, 0x7F, 
-	0x92, 0x7C, 
-	0x92, 0x7C, 
-	0xFC, 0x3F, 
-	0x00, 0x00, 
-	0x00, 0x00, 
-	0x00, 0x00, 
-};
-static constexpr Bitmap bitmap_icon_pocsag {
-	{ 16, 16 }, bitmap_icon_pocsag_data
-};
-
-static constexpr uint8_t bitmap_icon_tetra_data[] = {
-	0xE0, 0x0F, 
-	0x18, 0x38, 
-	0xE4, 0x67, 
-	0x7E, 0xCE, 
-	0xC7, 0xCC, 
-	0x00, 0x00, 
-	0xFF, 0x4F, 
-	0xBA, 0xB2, 
-	0x9A, 0xEE, 
-	0xBA, 0xB2, 
-	0x00, 0x00, 
-	0x3B, 0xE3, 
-	0x73, 0x7E, 
-	0xC6, 0x27, 
-	0x1C, 0x18, 
-	0xF0, 0x07, 
-};
-static constexpr Bitmap bitmap_icon_tetra {
-	{ 16, 16 }, bitmap_icon_tetra_data
-};
-
-static constexpr uint8_t bitmap_icon_lcr_data[] = {
-	0x0C, 0x00, 
-	0xFF, 0x7F, 
-	0x01, 0x80, 
-	0xC1, 0x9B, 
-	0xFF, 0x7F, 
-	0x0C, 0x00, 
-	0xFF, 0x7F, 
-	0x01, 0x80, 
-	0xC1, 0x9D, 
-	0xFF, 0x7F, 
-	0x0C, 0x00, 
-	0x0C, 0x00, 
-	0x0C, 0x00, 
-	0x0C, 0x00, 
-	0x0C, 0x00, 
-	0x0C, 0x00, 
-};
-static constexpr Bitmap bitmap_icon_lcr {
-	{ 16, 16 }, bitmap_icon_lcr_data
-};
-
-static constexpr uint8_t bitmap_more_data[] = {
-	0x18, 
-	0x18, 
-	0x18, 
-	0x18, 
-	0xFF, 
-	0x7E, 
-	0x3C, 
-	0x18, 
-};
-static constexpr Bitmap bitmap_more {
-	{ 8, 8 }, bitmap_more_data
-};
-
-static constexpr uint8_t bitmap_icon_transmit_data[] = {
-	0xC0, 0x10, 
-	0x00, 0x21, 
-	0x1C, 0x22, 
-	0x63, 0x42, 
-	0x5D, 0x44, 
-	0xA2, 0x44, 
-	0xAA, 0x44, 
-	0xAA, 0x44, 
-	0x5D, 0x44, 
-	0x6B, 0x42, 
-	0x1C, 0x22, 
-	0x1C, 0x21, 
-	0xDD, 0x10, 
-	0x3E, 0x08, 
-	0x2A, 0x04, 
-	0x2A, 0x03, 
-};
-static constexpr Bitmap bitmap_icon_transmit {
-	{ 16, 16 }, bitmap_icon_transmit_data
-};
-
-static constexpr uint8_t bitmap_icon_freqman_data[] = {
-	0x00, 0x00, 
-	0x0E, 0x00, 
-	0x02, 0x00, 
-	0xE6, 0x7F, 
-	0x02, 0x00, 
-	0x00, 0x00, 
-	0x0E, 0x00, 
-	0x02, 0x00, 
-	0xE6, 0x7B, 
-	0x02, 0x00, 
-	0x00, 0x00, 
-	0x0E, 0x00, 
-	0x02, 0x00, 
-	0x66, 0x7F, 
-	0x02, 0x00, 
-	0x00, 0x00, 
-};
-static constexpr Bitmap bitmap_icon_freqman {
-	{ 16, 16 }, bitmap_icon_freqman_data
-};
-
-static constexpr uint8_t bitmap_icon_clk_int_data[] = {
-	0x00, 
-	0x00, 
-	0xDC, 
-	0x54, 
-	0x54, 
-	0x54, 
-	0x54, 
-	0x76, 
-	0x00, 
-	0x44, 
-	0x6C, 
-	0x38, 
-	0x38, 
-	0x6C, 
-	0x44, 
-	0x00, 
-};
-static constexpr Bitmap bitmap_icon_clk_int {
-	{ 8, 16 }, bitmap_icon_clk_int_data
-};
-
-static constexpr uint8_t bitmap_sd_card_ok_data[] = {
-	0x00, 0x00, 
-	0x00, 0x00, 
-	0xC0, 0x1F, 
-	0xE0, 0x1F, 
-	0xF0, 0x1F, 
-	0xF8, 0x1F, 
-	0xF8, 0x1F, 
-	0x98, 0x15, 
-	0x68, 0x19, 
-	0x68, 0x1D, 
-	0x68, 0x19, 
-	0x98, 0x15, 
-	0xF8, 0x1F, 
-	0xF8, 0x1F, 
-	0x00, 0x00, 
-	0x00, 0x00, 
-};
-static constexpr Bitmap bitmap_sd_card_ok {
-	{ 16, 16 }, bitmap_sd_card_ok_data
-};
-
-static constexpr uint8_t bitmap_icon_scanner_data[] = {
-	0x00, 0x00, 
-	0x80, 0x3F, 
-	0x00, 0x11, 
-	0x00, 0x0A, 
-	0x00, 0x04, 
-	0x00, 0x00, 
-	0x00, 0x00, 
-	0x44, 0x44, 
-	0x44, 0x44, 
-	0x00, 0x04, 
-	0x00, 0x04, 
-	0x00, 0x04, 
-	0x00, 0x0A, 
-	0x00, 0x0A, 
-	0xFF, 0xF1, 
-	0x00, 0x00, 
-};
-static constexpr Bitmap bitmap_icon_scanner {
-	{ 16, 16 }, bitmap_icon_scanner_data
-};
-
-static constexpr uint8_t bitmap_icon_microphone_data[] = {
-	0xC0, 0x03, 
-	0xA0, 0x06, 
-	0x60, 0x05, 
-	0xE0, 0x07, 
-	0xEC, 0x37, 
-	0xEC, 0x37, 
-	0xE8, 0x17, 
-	0xE8, 0x17, 
-	0xE8, 0x17, 
-	0xC8, 0x13, 
-	0x18, 0x18, 
 	0xF0, 0x0F, 
-	0xC0, 0x03, 
-	0x80, 0x01, 
-	0x80, 0x01, 
-	0xC0, 0x03, 
+	0x4C, 0x32, 
+	0xFE, 0x7F, 
+	0x25, 0xA4, 
+	0x25, 0xA4, 
+	0xFF, 0xFF, 
+	0x25, 0xA4, 
+	0x25, 0xA4, 
+	0xFE, 0x7F, 
+	0x4C, 0x32, 
+	0xF0, 0x0F, 
+	0x00, 0x00, 
+	0x00, 0x00, 
 };
-static constexpr Bitmap bitmap_icon_microphone {
-	{ 16, 16 }, bitmap_icon_microphone_data
+static constexpr Bitmap bitmap_icon_aprs {
+	{ 16, 16 }, bitmap_icon_aprs_data
 };
 
-static constexpr uint8_t bitmap_icon_notepad_data[] = {
+static constexpr uint8_t bitmap_icon_bht_data[] = {
+	0x00, 0x00, 
+	0xE0, 0x07, 
+	0xF8, 0x08, 
+	0x9C, 0x07, 
 	0x0C, 0x00, 
-	0x1E, 0x00, 
-	0x2F, 0x00, 
-	0x47, 0x00, 
-	0xE2, 0x00, 
-	0xD4, 0x01, 
-	0xB8, 0x03, 
-	0x70, 0x07, 
-	0xE0, 0x0E, 
-	0xC0, 0x1D, 
-	0x80, 0x3B, 
-	0x00, 0x4F, 
-	0x00, 0x46, 
-	0x00, 0x84, 
-	0x00, 0xD8, 
-	0x00, 0xE0, 
-};
-static constexpr Bitmap bitmap_icon_notepad {
-	{ 16, 16 }, bitmap_icon_notepad_data
-};
-
-static constexpr uint8_t bitmap_icon_sonde_data[] = {
-	0xE0, 0x03, 
-	0x90, 0x07, 
-	0xE8, 0x0F, 
-	0xF8, 0x0F, 
-	0xF8, 0x0F, 
-	0xF0, 0x07, 
-	0xF0, 0x07, 
-	0xE0, 0x03, 
-	0xE0, 0x03, 
-	0xC0, 0x01, 
-	0xC0, 0x01, 
-	0x80, 0x00, 
-	0x80, 0x00, 
-	0x80, 0x02, 
-	0xC0, 0x01, 
-	0xC0, 0x01, 
-};
-static constexpr Bitmap bitmap_icon_sonde {
-	{ 16, 16 }, bitmap_icon_sonde_data
-};
-
-static constexpr uint8_t bitmap_icon_setup_data[] = {
-	0x00, 0x00, 
-	0x18, 0x18, 
-	0x18, 0x7E, 
-	0x18, 0x7E, 
-	0x18, 0x7E, 
-	0x18, 0x42, 
-	0x18, 0x42, 
-	0x18, 0x42, 
-	0x18, 0x18, 
-	0x7E, 0x18, 
-	0x7E, 0x18, 
-	0x7E, 0x18, 
-	0x42, 0x18, 
-	0x42, 0x18, 
-	0x42, 0x18, 
-	0x18, 0x18, 
-};
-static constexpr Bitmap bitmap_icon_setup {
-	{ 16, 16 }, bitmap_icon_setup_data
-};
-
-static constexpr uint8_t bitmap_sig_saw_down_data[] = {
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x0E, 0x80, 0x00, 0x60, 
-	0x1E, 0x80, 0x01, 0x60, 
-	0x3E, 0x80, 0x03, 0x60, 
-	0x76, 0x80, 0x07, 0x60, 
-	0xE6, 0x80, 0x0F, 0x60, 
-	0xC6, 0x81, 0x1D, 0x60, 
-	0x86, 0x83, 0x39, 0x60, 
-	0x06, 0x87, 0x71, 0x60, 
-	0x06, 0x8E, 0xE1, 0x60, 
-	0x06, 0x9C, 0xC1, 0x61, 
-	0x06, 0xB8, 0x81, 0x63, 
-	0x06, 0xF0, 0x01, 0x67, 
-	0x06, 0xE0, 0x01, 0x6E, 
-	0x06, 0xC0, 0x01, 0x7C, 
-	0x06, 0x80, 0x01, 0x78, 
-	0x06, 0x00, 0x01, 0x70, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-};
-static constexpr Bitmap bitmap_sig_saw_down {
-	{ 32, 32 }, bitmap_sig_saw_down_data
-};
-
-static constexpr uint8_t bitmap_icon_rds_data[] = {
-	0x00, 0x00, 
-	0x00, 0x00, 
-	0x00, 0x00, 
-	0x00, 0x00, 
-	0x3C, 0x3C, 
-	0x7E, 0x7E, 
-	0x67, 0xE7, 
-	0x83, 0xC3, 
-	0xC7, 0xE1, 
-	0xFD, 0xBC, 
-	0x42, 0x42, 
-	0x3C, 0x3C, 
-	0x00, 0x00, 
-	0x00, 0x00, 
-	0x00, 0x00, 
+	0x8E, 0x0A, 
+	0x46, 0x12, 
+	0x26, 0x22, 
+	0x06, 0x02, 
+	0x06, 0x00, 
+	0x06, 0x00, 
+	0x06, 0x00, 
+	0x06, 0x00, 
+	0x06, 0x00, 
+	0x06, 0x00, 
 	0x00, 0x00, 
 };
-static constexpr Bitmap bitmap_icon_rds {
-	{ 16, 16 }, bitmap_icon_rds_data
-};
-
-static constexpr uint8_t bitmap_icon_keyfob_data[] = {
-	0x30, 0x00, 
-	0x30, 0x00, 
-	0x30, 0x00, 
-	0x30, 0x00, 
-	0x30, 0x00, 
-	0x30, 0x00, 
-	0xFC, 0x00, 
-	0xCE, 0x01, 
-	0x86, 0x01, 
-	0xFE, 0x01, 
-	0x86, 0x31, 
-	0x86, 0x49, 
-	0xCE, 0x87, 
-	0xFC, 0x84, 
-	0xFC, 0x4B, 
-	0x78, 0x30, 
-};
-static constexpr Bitmap bitmap_icon_keyfob {
-	{ 16, 16 }, bitmap_icon_keyfob_data
+static constexpr Bitmap bitmap_icon_bht {
+	{ 16, 16 }, bitmap_icon_bht_data
 };
 
 static constexpr uint8_t bitmap_icon_biast_off_data[] = {
@@ -963,100 +251,136 @@ static constexpr Bitmap bitmap_icon_biast_on {
 	{ 16, 16 }, bitmap_icon_biast_on_data
 };
 
-static constexpr uint8_t bitmap_icon_previous_data[] = {
-	0x00, 0x00, 
-	0x00, 0x00, 
+static constexpr uint8_t bitmap_icon_btle_data[] = {
 	0xE0, 0x03, 
-	0x10, 0x03, 
-	0x88, 0x01, 
-	0xC4, 0x00, 
-	0xE2, 0x3F, 
-	0x01, 0x20, 
-	0x01, 0x20, 
-	0xE3, 0x3F, 
-	0xC6, 0x3F, 
-	0x8C, 0x00, 
-	0x18, 0x01, 
-	0xF0, 0x03, 
+	0x30, 0x07, 
+	0x38, 0x0E, 
+	0x3C, 0x1C, 
+	0x24, 0x19, 
+	0x0C, 0x13, 
+	0x1C, 0x19, 
+	0x3C, 0x1C, 
+	0x3C, 0x1C, 
+	0x1C, 0x19, 
+	0x0C, 0x13, 
+	0x24, 0x19, 
+	0x3C, 0x1C, 
+	0x38, 0x0E, 
+	0x30, 0x07, 
 	0xE0, 0x03, 
-	0x00, 0x00, 
 };
-static constexpr Bitmap bitmap_icon_previous {
-	{ 16, 16 }, bitmap_icon_previous_data
+static constexpr Bitmap bitmap_icon_btle {
+	{ 16, 16 }, bitmap_icon_btle_data
 };
 
-static constexpr uint8_t bitmap_icon_cwgen_data[] = {
-	0x00, 0x00, 
-	0x00, 0x00, 
-	0xC0, 0xC0, 
-	0xE0, 0xE1, 
-	0x20, 0x21, 
-	0x21, 0x21, 
-	0x21, 0x21, 
-	0x33, 0x33, 
-	0x33, 0x33, 
-	0x12, 0x12, 
-	0x12, 0x12, 
-	0x12, 0x12, 
-	0x1E, 0x1E, 
-	0x0C, 0x0C, 
-	0x00, 0x00, 
+static constexpr uint8_t bitmap_icon_burger_data[] = {
+	0xE0, 0x07, 
+	0x58, 0x18, 
+	0x04, 0x25, 
+	0x12, 0x40, 
+	0x85, 0x90, 
+	0x21, 0x84, 
+	0x01, 0x80, 
+	0x06, 0x60, 
+	0xFE, 0x7F, 
+	0x0E, 0x78, 
+	0x1F, 0xFC, 
+	0x39, 0x9F, 
+	0xC3, 0xC0, 
+	0x0E, 0x70, 
+	0xF8, 0x1F, 
 	0x00, 0x00, 
 };
-static constexpr Bitmap bitmap_icon_cwgen {
-	{ 16, 16 }, bitmap_icon_cwgen_data
+static constexpr Bitmap bitmap_icon_burger {
+	{ 16, 16 }, bitmap_icon_burger_data
 };
 
-static constexpr uint8_t bitmap_bulb_on_data[] = {
-	0x04, 0x3C, 0x20, 
-	0x08, 0xFF, 0x10, 
-	0x90, 0xFF, 0x09, 
-	0xC0, 0xFF, 0x03, 
-	0xE0, 0xFF, 0x07, 
-	0xE0, 0xFF, 0x07, 
-	0xF0, 0xE7, 0x0F, 
-	0xF0, 0xBD, 0x0F, 
-	0xF7, 0xBD, 0xEF, 
-	0xF0, 0xDB, 0x0F, 
-	0xF0, 0xDB, 0x0F, 
-	0xE0, 0xDB, 0x07, 
-	0xE0, 0xCB, 0x07, 
-	0xC0, 0xD3, 0x03, 
-	0x90, 0xCB, 0x09, 
-	0x08, 0xFD, 0x10, 
-	0x04, 0xE3, 0x20, 
-	0x00, 0xBD, 0x00, 
-	0x00, 0xC3, 0x00, 
-	0x00, 0xBD, 0x00, 
-	0x00, 0xC3, 0x00, 
-	0x00, 0xBD, 0x00, 
-	0x00, 0x42, 0x00, 
-	0x00, 0x3C, 0x00, 
-};
-static constexpr Bitmap bitmap_bulb_on {
-	{ 24, 24 }, bitmap_bulb_on_data
-};
-
-static constexpr uint8_t bitmap_icon_receivers_data[] = {
-	0xC0, 0x07, 
-	0x30, 0x18, 
-	0x10, 0x10, 
-	0x88, 0x23, 
-	0x48, 0x24, 
-	0x40, 0x24, 
-	0x80, 0x10, 
-	0x80, 0x10, 
-	0xC0, 0x08, 
-	0xE0, 0x08, 
-	0x60, 0x04, 
-	0x08, 0x04, 
-	0x08, 0x02, 
-	0x10, 0x01, 
-	0xE0, 0x00, 
+static constexpr uint8_t bitmap_icon_camera_data[] = {
+	0x00, 0x00, 
+	0xE0, 0x07, 
+	0xF0, 0x0F, 
+	0xFE, 0x7F, 
+	0x3F, 0xFC, 
+	0xDF, 0xFB, 
+	0xEF, 0xF7, 
+	0xEF, 0xF7, 
+	0xEF, 0xF7, 
+	0xEF, 0xF7, 
+	0xDF, 0xFB, 
+	0x3F, 0xFC, 
+	0xFF, 0xFF, 
+	0xFE, 0x7F, 
+	0x00, 0x00, 
 	0x00, 0x00, 
 };
-static constexpr Bitmap bitmap_icon_receivers {
-	{ 16, 16 }, bitmap_icon_receivers_data
+static constexpr Bitmap bitmap_icon_camera {
+	{ 16, 16 }, bitmap_icon_camera_data
+};
+
+static constexpr uint8_t bitmap_icon_capture_data[] = {
+	0xE0, 0x07, 
+	0xF8, 0x1F, 
+	0xFC, 0x3F, 
+	0xFE, 0x7F, 
+	0xFE, 0x7F, 
+	0xFF, 0xFF, 
+	0xFF, 0xFF, 
+	0xFF, 0xFF, 
+	0xFF, 0xFF, 
+	0xFF, 0xFF, 
+	0xFF, 0xFF, 
+	0xFE, 0x7F, 
+	0xFE, 0x7F, 
+	0xFC, 0x3F, 
+	0xF8, 0x1F, 
+	0xE0, 0x07, 
+};
+static constexpr Bitmap bitmap_icon_capture {
+	{ 16, 16 }, bitmap_icon_capture_data
+};
+
+static constexpr uint8_t bitmap_icon_clk_ext_data[] = {
+	0x00, 
+	0x00, 
+	0xDC, 
+	0x54, 
+	0x54, 
+	0x54, 
+	0x54, 
+	0x76, 
+	0x00, 
+	0x10, 
+	0x38, 
+	0x7C, 
+	0x10, 
+	0x10, 
+	0x10, 
+	0x00, 
+};
+static constexpr Bitmap bitmap_icon_clk_ext {
+	{ 8, 16 }, bitmap_icon_clk_ext_data
+};
+
+static constexpr uint8_t bitmap_icon_clk_int_data[] = {
+	0x00, 
+	0x00, 
+	0xDC, 
+	0x54, 
+	0x54, 
+	0x54, 
+	0x54, 
+	0x76, 
+	0x00, 
+	0x44, 
+	0x6C, 
+	0x38, 
+	0x38, 
+	0x6C, 
+	0x44, 
+	0x00, 
+};
+static constexpr Bitmap bitmap_icon_clk_int {
+	{ 8, 16 }, bitmap_icon_clk_int_data
 };
 
 static constexpr uint8_t bitmap_icon_codetx_data[] = {
@@ -1081,86 +405,70 @@ static constexpr Bitmap bitmap_icon_codetx {
 	{ 16, 16 }, bitmap_icon_codetx_data
 };
 
-static constexpr uint8_t bitmap_stop_data[] = {
+static constexpr uint8_t bitmap_icon_cwgen_data[] = {
 	0x00, 0x00, 
 	0x00, 0x00, 
-	0xFC, 0x3F, 
-	0xFC, 0x3F, 
-	0xFC, 0x3F, 
-	0xFC, 0x3F, 
-	0xFC, 0x3F, 
-	0xFC, 0x3F, 
-	0xFC, 0x3F, 
-	0xFC, 0x3F, 
-	0xFC, 0x3F, 
-	0xFC, 0x3F, 
-	0xFC, 0x3F, 
-	0xFC, 0x3F, 
+	0xC0, 0xC0, 
+	0xE0, 0xE1, 
+	0x20, 0x21, 
+	0x21, 0x21, 
+	0x21, 0x21, 
+	0x33, 0x33, 
+	0x33, 0x33, 
+	0x12, 0x12, 
+	0x12, 0x12, 
+	0x12, 0x12, 
+	0x1E, 0x1E, 
+	0x0C, 0x0C, 
 	0x00, 0x00, 
 	0x00, 0x00, 
 };
-static constexpr Bitmap bitmap_stop {
-	{ 16, 16 }, bitmap_stop_data
+static constexpr Bitmap bitmap_icon_cwgen {
+	{ 16, 16 }, bitmap_icon_cwgen_data
 };
 
-static constexpr uint8_t bitmap_sig_saw_up_data[] = {
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x06, 0x00, 0x01, 0x70, 
-	0x06, 0x80, 0x01, 0x78, 
-	0x06, 0xC0, 0x01, 0x7C, 
-	0x06, 0xE0, 0x01, 0x6E, 
-	0x06, 0xF0, 0x01, 0x67, 
-	0x06, 0xB8, 0x81, 0x63, 
-	0x06, 0x9C, 0xC1, 0x61, 
-	0x06, 0x8E, 0xE1, 0x60, 
-	0x06, 0x87, 0x71, 0x60, 
-	0x86, 0x83, 0x39, 0x60, 
-	0xC6, 0x81, 0x1D, 0x60, 
-	0xE6, 0x80, 0x0F, 0x60, 
-	0x76, 0x80, 0x07, 0x60, 
-	0x3E, 0x80, 0x03, 0x60, 
-	0x1E, 0x80, 0x01, 0x60, 
-	0x0E, 0x80, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
+static constexpr uint8_t bitmap_icon_debug_data[] = {
+	0xFE, 0x03, 
+	0x02, 0x07, 
+	0x2A, 0x0D, 
+	0x52, 0x0F, 
+	0x2A, 0x08, 
+	0x52, 0x09, 
+	0xAA, 0x0A, 
+	0x52, 0x09, 
+	0xAA, 0x0A, 
+	0x52, 0x01, 
+	0xAA, 0x12, 
+	0x02, 0x18, 
+	0x02, 0xFC, 
+	0x02, 0x18, 
+	0xFE, 0x13, 
+	0x00, 0x00, 
 };
-static constexpr Bitmap bitmap_sig_saw_up {
-	{ 32, 32 }, bitmap_sig_saw_up_data
+static constexpr Bitmap bitmap_icon_debug {
+	{ 16, 16 }, bitmap_icon_debug_data
 };
 
-static constexpr uint8_t bitmap_rssipwm_data[] = {
-	0x00, 0x00, 0x00, 
-	0x8F, 0xE7, 0x7D, 
-	0x51, 0x10, 0x10, 
-	0x51, 0x10, 0x10, 
-	0x8F, 0xE3, 0x10, 
-	0x09, 0x04, 0x11, 
-	0x11, 0x04, 0x11, 
-	0xD1, 0xF3, 0x7C, 
-	0x00, 0x00, 0x00, 
-	0x3F, 0x1E, 0x1E, 
-	0x21, 0x12, 0x12, 
-	0x21, 0x12, 0x12, 
-	0x21, 0x12, 0x12, 
-	0x21, 0x12, 0x12, 
-	0x21, 0x12, 0x12, 
-	0xE1, 0xF3, 0x73, 
+static constexpr uint8_t bitmap_icon_dir_data[] = {
+	0x00, 0x00, 
+	0xFC, 0x00, 
+	0x02, 0x01, 
+	0x01, 0x3E, 
+	0x01, 0xE0, 
+	0x01, 0xA0, 
+	0x01, 0xA0, 
+	0x01, 0xA0, 
+	0x01, 0xA0, 
+	0x02, 0x40, 
+	0x02, 0x40, 
+	0x02, 0x40, 
+	0x02, 0x40, 
+	0x02, 0x40, 
+	0xFC, 0x3F, 
+	0x00, 0x00, 
 };
-static constexpr Bitmap bitmap_rssipwm {
-	{ 24, 16 }, bitmap_rssipwm_data
+static constexpr Bitmap bitmap_icon_dir {
+	{ 16, 16 }, bitmap_icon_dir_data
 };
 
 static constexpr uint8_t bitmap_icon_dmr_data[] = {
@@ -1185,146 +493,26 @@ static constexpr Bitmap bitmap_icon_dmr {
 	{ 16, 16 }, bitmap_icon_dmr_data
 };
 
-static constexpr uint8_t bitmap_target_calibrate_data[] = {
-	0x02, 0x00, 0x00, 0x40, 
-	0x07, 0x00, 0x00, 0xE0, 
-	0x0E, 0x00, 0x00, 0x70, 
-	0x1C, 0x00, 0x00, 0x38, 
-	0x38, 0x00, 0x00, 0x1C, 
-	0x70, 0x00, 0x00, 0x0E, 
-	0xE0, 0x00, 0x00, 0x07, 
-	0xC0, 0x01, 0x80, 0x03, 
-	0x80, 0x03, 0xC0, 0x01, 
-	0x00, 0x07, 0xE0, 0x00, 
-	0x00, 0x0E, 0x70, 0x00, 
-	0x00, 0x1C, 0x38, 0x00, 
-	0x00, 0x38, 0x1C, 0x00, 
-	0x00, 0x70, 0x0E, 0x00, 
-	0x00, 0xE0, 0x07, 0x00, 
-	0x00, 0xC0, 0x03, 0x00, 
-	0x00, 0xC0, 0x03, 0x00, 
-	0x00, 0xE0, 0x07, 0x00, 
-	0x00, 0x70, 0x0E, 0x00, 
-	0x00, 0x38, 0x1C, 0x00, 
-	0x00, 0x1C, 0x38, 0x00, 
-	0x00, 0x0E, 0x70, 0x00, 
-	0x00, 0x07, 0xE0, 0x00, 
-	0x80, 0x03, 0xC0, 0x01, 
-	0xC0, 0x01, 0x80, 0x03, 
-	0xE0, 0x00, 0x00, 0x07, 
-	0x70, 0x00, 0x00, 0x0E, 
-	0x38, 0x00, 0x00, 0x1C, 
-	0x1C, 0x00, 0x00, 0x38, 
-	0x0E, 0x00, 0x00, 0x70, 
-	0x07, 0x00, 0x00, 0xE0, 
-	0x02, 0x00, 0x00, 0x40, 
+static constexpr uint8_t bitmap_icon_ert_data[] = {
+	0x00, 0x00, 
+	0x00, 0x0F, 
+	0x80, 0x7F, 
+	0xC0, 0x0F, 
+	0xFC, 0x0F, 
+	0xC2, 0x0F, 
+	0x82, 0x7F, 
+	0x01, 0x0F, 
+	0x01, 0x00, 
+	0x21, 0x05, 
+	0x53, 0x09, 
+	0x56, 0x09, 
+	0x50, 0x05, 
+	0x50, 0x05, 
+	0x20, 0xAD, 
+	0x00, 0x00, 
 };
-static constexpr Bitmap bitmap_target_calibrate {
-	{ 32, 32 }, bitmap_target_calibrate_data
-};
-
-static constexpr uint8_t bitmap_tab_edge_data[] = {
-	0x00, 
-	0x01, 
-	0x01, 
-	0x03, 
-	0x03, 
-	0x03, 
-	0x07, 
-	0x07, 
-	0x07, 
-	0x0F, 
-	0x0F, 
-	0x0F, 
-	0x1F, 
-	0x1F, 
-	0x1F, 
-	0x1F, 
-	0x3F, 
-	0x3F, 
-	0x3F, 
-	0x7F, 
-	0x7F, 
-	0x7F, 
-	0xFF, 
-	0xFF, 
-};
-static constexpr Bitmap bitmap_tab_edge {
-	{ 8, 24 }, bitmap_tab_edge_data
-};
-
-static constexpr uint8_t bitmap_icon_tpms_data[] = {
-	0xE0, 0x07, 
-	0xF8, 0x1A, 
-	0x78, 0x10, 
-	0x3C, 0x20, 
-	0x34, 0x27, 
-	0x9A, 0x4C, 
-	0x96, 0x6C, 
-	0xBA, 0x4C, 
-	0x96, 0x6C, 
-	0xB2, 0x4C, 
-	0x92, 0x4E, 
-	0x24, 0x27, 
-	0x24, 0x20, 
-	0x48, 0x10, 
-	0xD8, 0x1A, 
-	0xE0, 0x07, 
-};
-static constexpr Bitmap bitmap_icon_tpms {
-	{ 16, 16 }, bitmap_icon_tpms_data
-};
-
-static constexpr uint8_t bitmap_bulb_ignore_data[] = {
-	0x00, 0x3C, 0x00, 
-	0x00, 0xC3, 0x00, 
-	0x80, 0x00, 0x01, 
-	0x40, 0x3C, 0x02, 
-	0x20, 0x7E, 0x04, 
-	0x20, 0xE7, 0x04, 
-	0x10, 0xC3, 0x08, 
-	0x10, 0xE3, 0x08, 
-	0x10, 0x70, 0x08, 
-	0x10, 0x38, 0x08, 
-	0x10, 0x18, 0x08, 
-	0x20, 0x18, 0x04, 
-	0x20, 0x00, 0x04, 
-	0x40, 0x18, 0x02, 
-	0x80, 0x18, 0x01, 
-	0x00, 0xC3, 0x00, 
-	0x00, 0xFF, 0x00, 
-	0x00, 0xBD, 0x00, 
-	0x00, 0xC3, 0x00, 
-	0x00, 0xBD, 0x00, 
-	0x00, 0xC3, 0x00, 
-	0x00, 0xBD, 0x00, 
-	0x00, 0x42, 0x00, 
-	0x00, 0x3C, 0x00, 
-};
-static constexpr Bitmap bitmap_bulb_ignore {
-	{ 24, 24 }, bitmap_bulb_ignore_data
-};
-
-static constexpr uint8_t bitmap_icon_hackrf_data[] = {
-	0x80, 0x00, 
-	0xC0, 0x01, 
-	0xE0, 0x03, 
-	0x80, 0x00, 
-	0x80, 0x0E, 
-	0x90, 0x0E, 
-	0xB8, 0x0E, 
-	0x90, 0x04, 
-	0x90, 0x02, 
-	0xA0, 0x01, 
-	0xC0, 0x00, 
-	0x80, 0x00, 
-	0xC0, 0x01, 
-	0xE0, 0x03, 
-	0xE0, 0x03, 
-	0xC0, 0x01, 
-};
-static constexpr Bitmap bitmap_icon_hackrf {
-	{ 16, 16 }, bitmap_icon_hackrf_data
+static constexpr Bitmap bitmap_icon_ert {
+	{ 16, 16 }, bitmap_icon_ert_data
 };
 
 static constexpr uint8_t bitmap_icon_file_data[] = {
@@ -1349,114 +537,290 @@ static constexpr Bitmap bitmap_icon_file {
 	{ 16, 16 }, bitmap_icon_file_data
 };
 
-static constexpr uint8_t bitmap_icon_remote_data[] = {
-	0x20, 0x00, 
-	0x20, 0x00, 
-	0x20, 0x00, 
-	0x20, 0x00, 
-	0xF0, 0x03, 
-	0x10, 0x04, 
-	0xD0, 0x08, 
-	0xD0, 0x08, 
-	0x10, 0x08, 
-	0xD0, 0x08, 
-	0xD0, 0x08, 
-	0x10, 0x08, 
-	0x10, 0x08, 
-	0x30, 0x0C, 
+static constexpr uint8_t bitmap_icon_file_image_data[] = {
+	0x00, 0x00, 
+	0xFF, 0xFF, 
+	0x01, 0x80, 
+	0x01, 0x80, 
+	0x89, 0x80, 
+	0xC1, 0x81, 
+	0xE1, 0xA3, 
+	0xB1, 0xB3, 
+	0x89, 0xDC, 
+	0x07, 0x8C, 
+	0x01, 0x90, 
+	0x01, 0x80, 
+	0xAB, 0x82, 
+	0xFF, 0xD5, 
+	0xFF, 0xFF, 
+	0x00, 0x00, 
+};
+static constexpr Bitmap bitmap_icon_file_image {
+	{ 16, 16 }, bitmap_icon_file_image_data
+};
+
+static constexpr uint8_t bitmap_icon_file_iq_data[] = {
+	0x98, 0x00, 
+	0x24, 0x06, 
+	0xA4, 0x08, 
+	0x34, 0x10, 
+	0xB8, 0x20, 
+	0x20, 0x20, 
+	0x80, 0x00, 
+	0xD5, 0x55, 
+	0x80, 0x00, 
+	0x02, 0x70, 
+	0x82, 0x20, 
+	0x04, 0x20, 
+	0x88, 0x20, 
+	0x30, 0x70, 
+	0x80, 0x00, 
+	0x00, 0x00, 
+};
+static constexpr Bitmap bitmap_icon_file_iq {
+	{ 16, 16 }, bitmap_icon_file_iq_data
+};
+
+static constexpr uint8_t bitmap_icon_file_text_data[] = {
+	0x00, 0x20, 
+	0x00, 0x30, 
+	0x00, 0x38, 
+	0x00, 0x38, 
+	0x00, 0x34, 
+	0x00, 0x32, 
+	0x00, 0x31, 
+	0x80, 0x30, 
+	0xC0, 0x30, 
+	0xE0, 0x3F, 
+	0x30, 0x30, 
+	0x18, 0x30, 
+	0x0C, 0x30, 
+	0x0E, 0x78, 
+	0x1F, 0xFC, 
+	0x00, 0x00, 
+};
+static constexpr Bitmap bitmap_icon_file_text {
+	{ 16, 16 }, bitmap_icon_file_text_data
+};
+
+static constexpr uint8_t bitmap_icon_fox_data[] = {
+	0x18, 0x18, 
+	0x28, 0x14, 
+	0x68, 0x16, 
+	0x68, 0x16, 
+	0xC8, 0x13, 
+	0x88, 0x11, 
+	0x04, 0x20, 
+	0x24, 0x24, 
+	0x22, 0x44, 
+	0x01, 0x80, 
+	0x06, 0x60, 
+	0x98, 0x19, 
+	0x20, 0x04, 
+	0x40, 0x02, 
+	0x80, 0x01, 
+	0x00, 0x00, 
+};
+static constexpr Bitmap bitmap_icon_fox {
+	{ 16, 16 }, bitmap_icon_fox_data
+};
+
+static constexpr uint8_t bitmap_icon_freqman_data[] = {
+	0x00, 0x00, 
+	0x0E, 0x00, 
+	0x02, 0x00, 
+	0xE6, 0x7F, 
+	0x02, 0x00, 
+	0x00, 0x00, 
+	0x0E, 0x00, 
+	0x02, 0x00, 
+	0xE6, 0x7B, 
+	0x02, 0x00, 
+	0x00, 0x00, 
+	0x0E, 0x00, 
+	0x02, 0x00, 
+	0x66, 0x7F, 
+	0x02, 0x00, 
+	0x00, 0x00, 
+};
+static constexpr Bitmap bitmap_icon_freqman {
+	{ 16, 16 }, bitmap_icon_freqman_data
+};
+
+static constexpr uint8_t bitmap_icon_gps_sim_data[] = {
+	0xE0, 0x07, 
+	0xF0, 0x0F, 
+	0x38, 0x1F, 
+	0x3C, 0x3E, 
+	0x3C, 0x3C, 
+	0x3C, 0x38, 
+	0x3C, 0x30, 
+	0x3C, 0x38, 
+	0x3C, 0x3C, 
+	0x38, 0x1E, 
+	0x38, 0x1F, 
 	0xF0, 0x0F, 
 	0xE0, 0x07, 
-};
-static constexpr Bitmap bitmap_icon_remote {
-	{ 16, 16 }, bitmap_icon_remote_data
-};
-
-static constexpr uint8_t bitmap_icon_camera_data[] = {
-	0x00, 0x00, 
-	0x00, 0x00, 
-	0x00, 0x00, 
-	0xCC, 0x03, 
-	0xE8, 0x07, 
-	0xFC, 0x3F, 
-	0x3C, 0x3C, 
-	0x9C, 0x39, 
-	0xDC, 0x3B, 
-	0xDC, 0x3B, 
-	0x9C, 0x39, 
-	0x3C, 0x3C, 
-	0xFC, 0x3F, 
-	0x00, 0x00, 
-	0x00, 0x00, 
-	0x00, 0x00, 
-};
-static constexpr Bitmap bitmap_icon_camera {
-	{ 16, 16 }, bitmap_icon_camera_data
-};
-
-static constexpr uint8_t bitmap_icon_ert_data[] = {
-	0x00, 0x00, 
-	0x00, 0x00, 
-	0x77, 0x77, 
-	0x55, 0x41, 
-	0x75, 0x77, 
-	0x55, 0x44, 
-	0x55, 0x44, 
-	0x77, 0x77, 
-	0x00, 0x00, 
-	0x20, 0x04, 
-	0x02, 0x26, 
-	0x04, 0x12, 
-	0x00, 0x03, 
+	0xC0, 0x03, 
+	0xC0, 0x03, 
 	0x80, 0x01, 
-	0xC3, 0x61, 
+};
+static constexpr Bitmap bitmap_icon_gps_sim {
+	{ 16, 16 }, bitmap_icon_gps_sim_data
+};
+
+static constexpr uint8_t bitmap_icon_hackrf_data[] = {
+	0xF0, 0x0F, 
+	0x10, 0x08, 
+	0x50, 0x0A, 
+	0x10, 0x08, 
+	0x10, 0x08, 
+	0x10, 0x08, 
+	0xF8, 0x1F, 
+	0xF8, 0x1F, 
+	0xF8, 0x1F, 
+	0xF8, 0x1F, 
+	0xF8, 0x1F, 
+	0xF8, 0x1F, 
+	0xF8, 0x1F, 
+	0xF0, 0x0F, 
+	0x80, 0x01, 
+	0x80, 0x01, 
+};
+static constexpr Bitmap bitmap_icon_hackrf {
+	{ 16, 16 }, bitmap_icon_hackrf_data
+};
+
+static constexpr uint8_t bitmap_icon_jammer_data[] = {
+	0xA6, 0xAC, 
+	0x73, 0x47, 
+	0xAE, 0xB9, 
+	0x55, 0xD7, 
+	0x7E, 0xAE, 
+	0xD3, 0x45, 
+	0xCA, 0xBA, 
+	0x71, 0x15, 
+	0xDA, 0xFE, 
+	0xF5, 0xAB, 
+	0xAF, 0x98, 
+	0x4A, 0x77, 
+	0xAD, 0xCA, 
+	0x58, 0x7D, 
+	0xBF, 0xAF, 
+	0x5A, 0x65, 
+};
+static constexpr Bitmap bitmap_icon_jammer {
+	{ 16, 16 }, bitmap_icon_jammer_data
+};
+
+static constexpr uint8_t bitmap_icon_keyfob_data[] = {
+	0x30, 0x00, 
+	0x30, 0x00, 
+	0x30, 0x00, 
+	0x30, 0x00, 
+	0x30, 0x00, 
+	0x30, 0x00, 
+	0xFC, 0x00, 
+	0xCE, 0x01, 
+	0x86, 0x01, 
+	0xFE, 0x01, 
+	0x86, 0x31, 
+	0x86, 0x49, 
+	0xCE, 0x87, 
+	0xFC, 0x84, 
+	0xFC, 0x4B, 
+	0x78, 0x30, 
+};
+static constexpr Bitmap bitmap_icon_keyfob {
+	{ 16, 16 }, bitmap_icon_keyfob_data
+};
+
+static constexpr uint8_t bitmap_icon_lcr_data[] = {
+	0x0C, 0x00, 
+	0xFF, 0x7F, 
+	0x01, 0x80, 
+	0xC1, 0x9B, 
+	0xFF, 0x7F, 
+	0x0C, 0x00, 
+	0xFF, 0x7F, 
+	0x01, 0x80, 
+	0xC1, 0x9D, 
+	0xFF, 0x7F, 
+	0x0C, 0x00, 
+	0x0C, 0x00, 
+	0x0C, 0x00, 
+	0x0C, 0x00, 
+	0x0C, 0x00, 
+	0x0C, 0x00, 
+};
+static constexpr Bitmap bitmap_icon_lcr {
+	{ 16, 16 }, bitmap_icon_lcr_data
+};
+
+static constexpr uint8_t bitmap_icon_lge_data[] = {
+	0x00, 0x00, 
 	0x80, 0x00, 
+	0xA4, 0x12, 
+	0xA8, 0x0A, 
+	0xD0, 0x05, 
+	0xEC, 0x1B, 
+	0xF0, 0x07, 
+	0xFE, 0xFF, 
+	0xF0, 0x07, 
+	0xEC, 0x1B, 
+	0xD0, 0x05, 
+	0xA8, 0x0A, 
+	0xA4, 0x12, 
+	0x80, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
 };
-static constexpr Bitmap bitmap_icon_ert {
-	{ 16, 16 }, bitmap_icon_ert_data
+static constexpr Bitmap bitmap_icon_lge {
+	{ 16, 16 }, bitmap_icon_lge_data
 };
 
-static constexpr uint8_t bitmap_icon_utilities_data[] = {
+static constexpr uint8_t bitmap_icon_lora_data[] = {
 	0xC0, 0x03, 
-	0x80, 0x0F, 
-	0x00, 0x1F, 
-	0x08, 0x1E, 
-	0x18, 0x3E, 
-	0x3C, 0x3E, 
-	0x3C, 0x39, 
-	0x98, 0x3A, 
-	0x48, 0x1D, 
-	0xA0, 0x1E, 
-	0x70, 0x0F, 
-	0xF8, 0x07, 
+	0x30, 0x0C, 
+	0x00, 0x00, 
+	0xC0, 0x03, 
+	0x00, 0x00, 
+	0xC0, 0x03, 
+	0x60, 0x06, 
+	0x60, 0x06, 
+	0x60, 0x06, 
+	0x60, 0x06, 
+	0xC0, 0x03, 
+	0x00, 0x00, 
+	0xC0, 0x03, 
+	0x00, 0x00, 
+	0x30, 0x0C, 
+	0xC0, 0x03, 
+};
+static constexpr Bitmap bitmap_icon_lora {
+	{ 16, 16 }, bitmap_icon_lora_data
+};
+
+static constexpr uint8_t bitmap_icon_microphone_data[] = {
+	0xC0, 0x03, 
+	0xA0, 0x06, 
+	0x60, 0x05, 
 	0xE0, 0x07, 
+	0xEC, 0x37, 
+	0xEC, 0x37, 
+	0xE8, 0x17, 
+	0xE8, 0x17, 
+	0xE8, 0x17, 
+	0xC8, 0x13, 
+	0x18, 0x18, 
+	0xF0, 0x0F, 
 	0xC0, 0x03, 
-	0xC0, 0x03, 
+	0x80, 0x01, 
+	0x80, 0x01, 
 	0xC0, 0x03, 
 };
-static constexpr Bitmap bitmap_icon_utilities {
-	{ 16, 16 }, bitmap_icon_utilities_data
-};
-
-static constexpr uint8_t bitmap_icon_capture_data[] = {
-	0xEF, 0x29, 
-	0xEF, 0x69, 
-	0xEF, 0xE9, 
-	0xEF, 0xE9, 
-	0xEF, 0xEF, 
-	0x1F, 0xF0, 
-	0xFF, 0xFF, 
-	0xFF, 0xFF, 
-	0x03, 0xC0, 
-	0xFB, 0xDF, 
-	0x0B, 0xD9, 
-	0xFB, 0xDF, 
-	0x4B, 0xDE, 
-	0xFB, 0xDF, 
-	0x03, 0xC0, 
-	0xFE, 0x7F, 
-};
-static constexpr Bitmap bitmap_icon_capture {
-	{ 16, 16 }, bitmap_icon_capture_data
+static constexpr Bitmap bitmap_icon_microphone {
+	{ 16, 16 }, bitmap_icon_microphone_data
 };
 
 static constexpr uint8_t bitmap_icon_morse_data[] = {
@@ -1481,152 +845,716 @@ static constexpr Bitmap bitmap_icon_morse {
 	{ 16, 16 }, bitmap_icon_morse_data
 };
 
-static constexpr uint8_t bitmap_icon_replay_data[] = {
-	0x00, 0x00, 
-	0xC0, 0x07, 
-	0xF0, 0x1F, 
-	0x79, 0x3C, 
-	0x1D, 0x70, 
-	0x0F, 0x60, 
-	0x07, 0xE0, 
-	0x1F, 0xC0, 
-	0x00, 0xC0, 
+static constexpr uint8_t bitmap_icon_notepad_data[] = {
+	0x0C, 0x00, 
+	0x1E, 0x00, 
+	0x2F, 0x00, 
+	0x47, 0x00, 
+	0xE2, 0x00, 
+	0xD4, 0x01, 
+	0xB8, 0x03, 
+	0x70, 0x07, 
+	0xE0, 0x0E, 
+	0xC0, 0x1D, 
+	0x80, 0x3B, 
+	0x00, 0x4F, 
+	0x00, 0x46, 
+	0x00, 0x84, 
+	0x00, 0xD8, 
 	0x00, 0xE0, 
-	0x00, 0x60, 
-	0x00, 0x70, 
-	0x30, 0x3C, 
-	0xE0, 0x0F, 
-	0x80, 0x03, 
-	0x00, 0x00, 
 };
-static constexpr Bitmap bitmap_icon_replay {
-	{ 16, 16 }, bitmap_icon_replay_data
-};
-
-static constexpr uint8_t bitmap_gps_sim_data[] = {
-	0x00, 0x00, 
-	0x00, 0x00, 
-	0x00, 0x00, 
-	0xF0, 0x0F, 
-	0x4C, 0x32, 
-	0xFE, 0x7F, 
-	0x25, 0xA4, 
-	0x25, 0xA4, 
-	0xFF, 0xFF, 
-	0x25, 0xA4, 
-	0x25, 0xA4, 
-	0xFE, 0x7F, 
-	0x4C, 0x32, 
-	0xF0, 0x0F, 
-	0x00, 0x00, 
-	0x00, 0x00, 
-};
-static constexpr Bitmap bitmap_gps_sim {
-	{ 16, 16 }, bitmap_gps_sim_data
-};
-
-static constexpr uint8_t bitmap_icon_btle_data[] = {
-	0x00, 0x00, 
-	0x80, 0x00, 
-	0x80, 0x01, 
-	0x80, 0x07, 
-	0x80, 0x0C, 
-	0x98, 0x06, 
-	0xF0, 0x03, 
-	0xE0, 0x01, 
-	0xE0, 0x01, 
-	0xF0, 0x03, 
-	0x98, 0x06, 
-	0x80, 0x0C, 
-	0x80, 0x07, 
-	0x80, 0x01, 
-	0x80, 0x00, 
-	0x00, 0x00, 
-};
-static constexpr Bitmap bitmap_icon_btle {
-	{ 16, 16 }, bitmap_icon_btle_data
+static constexpr Bitmap bitmap_icon_notepad {
+	{ 16, 16 }, bitmap_icon_notepad_data
 };
 
 static constexpr uint8_t bitmap_icon_nrf_data[] = {
-	0x00, 0x00, 
-	0x00, 0x00, 
-	0x00, 0x00, 
-	0x07, 0xE0, 
-	0x05, 0x20, 
-	0xCC, 0x33, 
-	0xF4, 0x2F, 
-	0xE6, 0x67, 
-	0xE2, 0x47, 
-	0x36, 0x5C, 
-	0x0E, 0xE0, 
-	0x06, 0x60, 
-	0x00, 0x00, 
-	0x00, 0x00, 
-	0x00, 0x00, 
-	0x00, 0x00, 
+	0x00, 0x01, 
+	0x00, 0x01, 
+	0x00, 0x01, 
+	0x00, 0x01, 
+	0x00, 0x01, 
+	0x00, 0x01, 
+	0x00, 0x01, 
+	0xF8, 0x3F, 
+	0xFC, 0x7F, 
+	0xFC, 0x7F, 
+	0xDC, 0x7F, 
+	0x8C, 0x6B, 
+	0xDC, 0x7F, 
+	0xFC, 0x7F, 
+	0xFC, 0x7F, 
+	0xF8, 0x3F, 
 };
 static constexpr Bitmap bitmap_icon_nrf {
 	{ 16, 16 }, bitmap_icon_nrf_data
 };
 
-static constexpr uint8_t bitmap_sig_sine_data[] = {
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x03, 0xC0, 0x00, 
-	0x80, 0x07, 0xE0, 0x01, 
-	0xC0, 0x0F, 0xF0, 0x03, 
-	0xC0, 0x0C, 0x30, 0x03, 
-	0x60, 0x18, 0x18, 0x06, 
-	0x60, 0x18, 0x18, 0x06, 
-	0x60, 0x18, 0x18, 0x06, 
-	0x60, 0x18, 0x18, 0x06, 
-	0x30, 0x30, 0x0C, 0x0C, 
-	0x30, 0x30, 0x0C, 0x0C, 
-	0x30, 0x30, 0x0C, 0x0C, 
-	0x30, 0x30, 0x0C, 0x0C, 
-	0x18, 0x60, 0x06, 0x18, 
-	0x1E, 0xE0, 0x07, 0x78, 
-	0x0E, 0xC0, 0x03, 0x70, 
-	0x06, 0x80, 0x01, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 
+static constexpr uint8_t bitmap_icon_nuoptix_data[] = {
+	0x80, 0x01, 
+	0x80, 0x01, 
+	0x40, 0x02, 
+	0x40, 0x1A, 
+	0x40, 0x1A, 
+	0x20, 0x0C, 
+	0x20, 0x0F, 
+	0x20, 0x1E, 
+	0x10, 0x0E, 
+	0x10, 0x0B, 
+	0x10, 0x0B, 
+	0xF8, 0x1F, 
+	0xF8, 0x1F, 
+	0xF8, 0x1F, 
+	0xFC, 0x3F, 
+	0xFC, 0x3F, 
 };
-static constexpr Bitmap bitmap_sig_sine {
-	{ 32, 32 }, bitmap_sig_sine_data
+static constexpr Bitmap bitmap_icon_nuoptix {
+	{ 16, 16 }, bitmap_icon_nuoptix_data
 };
 
-static constexpr uint8_t bitmap_icon_dir_data[] = {
+static constexpr uint8_t bitmap_icon_pocsag_data[] = {
 	0x00, 0x00, 
-	0xFC, 0x00, 
-	0x02, 0x01, 
-	0x01, 0x3E, 
-	0x01, 0xE0, 
-	0x01, 0xA0, 
-	0x01, 0xA0, 
-	0x01, 0xA0, 
-	0x01, 0xA0, 
-	0x02, 0x40, 
-	0x02, 0x40, 
-	0x02, 0x40, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0xFC, 0x3F, 
+	0xFE, 0x7F, 
 	0x02, 0x40, 
+	0xBA, 0x45, 
 	0x02, 0x40, 
+	0xFE, 0x7F, 
+	0xFE, 0x7F, 
+	0x92, 0x7C, 
+	0x92, 0x7C, 
 	0xFC, 0x3F, 
 	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
 };
-static constexpr Bitmap bitmap_icon_dir {
-	{ 16, 16 }, bitmap_icon_dir_data
+static constexpr Bitmap bitmap_icon_pocsag {
+	{ 16, 16 }, bitmap_icon_pocsag_data
+};
+
+static constexpr uint8_t bitmap_icon_previous_data[] = {
+	0x00, 0x00, 
+	0xC0, 0x00, 
+	0xE0, 0x00, 
+	0x70, 0x00, 
+	0x38, 0x00, 
+	0x1C, 0x00, 
+	0x0E, 0x00, 
+	0xFF, 0xFF, 
+	0xFF, 0xFF, 
+	0x0E, 0x00, 
+	0x1C, 0x00, 
+	0x38, 0x00, 
+	0x70, 0x00, 
+	0xE0, 0x00, 
+	0xC0, 0x00, 
+	0x00, 0x00, 
+};
+static constexpr Bitmap bitmap_icon_previous {
+	{ 16, 16 }, bitmap_icon_previous_data
+};
+
+static constexpr uint8_t bitmap_icon_rds_data[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x3C, 0x3C, 
+	0x7E, 0x7E, 
+	0x67, 0xE7, 
+	0x83, 0xC3, 
+	0xC7, 0xE1, 
+	0xFD, 0xBC, 
+	0x42, 0x42, 
+	0x3C, 0x3C, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+};
+static constexpr Bitmap bitmap_icon_rds {
+	{ 16, 16 }, bitmap_icon_rds_data
+};
+
+static constexpr uint8_t bitmap_icon_receivers_data[] = {
+	0x80, 0x01, 
+	0x80, 0x01, 
+	0x80, 0x01, 
+	0x80, 0x01, 
+	0x80, 0x01, 
+	0x80, 0x01, 
+	0x80, 0x01, 
+	0x80, 0x01, 
+	0xF8, 0x1F, 
+	0xF0, 0x0F, 
+	0xE0, 0x07, 
+	0xC0, 0x03, 
+	0x83, 0xC1, 
+	0x03, 0xC0, 
+	0xFF, 0xFF, 
+	0xFF, 0xFF, 
+};
+static constexpr Bitmap bitmap_icon_receivers {
+	{ 16, 16 }, bitmap_icon_receivers_data
+};
+
+static constexpr uint8_t bitmap_icon_remote_data[] = {
+	0x20, 0x00, 
+	0x20, 0x00, 
+	0x20, 0x00, 
+	0x20, 0x00, 
+	0xF0, 0x03, 
+	0x10, 0x04, 
+	0xD0, 0x08, 
+	0xD0, 0x08, 
+	0x10, 0x08, 
+	0xD0, 0x08, 
+	0xD0, 0x08, 
+	0x10, 0x08, 
+	0x10, 0x08, 
+	0x30, 0x0C, 
+	0xF0, 0x0F, 
+	0xE0, 0x07, 
+};
+static constexpr Bitmap bitmap_icon_remote {
+	{ 16, 16 }, bitmap_icon_remote_data
+};
+
+static constexpr uint8_t bitmap_icon_replay_data[] = {
+	0x60, 0x00, 
+	0xE0, 0x00, 
+	0xE0, 0x01, 
+	0xE0, 0x03, 
+	0xE0, 0x07, 
+	0xE0, 0x0F, 
+	0xE0, 0x1F, 
+	0xE0, 0x3F, 
+	0xE0, 0x3F, 
+	0xE0, 0x1F, 
+	0xE0, 0x0F, 
+	0xE0, 0x07, 
+	0xE0, 0x03, 
+	0xE0, 0x01, 
+	0xE0, 0x00, 
+	0x60, 0x00, 
+};
+static constexpr Bitmap bitmap_icon_replay {
+	{ 16, 16 }, bitmap_icon_replay_data
+};
+
+static constexpr uint8_t bitmap_icon_scanner_data[] = {
+	0x03, 0x00, 
+	0x00, 0x00, 
+	0x03, 0x00, 
+	0x00, 0x00, 
+	0x0F, 0x00, 
+	0x00, 0x00, 
+	0x03, 0x01, 
+	0x80, 0x01, 
+	0xC3, 0x01, 
+	0xE0, 0xFF, 
+	0xEF, 0xFF, 
+	0xC0, 0x01, 
+	0x83, 0x01, 
+	0x00, 0x01, 
+	0x03, 0x00, 
+	0x00, 0x00, 
+};
+static constexpr Bitmap bitmap_icon_scanner {
+	{ 16, 16 }, bitmap_icon_scanner_data
+};
+
+static constexpr uint8_t bitmap_icon_script_data[] = {
+	0xFC, 0x07, 
+	0xFA, 0x0F, 
+	0x19, 0x1A, 
+	0xF9, 0x1F, 
+	0x1E, 0x1D, 
+	0xF8, 0x1F, 
+	0x98, 0x1F, 
+	0xF8, 0x1F, 
+	0xF8, 0x1F, 
+	0x08, 0x14, 
+	0xF8, 0x1F, 
+	0x48, 0x1E, 
+	0xF8, 0xFF, 
+	0x78, 0x80, 
+	0x30, 0x40, 
+	0xE0, 0x3F, 
+};
+static constexpr Bitmap bitmap_icon_script {
+	{ 16, 16 }, bitmap_icon_script_data
+};
+
+static constexpr uint8_t bitmap_icon_sd_data[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0xC0, 0x1F, 
+	0xE0, 0x1F, 
+	0xF0, 0x1F, 
+	0xF8, 0x1F, 
+	0x98, 0x18, 
+	0xE8, 0x16, 
+	0xC8, 0x16, 
+	0x98, 0x16, 
+	0xB8, 0x16, 
+	0xC8, 0x18, 
+	0xF8, 0x1F, 
+	0xF8, 0x1F, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+};
+static constexpr Bitmap bitmap_icon_sd {
+	{ 16, 16 }, bitmap_icon_sd_data
+};
+
+static constexpr uint8_t bitmap_icon_search_data[] = {
+	0xF8, 0x01, 
+	0xFC, 0x03, 
+	0x0E, 0x07, 
+	0x07, 0x0E, 
+	0x03, 0x0C, 
+	0x0B, 0x0C, 
+	0x0B, 0x0C, 
+	0x13, 0x0C, 
+	0x07, 0x0E, 
+	0x0E, 0x07, 
+	0xFC, 0x1F, 
+	0xF8, 0x3D, 
+	0x00, 0x7C, 
+	0x00, 0xF8, 
+	0x00, 0xF0, 
+	0x00, 0x60, 
+};
+static constexpr Bitmap bitmap_icon_search {
+	{ 16, 16 }, bitmap_icon_search_data
+};
+
+static constexpr uint8_t bitmap_icon_setup_data[] = {
+	0xC0, 0x01, 
+	0xC0, 0x01, 
+	0xE4, 0x13, 
+	0xFE, 0x3F, 
+	0xFF, 0x7F, 
+	0x3E, 0x3E, 
+	0x1C, 0x1C, 
+	0x1C, 0x1C, 
+	0x1C, 0x1C, 
+	0x3E, 0x3E, 
+	0xFF, 0x7F, 
+	0xFE, 0x3F, 
+	0xE4, 0x13, 
+	0xC0, 0x01, 
+	0xC0, 0x01, 
+	0x00, 0x00, 
+};
+static constexpr Bitmap bitmap_icon_setup {
+	{ 16, 16 }, bitmap_icon_setup_data
+};
+
+static constexpr uint8_t bitmap_icon_sleep_data[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x04, 
+	0x00, 0x08, 
+	0x00, 0x18, 
+	0x00, 0x18, 
+	0x00, 0x38, 
+	0x00, 0x3C, 
+	0x00, 0x3C, 
+	0x00, 0x3E, 
+	0x84, 0x1F, 
+	0xF8, 0x1F, 
+	0xF0, 0x0F, 
+	0xC0, 0x03, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+};
+static constexpr Bitmap bitmap_icon_sleep {
+	{ 16, 16 }, bitmap_icon_sleep_data
+};
+
+static constexpr uint8_t bitmap_icon_sonde_data[] = {
+	0xE0, 0x03, 
+	0x90, 0x07, 
+	0xE8, 0x0F, 
+	0xF8, 0x0F, 
+	0xF8, 0x0F, 
+	0xF0, 0x07, 
+	0xF0, 0x07, 
+	0xE0, 0x03, 
+	0xE0, 0x03, 
+	0xC0, 0x01, 
+	0xC0, 0x01, 
+	0x80, 0x00, 
+	0x80, 0x00, 
+	0x80, 0x02, 
+	0xC0, 0x01, 
+	0xC0, 0x01, 
+};
+static constexpr Bitmap bitmap_icon_sonde {
+	{ 16, 16 }, bitmap_icon_sonde_data
+};
+
+static constexpr uint8_t bitmap_icon_soundboard_data[] = {
+	0x00, 0x00, 
+	0xFF, 0xFF, 
+	0x63, 0x8C, 
+	0x21, 0x84, 
+	0x21, 0x84, 
+	0xDF, 0xFB, 
+	0x63, 0x8C, 
+	0x21, 0x84, 
+	0x21, 0x84, 
+	0xDF, 0xFB, 
+	0x63, 0x8C, 
+	0x21, 0x84, 
+	0x21, 0x84, 
+	0xFF, 0xFF, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+};
+static constexpr Bitmap bitmap_icon_soundboard {
+	{ 16, 16 }, bitmap_icon_soundboard_data
+};
+
+static constexpr uint8_t bitmap_icon_speaker_data[] = {
+	0x00, 0x00, 
+	0x00, 0x20, 
+	0x00, 0x30, 
+	0x00, 0x38, 
+	0x00, 0x3C, 
+	0xDC, 0x3E, 
+	0xDC, 0x3F, 
+	0xDC, 0x3F, 
+	0xDC, 0x3F, 
+	0xDC, 0x3F, 
+	0xDC, 0x3E, 
+	0x00, 0x3C, 
+	0x00, 0x38, 
+	0x00, 0x30, 
+	0x00, 0x20, 
+	0x00, 0x00, 
+};
+static constexpr Bitmap bitmap_icon_speaker {
+	{ 16, 16 }, bitmap_icon_speaker_data
+};
+
+static constexpr uint8_t bitmap_icon_sstv_data[] = {
+	0x10, 0x08, 
+	0x20, 0x04, 
+	0x40, 0x02, 
+	0x80, 0x01, 
+	0xFF, 0xFF, 
+	0x03, 0xF8, 
+	0x5D, 0xF0, 
+	0x05, 0xD0, 
+	0x01, 0xF0, 
+	0x01, 0xD0, 
+	0x01, 0xF0, 
+	0x01, 0xD0, 
+	0x01, 0xF0, 
+	0x01, 0x90, 
+	0x03, 0x98, 
+	0xFF, 0xFF, 
+};
+static constexpr Bitmap bitmap_icon_sstv {
+	{ 16, 16 }, bitmap_icon_sstv_data
+};
+
+static constexpr uint8_t bitmap_icon_stealth_data[] = {
+	0x00, 0x00, 
+	0xC0, 0x03, 
+	0xE0, 0x07, 
+	0xE0, 0x07, 
+	0xF8, 0x1F, 
+	0x00, 0x00, 
+	0xE0, 0x07, 
+	0x60, 0x06, 
+	0x00, 0x00, 
+	0x70, 0x0E, 
+	0xF0, 0x0F, 
+	0xF8, 0x1F, 
+	0xFC, 0x3E, 
+	0xFC, 0x3F, 
+	0xFC, 0x3E, 
+	0xFC, 0x3F, 
+};
+static constexpr Bitmap bitmap_icon_stealth {
+	{ 16, 16 }, bitmap_icon_stealth_data
+};
+
+static constexpr uint8_t bitmap_icon_tetra_data[] = {
+	0xE0, 0x0F, 
+	0x18, 0x38, 
+	0xE4, 0x67, 
+	0x7E, 0xCE, 
+	0xC7, 0xCC, 
+	0x00, 0x00, 
+	0xFF, 0x4F, 
+	0xBA, 0xB2, 
+	0x9A, 0xEE, 
+	0xBA, 0xB2, 
+	0x00, 0x00, 
+	0x3B, 0xE3, 
+	0x73, 0x7E, 
+	0xC6, 0x27, 
+	0x1C, 0x18, 
+	0xF0, 0x07, 
+};
+static constexpr Bitmap bitmap_icon_tetra {
+	{ 16, 16 }, bitmap_icon_tetra_data
+};
+
+static constexpr uint8_t bitmap_icon_tpms_data[] = {
+	0xC0, 0x03, 
+	0xF0, 0x0F, 
+	0x18, 0x18, 
+	0xEC, 0x37, 
+	0x36, 0x6C, 
+	0x1A, 0x58, 
+	0x0B, 0xD0, 
+	0x0B, 0xD0, 
+	0x0B, 0xD0, 
+	0x0B, 0xD0, 
+	0x1A, 0x58, 
+	0x36, 0x6C, 
+	0xEC, 0x37, 
+	0x18, 0x18, 
+	0xF0, 0x0F, 
+	0xC0, 0x03, 
+};
+static constexpr Bitmap bitmap_icon_tpms {
+	{ 16, 16 }, bitmap_icon_tpms_data
+};
+
+static constexpr uint8_t bitmap_icon_transmit_data[] = {
+	0x80, 0x01, 
+	0xC0, 0x03, 
+	0xE0, 0x07, 
+	0xF0, 0x0F, 
+	0xF8, 0x1F, 
+	0x80, 0x01, 
+	0x80, 0x01, 
+	0x80, 0x01, 
+	0x80, 0x01, 
+	0x80, 0x01, 
+	0x80, 0x01, 
+	0x80, 0x01, 
+	0x83, 0xC1, 
+	0x03, 0xC0, 
+	0xFF, 0xFF, 
+	0xFF, 0xFF, 
+};
+static constexpr Bitmap bitmap_icon_transmit {
+	{ 16, 16 }, bitmap_icon_transmit_data
+};
+
+static constexpr uint8_t bitmap_icon_utilities_data[] = {
+	0x30, 0x24, 
+	0x78, 0x66, 
+	0x78, 0x66, 
+	0x78, 0x7E, 
+	0x78, 0x3C, 
+	0x78, 0x18, 
+	0x78, 0x18, 
+	0x30, 0x3C, 
+	0x30, 0x3C, 
+	0x30, 0x3C, 
+	0x30, 0x3C, 
+	0x30, 0x3C, 
+	0x30, 0x3C, 
+	0x30, 0x3C, 
+	0x30, 0x18, 
+	0x00, 0x00, 
+};
+static constexpr Bitmap bitmap_icon_utilities {
+	{ 16, 16 }, bitmap_icon_utilities_data
+};
+
+static constexpr uint8_t bitmap_more_data[] = {
+	0x18, 
+	0x18, 
+	0x18, 
+	0x18, 
+	0xFF, 
+	0x7E, 
+	0x3C, 
+	0x18, 
+};
+static constexpr Bitmap bitmap_more {
+	{ 8, 8 }, bitmap_more_data
+};
+
+static constexpr uint8_t bitmap_play_data[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0x0C, 0x00, 
+	0x3C, 0x00, 
+	0xFC, 0x00, 
+	0xFC, 0x03, 
+	0xFC, 0x0F, 
+	0xFC, 0x3F, 
+	0xFC, 0x3F, 
+	0xFC, 0x0F, 
+	0xFC, 0x03, 
+	0xFC, 0x00, 
+	0x3C, 0x00, 
+	0x0C, 0x00, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+};
+static constexpr Bitmap bitmap_play {
+	{ 16, 16 }, bitmap_play_data
+};
+
+static constexpr uint8_t bitmap_record_data[] = {
+	0xE0, 0x07, 
+	0xF8, 0x1F, 
+	0xFC, 0x3F, 
+	0xFE, 0x7F, 
+	0xFE, 0x7F, 
+	0xFF, 0xFF, 
+	0xFF, 0xFF, 
+	0xFF, 0xFF, 
+	0xFF, 0xFF, 
+	0xFF, 0xFF, 
+	0xFF, 0xFF, 
+	0xFE, 0x7F, 
+	0xFE, 0x7F, 
+	0xFC, 0x3F, 
+	0xF8, 0x1F, 
+	0xE0, 0x07, 
+};
+static constexpr Bitmap bitmap_record {
+	{ 16, 16 }, bitmap_record_data
+};
+
+static constexpr uint8_t bitmap_rssipwm_data[] = {
+	0x00, 0x00, 0x00, 
+	0x8F, 0xE7, 0x7D, 
+	0x51, 0x10, 0x10, 
+	0x51, 0x10, 0x10, 
+	0x8F, 0xE3, 0x10, 
+	0x09, 0x04, 0x11, 
+	0x11, 0x04, 0x11, 
+	0xD1, 0xF3, 0x7C, 
+	0x00, 0x00, 0x00, 
+	0x3F, 0x1E, 0x1E, 
+	0x21, 0x12, 0x12, 
+	0x21, 0x12, 0x12, 
+	0x21, 0x12, 0x12, 
+	0x21, 0x12, 0x12, 
+	0x21, 0x12, 0x12, 
+	0xE1, 0xF3, 0x73, 
+};
+static constexpr Bitmap bitmap_rssipwm {
+	{ 24, 16 }, bitmap_rssipwm_data
+};
+
+static constexpr uint8_t bitmap_sd_card_error_data[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0xC0, 0x1F, 
+	0xE0, 0x1F, 
+	0xF0, 0x1F, 
+	0xF8, 0x1F, 
+	0xC8, 0x13, 
+	0x98, 0x19, 
+	0x38, 0x1C, 
+	0x78, 0x1E, 
+	0x38, 0x1C, 
+	0x98, 0x19, 
+	0xC8, 0x13, 
+	0xF8, 0x1F, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+};
+static constexpr Bitmap bitmap_sd_card_error {
+	{ 16, 16 }, bitmap_sd_card_error_data
+};
+
+static constexpr uint8_t bitmap_sd_card_ok_data[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0xC0, 0x1F, 
+	0xE0, 0x1F, 
+	0xF0, 0x1F, 
+	0xF8, 0x1F, 
+	0xF8, 0x1F, 
+	0x98, 0x15, 
+	0x68, 0x19, 
+	0x68, 0x1D, 
+	0x68, 0x19, 
+	0x98, 0x15, 
+	0xF8, 0x1F, 
+	0xF8, 0x1F, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+};
+static constexpr Bitmap bitmap_sd_card_ok {
+	{ 16, 16 }, bitmap_sd_card_ok_data
+};
+
+static constexpr uint8_t bitmap_sd_card_unknown_data[] = {
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0xC0, 0x1F, 
+	0xE0, 0x1F, 
+	0xF0, 0x1F, 
+	0xF8, 0x1F, 
+	0x38, 0x1C, 
+	0x98, 0x19, 
+	0xF8, 0x1C, 
+	0x78, 0x1E, 
+	0x78, 0x1E, 
+	0xF8, 0x1F, 
+	0x78, 0x1E, 
+	0xF8, 0x1F, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+};
+static constexpr Bitmap bitmap_sd_card_unknown {
+	{ 16, 16 }, bitmap_sd_card_unknown_data
+};
+
+static constexpr uint8_t bitmap_sig_cw_data[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xFE, 0xFF, 0xFF, 0x7F, 
+	0xFE, 0xFF, 0xFF, 0x7F, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+};
+static constexpr Bitmap bitmap_sig_cw {
+	{ 32, 32 }, bitmap_sig_cw_data
 };
 
 static constexpr uint8_t bitmap_sig_noise_data[] = {
@@ -1667,26 +1595,156 @@ static constexpr Bitmap bitmap_sig_noise {
 	{ 32, 32 }, bitmap_sig_noise_data
 };
 
-static constexpr uint8_t bitmap_icon_aprs_data[] = {
-	0x00, 0x00, 
-	0x00, 0x00, 
-	0x00, 0x00, 
-	0xF0, 0x0F, 
-	0x4C, 0x32, 
-	0xFE, 0x7F, 
-	0x25, 0xA4, 
-	0x25, 0xA4, 
-	0xFF, 0xFF, 
-	0x25, 0xA4, 
-	0x25, 0xA4, 
-	0xFE, 0x7F, 
-	0x4C, 0x32, 
-	0xF0, 0x0F, 
-	0x00, 0x00, 
-	0x00, 0x00, 
+static constexpr uint8_t bitmap_sig_saw_down_data[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x0E, 0x80, 0x00, 0x60, 
+	0x1E, 0x80, 0x01, 0x60, 
+	0x3E, 0x80, 0x03, 0x60, 
+	0x76, 0x80, 0x07, 0x60, 
+	0xE6, 0x80, 0x0F, 0x60, 
+	0xC6, 0x81, 0x1D, 0x60, 
+	0x86, 0x83, 0x39, 0x60, 
+	0x06, 0x87, 0x71, 0x60, 
+	0x06, 0x8E, 0xE1, 0x60, 
+	0x06, 0x9C, 0xC1, 0x61, 
+	0x06, 0xB8, 0x81, 0x63, 
+	0x06, 0xF0, 0x01, 0x67, 
+	0x06, 0xE0, 0x01, 0x6E, 
+	0x06, 0xC0, 0x01, 0x7C, 
+	0x06, 0x80, 0x01, 0x78, 
+	0x06, 0x00, 0x01, 0x70, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
 };
-static constexpr Bitmap bitmap_icon_aprs {
-	{ 16, 16 }, bitmap_icon_aprs_data
+static constexpr Bitmap bitmap_sig_saw_down {
+	{ 32, 32 }, bitmap_sig_saw_down_data
+};
+
+static constexpr uint8_t bitmap_sig_saw_up_data[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x06, 0x00, 0x01, 0x70, 
+	0x06, 0x80, 0x01, 0x78, 
+	0x06, 0xC0, 0x01, 0x7C, 
+	0x06, 0xE0, 0x01, 0x6E, 
+	0x06, 0xF0, 0x01, 0x67, 
+	0x06, 0xB8, 0x81, 0x63, 
+	0x06, 0x9C, 0xC1, 0x61, 
+	0x06, 0x8E, 0xE1, 0x60, 
+	0x06, 0x87, 0x71, 0x60, 
+	0x86, 0x83, 0x39, 0x60, 
+	0xC6, 0x81, 0x1D, 0x60, 
+	0xE6, 0x80, 0x0F, 0x60, 
+	0x76, 0x80, 0x07, 0x60, 
+	0x3E, 0x80, 0x03, 0x60, 
+	0x1E, 0x80, 0x01, 0x60, 
+	0x0E, 0x80, 0x00, 0x60, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+};
+static constexpr Bitmap bitmap_sig_saw_up {
+	{ 32, 32 }, bitmap_sig_saw_up_data
+};
+
+static constexpr uint8_t bitmap_sig_sine_data[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x03, 0xC0, 0x00, 
+	0x80, 0x07, 0xE0, 0x01, 
+	0xC0, 0x0F, 0xF0, 0x03, 
+	0xC0, 0x0C, 0x30, 0x03, 
+	0x60, 0x18, 0x18, 0x06, 
+	0x60, 0x18, 0x18, 0x06, 
+	0x60, 0x18, 0x18, 0x06, 
+	0x60, 0x18, 0x18, 0x06, 
+	0x30, 0x30, 0x0C, 0x0C, 
+	0x30, 0x30, 0x0C, 0x0C, 
+	0x30, 0x30, 0x0C, 0x0C, 
+	0x30, 0x30, 0x0C, 0x0C, 
+	0x18, 0x60, 0x06, 0x18, 
+	0x1E, 0xE0, 0x07, 0x78, 
+	0x0E, 0xC0, 0x03, 0x70, 
+	0x06, 0x80, 0x01, 0x60, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+};
+static constexpr Bitmap bitmap_sig_sine {
+	{ 32, 32 }, bitmap_sig_sine_data
+};
+
+static constexpr uint8_t bitmap_sig_square_data[] = {
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0xFE, 0x83, 0xFF, 0x60, 
+	0xFE, 0x83, 0xFF, 0x60, 
+	0x06, 0x83, 0xC1, 0x60, 
+	0x06, 0x83, 0xC1, 0x60, 
+	0x06, 0x83, 0xC1, 0x60, 
+	0x06, 0x83, 0xC1, 0x60, 
+	0x06, 0x83, 0xC1, 0x60, 
+	0x06, 0x83, 0xC1, 0x60, 
+	0x06, 0x83, 0xC1, 0x60, 
+	0x06, 0x83, 0xC1, 0x60, 
+	0x06, 0x83, 0xC1, 0x60, 
+	0x06, 0x83, 0xC1, 0x60, 
+	0x06, 0x83, 0xC1, 0x60, 
+	0x06, 0x83, 0xC1, 0x60, 
+	0x06, 0xFF, 0xC1, 0x7F, 
+	0x06, 0xFF, 0xC1, 0x7F, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 
+};
+static constexpr Bitmap bitmap_sig_square {
+	{ 32, 32 }, bitmap_sig_square_data
 };
 
 static constexpr uint8_t bitmap_sig_tri_data[] = {
@@ -1727,26 +1785,130 @@ static constexpr Bitmap bitmap_sig_tri {
 	{ 32, 32 }, bitmap_sig_tri_data
 };
 
-static constexpr uint8_t bitmap_icon_soundboard_data[] = {
+static constexpr uint8_t bitmap_stop_data[] = {
 	0x00, 0x00, 
-	0xFF, 0xFF, 
-	0x63, 0x8C, 
-	0x21, 0x84, 
-	0x21, 0x84, 
-	0xDF, 0xFB, 
-	0x63, 0x8C, 
-	0x21, 0x84, 
-	0x21, 0x84, 
-	0xDF, 0xFB, 
-	0x63, 0x8C, 
-	0x21, 0x84, 
-	0x21, 0x84, 
-	0xFF, 0xFF, 
+	0x00, 0x00, 
+	0xFC, 0x3F, 
+	0xFC, 0x3F, 
+	0xFC, 0x3F, 
+	0xFC, 0x3F, 
+	0xFC, 0x3F, 
+	0xFC, 0x3F, 
+	0xFC, 0x3F, 
+	0xFC, 0x3F, 
+	0xFC, 0x3F, 
+	0xFC, 0x3F, 
+	0xFC, 0x3F, 
+	0xFC, 0x3F, 
 	0x00, 0x00, 
 	0x00, 0x00, 
 };
-static constexpr Bitmap bitmap_icon_soundboard {
-	{ 16, 16 }, bitmap_icon_soundboard_data
+static constexpr Bitmap bitmap_stop {
+	{ 16, 16 }, bitmap_stop_data
+};
+
+static constexpr uint8_t bitmap_stripes_data[] = {
+	0xFF, 0x03, 0xC0, 
+	0xFF, 0x01, 0xE0, 
+	0xFF, 0x00, 0xF0, 
+	0x7F, 0x00, 0xF8, 
+	0x3F, 0x00, 0xFC, 
+	0x1F, 0x00, 0xFE, 
+	0x0F, 0x00, 0xFF, 
+	0x07, 0x80, 0xFF, 
+};
+static constexpr Bitmap bitmap_stripes {
+	{ 24, 8 }, bitmap_stripes_data
+};
+
+static constexpr uint8_t bitmap_tab_edge_data[] = {
+	0x00, 
+	0x01, 
+	0x01, 
+	0x03, 
+	0x03, 
+	0x03, 
+	0x07, 
+	0x07, 
+	0x07, 
+	0x0F, 
+	0x0F, 
+	0x0F, 
+	0x1F, 
+	0x1F, 
+	0x1F, 
+	0x1F, 
+	0x3F, 
+	0x3F, 
+	0x3F, 
+	0x7F, 
+	0x7F, 
+	0x7F, 
+	0xFF, 
+	0xFF, 
+};
+static constexpr Bitmap bitmap_tab_edge {
+	{ 8, 24 }, bitmap_tab_edge_data
+};
+
+static constexpr uint8_t bitmap_target_data[] = {
+	0x80, 0x00, 
+	0x80, 0x00, 
+	0xE0, 0x03, 
+	0x90, 0x04, 
+	0x88, 0x08, 
+	0x04, 0x10, 
+	0x04, 0x10, 
+	0x1F, 0x7C, 
+	0x04, 0x10, 
+	0x04, 0x10, 
+	0x88, 0x08, 
+	0x90, 0x04, 
+	0xE0, 0x03, 
+	0x80, 0x00, 
+	0x80, 0x00, 
+	0x00, 0x00, 
+};
+static constexpr Bitmap bitmap_target {
+	{ 16, 16 }, bitmap_target_data
+};
+
+static constexpr uint8_t bitmap_target_calibrate_data[] = {
+	0x02, 0x00, 0x00, 0x40, 
+	0x07, 0x00, 0x00, 0xE0, 
+	0x0E, 0x00, 0x00, 0x70, 
+	0x1C, 0x00, 0x00, 0x38, 
+	0x38, 0x00, 0x00, 0x1C, 
+	0x70, 0x00, 0x00, 0x0E, 
+	0xE0, 0x00, 0x00, 0x07, 
+	0xC0, 0x01, 0x80, 0x03, 
+	0x80, 0x03, 0xC0, 0x01, 
+	0x00, 0x07, 0xE0, 0x00, 
+	0x00, 0x0E, 0x70, 0x00, 
+	0x00, 0x1C, 0x38, 0x00, 
+	0x00, 0x38, 0x1C, 0x00, 
+	0x00, 0x70, 0x0E, 0x00, 
+	0x00, 0xE0, 0x07, 0x00, 
+	0x00, 0xC0, 0x03, 0x00, 
+	0x00, 0xC0, 0x03, 0x00, 
+	0x00, 0xE0, 0x07, 0x00, 
+	0x00, 0x70, 0x0E, 0x00, 
+	0x00, 0x38, 0x1C, 0x00, 
+	0x00, 0x1C, 0x38, 0x00, 
+	0x00, 0x0E, 0x70, 0x00, 
+	0x00, 0x07, 0xE0, 0x00, 
+	0x80, 0x03, 0xC0, 0x01, 
+	0xC0, 0x01, 0x80, 0x03, 
+	0xE0, 0x00, 0x00, 0x07, 
+	0x70, 0x00, 0x00, 0x0E, 
+	0x38, 0x00, 0x00, 0x1C, 
+	0x1C, 0x00, 0x00, 0x38, 
+	0x0E, 0x00, 0x00, 0x70, 
+	0x07, 0x00, 0x00, 0xE0, 
+	0x02, 0x00, 0x00, 0x40, 
+};
+static constexpr Bitmap bitmap_target_calibrate {
+	{ 32, 32 }, bitmap_target_calibrate_data
 };
 
 static constexpr uint8_t bitmap_target_verify_data[] = {
@@ -1787,168 +1949,6 @@ static constexpr Bitmap bitmap_target_verify {
 	{ 32, 32 }, bitmap_target_verify_data
 };
 
-static constexpr uint8_t bitmap_target_data[] = {
-	0x80, 0x00, 
-	0x80, 0x00, 
-	0xE0, 0x03, 
-	0x90, 0x04, 
-	0x88, 0x08, 
-	0x04, 0x10, 
-	0x04, 0x10, 
-	0x1F, 0x7C, 
-	0x04, 0x10, 
-	0x04, 0x10, 
-	0x88, 0x08, 
-	0x90, 0x04, 
-	0xE0, 0x03, 
-	0x80, 0x00, 
-	0x80, 0x00, 
-	0x00, 0x00, 
-};
-static constexpr Bitmap bitmap_target {
-	{ 16, 16 }, bitmap_target_data
-};
-
-static constexpr uint8_t bitmap_icon_clk_ext_data[] = {
-	0x00, 
-	0x00, 
-	0xDC, 
-	0x54, 
-	0x54, 
-	0x54, 
-	0x54, 
-	0x76, 
-	0x00, 
-	0x10, 
-	0x38, 
-	0x7C, 
-	0x10, 
-	0x10, 
-	0x10, 
-	0x00, 
-};
-static constexpr Bitmap bitmap_icon_clk_ext {
-	{ 8, 16 }, bitmap_icon_clk_ext_data
-};
-
-static constexpr uint8_t bitmap_icon_sstv_data[] = {
-	0x10, 0x08, 
-	0x20, 0x04, 
-	0x40, 0x02, 
-	0x80, 0x01, 
-	0xFF, 0xFF, 
-	0x03, 0xF8, 
-	0x5D, 0xF0, 
-	0x05, 0xD0, 
-	0x01, 0xF0, 
-	0x01, 0xD0, 
-	0x01, 0xF0, 
-	0x01, 0xD0, 
-	0x01, 0xF0, 
-	0x01, 0x90, 
-	0x03, 0x98, 
-	0xFF, 0xFF, 
-};
-static constexpr Bitmap bitmap_icon_sstv {
-	{ 16, 16 }, bitmap_icon_sstv_data
-};
-
-static constexpr uint8_t bitmap_icon_burger_data[] = {
-	0xE0, 0x07, 
-	0x58, 0x18, 
-	0x04, 0x25, 
-	0x12, 0x40, 
-	0x85, 0x90, 
-	0x21, 0x84, 
-	0x01, 0x80, 
-	0x06, 0x60, 
-	0xFE, 0x7F, 
-	0x0E, 0x78, 
-	0x1F, 0xFC, 
-	0x39, 0x9F, 
-	0xC3, 0xC0, 
-	0x0E, 0x70, 
-	0xF8, 0x1F, 
-	0x00, 0x00, 
-};
-static constexpr Bitmap bitmap_icon_burger {
-	{ 16, 16 }, bitmap_icon_burger_data
-};
-
-static constexpr uint8_t bitmap_icon_jammer_data[] = {
-	0xA6, 0xAC, 
-	0x73, 0x47, 
-	0xAE, 0xB9, 
-	0x55, 0xD7, 
-	0x7E, 0xAE, 
-	0xD3, 0x45, 
-	0xCA, 0xBA, 
-	0x71, 0x15, 
-	0xDA, 0xFE, 
-	0xF5, 0xAB, 
-	0xAF, 0x98, 
-	0x4A, 0x77, 
-	0xAD, 0xCA, 
-	0x58, 0x7D, 
-	0xBF, 0xAF, 
-	0x5A, 0x65, 
-};
-static constexpr Bitmap bitmap_icon_jammer {
-	{ 16, 16 }, bitmap_icon_jammer_data
-};
-
-static constexpr uint8_t bitmap_bulb_off_data[] = {
-	0x00, 0x3C, 0x00, 
-	0x00, 0xC3, 0x00, 
-	0x80, 0x00, 0x01, 
-	0x40, 0x00, 0x02, 
-	0x20, 0x00, 0x04, 
-	0x20, 0x00, 0x04, 
-	0x10, 0x00, 0x08, 
-	0x10, 0x42, 0x08, 
-	0x10, 0x42, 0x08, 
-	0x10, 0x24, 0x08, 
-	0x10, 0x24, 0x08, 
-	0x20, 0x24, 0x04, 
-	0x20, 0x2C, 0x04, 
-	0x40, 0x34, 0x02, 
-	0x80, 0x3C, 0x01, 
-	0x00, 0xFF, 0x00, 
-	0x00, 0xE3, 0x00, 
-	0x00, 0xBD, 0x00, 
-	0x00, 0xC3, 0x00, 
-	0x00, 0xBD, 0x00, 
-	0x00, 0xC3, 0x00, 
-	0x00, 0xBD, 0x00, 
-	0x00, 0x42, 0x00, 
-	0x00, 0x3C, 0x00, 
-};
-static constexpr Bitmap bitmap_bulb_off {
-	{ 24, 24 }, bitmap_bulb_off_data
-};
-
-static constexpr uint8_t bitmap_icon_file_image_data[] = {
-	0x00, 0x00, 
-	0xFF, 0xFF, 
-	0x01, 0x80, 
-	0x01, 0x80, 
-	0x89, 0x80, 
-	0xC1, 0x81, 
-	0xE1, 0xA3, 
-	0xB1, 0xB3, 
-	0x89, 0xDC, 
-	0x07, 0x8C, 
-	0x01, 0x90, 
-	0x01, 0x80, 
-	0xAB, 0x82, 
-	0xFF, 0xD5, 
-	0xFF, 0xFF, 
-	0x00, 0x00, 
-};
-static constexpr Bitmap bitmap_icon_file_image {
-	{ 16, 16 }, bitmap_icon_file_image_data
-};
-
 
 } /* namespace ui */
 
diff --git a/firmware/application/ui_navigation.cpp b/firmware/application/ui_navigation.cpp
index 7ea305c2..76688913 100644
--- a/firmware/application/ui_navigation.cpp
+++ b/firmware/application/ui_navigation.cpp
@@ -378,7 +378,7 @@ TransmittersMenuView::TransmittersMenuView(NavigationView& nav) {
 		{ "ADS-B [S]",		ui::Color::yellow(), 	&bitmap_icon_adsb,		[&nav](){ nav.push<ADSBTxView>(); } },
 		{ "APRS", 			ui::Color::orange(),	&bitmap_icon_aprs,		[&nav](){ nav.push<APRSTXView>(); } },
 		{ "BHT Xy/EP", 		ui::Color::green(), 	&bitmap_icon_bht,		[&nav](){ nav.push<BHTView>(); } },
-		{ "GPS Sim",		ui::Color::yellow(),	&bitmap_gps_sim,		[&nav](){ nav.push<GpsSimAppView>(); } },
+		{ "GPS Sim",		ui::Color::yellow(),	&bitmap_icon_gps_sim,		[&nav](){ nav.push<GpsSimAppView>(); } },
 		{ "Jammer", 		ui::Color::yellow(),	&bitmap_icon_jammer,	[&nav](){ nav.push<JammerView>(); } },
 		{ "Key fob", 		ui::Color::orange(),	&bitmap_icon_keyfob,	[&nav](){ nav.push<KeyfobView>(); } },
 		{ "LGE tool", 		ui::Color::yellow(),	&bitmap_icon_lge,		[&nav](){ nav.push<LGEView>(); } },
@@ -430,15 +430,15 @@ void SystemMenuView::hackrf_mode(NavigationView& nav) {
 SystemMenuView::SystemMenuView(NavigationView& nav) {
 	add_items({
 		//{ "Play dead",				ui::Color::red(),		&bitmap_icon_playdead,	[&nav](){ nav.push<PlayDeadView>(); } },
-		{ "Receive", 	ui::Color::dark_cyan(),		&bitmap_icon_receivers,	[&nav](){ nav.push<ReceiversMenuView>(); } },
-		{ "Transmit", 	ui::Color::green(),			&bitmap_icon_transmit,	[&nav](){ nav.push<TransmittersMenuView>(); } },
-		{ "Capture",	ui::Color::blue(),			&bitmap_icon_capture,	[&nav](){ nav.push<CaptureAppView>(); } },
-		{ "Replay",		ui::Color::purple(),		&bitmap_icon_replay,	[&nav](){ nav.push<ReplayAppView>(); } },
-		{ "Calls",		ui::Color::yellow(),	    &bitmap_icon_closecall,	[&nav](){ nav.push<SearchView>(); } },
+		{ "Receive", 	ui::Color::cyan(),		&bitmap_icon_receivers,	[&nav](){ nav.push<ReceiversMenuView>(); } },
+		{ "Transmit", 	ui::Color::cyan(),			&bitmap_icon_transmit,	[&nav](){ nav.push<TransmittersMenuView>(); } },
+		{ "Capture",	ui::Color::red(),			&bitmap_icon_capture,	[&nav](){ nav.push<CaptureAppView>(); } },
+		{ "Replay",		ui::Color::green(),		&bitmap_icon_replay,	[&nav](){ nav.push<ReplayAppView>(); } },
+		{ "Calls",		ui::Color::yellow(),	    &bitmap_icon_search,	[&nav](){ nav.push<SearchView>(); } },
 		{ "Scanner",	ui::Color::orange(),		&bitmap_icon_scanner,	[&nav](){ nav.push<ScannerView>(); } },
-		{ "Tools",		ui::Color::light_grey(),	&bitmap_icon_utilities,	[&nav](){ nav.push<UtilitiesMenuView>(); } },
+		{ "Tools",		ui::Color::cyan(),	&bitmap_icon_utilities,	[&nav](){ nav.push<UtilitiesMenuView>(); } },
 		{ "Options", 	ui::Color::cyan(),			&bitmap_icon_setup,	  	[&nav](){ nav.push<SettingsMenuView>(); } },
-		{ "Debug",		ui::Color::cyan(),			nullptr,   				[&nav](){ nav.push<DebugMenuView>(); } },
+		{ "Debug",		ui::Color::light_grey(),		&bitmap_icon_debug,   				[&nav](){ nav.push<DebugMenuView>(); } },
 		{ "HackRF", 	ui::Color::cyan(),			&bitmap_icon_hackrf,	[this, &nav](){ hackrf_mode(nav); } },
 		//{ "About", 		ui::Color::cyan(),			nullptr,				[&nav](){ nav.push<AboutView>(); } }
 	});
diff --git a/firmware/graphics/icon_btle.png b/firmware/graphics/icon_btle.png
new file mode 100644
index 0000000000000000000000000000000000000000..116569bdc8cdf8e0b1dc8b0f5db4dbb90e835c5b
GIT binary patch
literal 174
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7N<3X0LoEE)P7dTcV8G%0
z`Y-?64G%VCiY$8_E?C=p@syH#sOVuOC7thFRU5@!B${O!bapoFVVKgpK6L`KKx%sV
zXT?MMtT#{d>_~i<bJbodN~<8@bhE{CK?Sks?D<g=Gk=_xxUClTFk@<=eAN6--Oy{3
cj>|U-&JetxIN5=Lfq}u()z4*}Q$iC10A!~=y#N3J

literal 0
HcmV?d00001

diff --git a/firmware/graphics/icon_camera.png b/firmware/graphics/icon_camera.png
index 9b10509f582650e7076aee1735cca10ec948f7e0..305219f7384d269cf24a715f31592e5648f17d7c 100644
GIT binary patch
delta 117
zcmb=L%s4?MKho31F~q|E?qowg1_ci0xBumP4<2E?rI2`8@MR$DhBkJe{Ip|_7=r4!
zG(NJronQ=6`s&sG@anoV$>Ka~x>VVxu8#QN-mpFAOJ`O>RPLKK$7_VFufAyVWt6sl
Yll?Yqg>wW00|SGntDnm{r-UX302g2|X#fBK

delta 92
zcmbQtST#W<%+b@uF~p)bIUyn8hrgnn4%-0+EBRQN_1p<ug^Y`09CQ>i7<T!pNILlJ
w5HMkw-TTF~K}mmsrh=_NCu6gL{)BGE{(er8RU!7e3=9kmp00i_>zopr054b@*#H0l

diff --git a/firmware/graphics/icon_capture.png b/firmware/graphics/icon_capture.png
index 4c87b741b8f470a3170402f7578ee414e9f533e0..420bc1bd91329aaa02ac7b96f05d1ed9ae01de88 100644
GIT binary patch
delta 114
zcmbQp*v~jYB|FU1#WBRfKRM+9)4%`!|I5#|P*zq}-eu9npw}xgYXVP`w8NUT8Honh
z8+a8$jW;Pyk#<=3wjjJm>c9byLJ6K4tA?ZME8`qJPc4yZnxk#FNqwKe!D(|DKYz6U
V`F+P;HU<U;22WQ%mvv4FO#mN2E(8Do

delta 116
zcmeBYoX9vqB{#y;#WBR9ckje#E(S#&=I8&WpZhm8R@&)%s$+|UQQ$?R16rIKfA=tF
zy~}iXna`w>%jNO>S}cD`*k`vp3H!J`wq6d^V@%HCDp=xn_tJrh|MNe*5Pvrzb~3Zy
YPkElAw=U}$7#J8lUHx3vIVCg!00C|=`v3p{

diff --git a/firmware/graphics/icon_debug.png b/firmware/graphics/icon_debug.png
new file mode 100644
index 0000000000000000000000000000000000000000..cddab6049a86fd883806e131091cd88a0b74b7d4
GIT binary patch
literal 175
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7$~;{hLoEESP7dTdpupk$
z@Lzk{!6Qpoi~g8vuh!JR=;+xqN=ilRr|sU|wf->69U*~rMRpCmP73o<4clb6Bo4iu
z%CMB-ci7rKkvFS!9ZsG<J$2K3&5YhFdmD{nU%UKsGrKHNFnhWoLp$HyA56<GpGcde
feCwdWKZe<B9`GJGB(;=*fq}u()z4*}Q$iB}L@!16

literal 0
HcmV?d00001

diff --git a/firmware/graphics/icon_ert.png b/firmware/graphics/icon_ert.png
index 41e87b5fb8d539229f148ebbb3a5484556854294..32dc85bf190be48bcaea9fc8d4575f1b99c4952a 100644
GIT binary patch
delta 152
zcmbQlxP@_oN`1Abi(`m||I$f;Tn7|*oUi|u-?i9jLD|Ws7t<G1cCP#wv##LRnKO0j
zN@i#E6S|g19#nDYOl5k`R?emI(Z<5-0K?N4L2LP@NKAYyB6Fa3rrL{uH&ZV%P2u*M
z!^C#mE=+%Q`Jp+HUFY3{IG+fod0uC*=`3wpXC`c}R{oFaoX8A8-jj)Wp$rTR44$rj
JF6*2UngBT}KwJO-

delta 117
zcmdnOIEitBN?xR=i(`mI@75qkJ_ZAp*Z=Kvj~hB4-R2@TF-(+ULLv{Ri|v6WA$+kX
z{uu`~E$51HcXOP*K>23xho^jb=iF~Q1e$DO-n7Y?ZJn*f?qE5S1J%8P7OMlfRtbt%
Y6y7m%S)tv;z`(%Z>FVdQ&MBb@08soaLjV8(

diff --git a/firmware/graphics/icon_gps_sim.png b/firmware/graphics/icon_gps_sim.png
new file mode 100644
index 0000000000000000000000000000000000000000..ed870c80eeae4497f9937ff9f18920e5d147e75c
GIT binary patch
literal 174
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7N<3X0LoEE)PWBc$pupk$
z^k4h3!%XU}4PPD$O;$H@6ti5lYK@+f(Cd`}Gw(_$nlsFbJ<-5%vq8fpkX@2-&EHpz
zh6+x54!bk7>|xrV*l%rdZo#i)bBEo(_1Wib@%OZGblV-^IK%QRgZbKSvsahQj6A;X
c%G95AHbwB0>ghlR1_lOCS3j3^P6<s60P`b06951J

literal 0
HcmV?d00001

diff --git a/firmware/graphics/icon_hackrf.png b/firmware/graphics/icon_hackrf.png
index edd9da99e2f78684754ac42868a841a7b6ea8fb0..4287adbfac82d830572036c099958eff889413bf 100644
GIT binary patch
delta 118
zcmZo=oXj{uB|pm3#WBRfKRLyL`Tzg_|NHgY&ZMWLq_{jxHfD$w^x-{Gu!z?oj3;?=
z3WHfb4<j?jQHC?oCm1`0R2Q=u81U3cG%V_zpw01&^@$3PF;Dn2rj@Rq>^nA@*)cP8
Yd&UUbZwLrvU|?YIboFyt=akR{0O8dq_5c6?

delta 104
zcmbQt*vdFTCDF&z#WBR9H#s38;YUCB|NsBxm&*tpTPw-tVa6b>aFbP}n(-zBlitBx
z?UQT^w3p1{=4fFrj8m|bnmE@l&}osENzjv~M$c0s(hgnX40HS!<Yj0FU1nflVDNPH
Kb6Mw<&;$Ukek5uD

diff --git a/firmware/graphics/icon_nrf.png b/firmware/graphics/icon_nrf.png
new file mode 100644
index 0000000000000000000000000000000000000000..9dc54b0e4941c9dd5b68fd322ec4b08dcdcee47e
GIT binary patch
literal 147
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7qC8z3LoEE?PBP?UP~c#G
z`Cq>GWrHG@Bm10^DMe;$Cp=oQipfFEn|<2{Mx}h?2ic)(&9-Ny_nM!UyTrU;udw@-
zT)sutQD!UJ+ZpuNG5IoHP4e$pGLL2Zzh=g)xgmmy)~h2J7#J8lUHx3vIVCg!06*g}
ADF6Tf

literal 0
HcmV?d00001

diff --git a/firmware/graphics/icon_previous.png b/firmware/graphics/icon_previous.png
index f3db19c0bfe189321089d7bae48a170f5919baff..e4e73110b213c1590c6adaa7616b5a127ff5a634 100644
GIT binary patch
delta 118
zcmZo>oXj{uB|pN`#WBRff9>RpLJR^NEO-Ccmn=(@@Z^u(lNMfRFpFDKUulsk!%Ml<
z`&qb`v4~of1hmd=Xx!e=>RWK=O!qg|s;ummt7h7Tj!7ztouMcHYuqn)s$J$Kr*=x&
Yg7X=7&U*$11_n=8KbLh*2~7+P06x(x^Z)<=

delta 102
zcmbQt*vvRVCEm-^#WBR9H#s38;fKHCvPQ-m3>VoJXsexMFfvi*Q3y6Z!Voj-Bjb)L
zrQCzEej$bpO8O7D3?}g$Nayg>oap1sp`Ogt7GSAAp^H(0=ZM!8-J@L$3=9mOu6{1-
HoD!M<`mrJ9

diff --git a/firmware/graphics/icon_receivers.png b/firmware/graphics/icon_receivers.png
index 03077c3d5e4e328119de63971f35c4f83c03aa8d..7e6be2f7bb2a3b5609fb9e0976d26a9b878b3aee 100644
GIT binary patch
delta 106
zcmeBW>}8ywmF)j^k|7_10tfTk|MIbi7cd7Y6dFz3THtKilj3nHi6J1{XhSo9#ir)3
z+s^R5Kl;#-^<z-0lBP$>5|fM0Q_h_z$xW5Lzc}c7Y-rTaiO~mG9#;D>PI6fh&A`CG
N;OXk;vd$@?2>>c~ELs2n

delta 106
zcmeBW>}8ywmE5~_k|P&`f&kOs|I1&?oy!W@(7r+T$dn~dkI7cN7FW+;nV@|kQswvY
zyWE$Bm?q8EW_T*-{D)2BP_o0!I<_f)UwD0C;duMz|9&PP#cK_-Z+`IaXtO?d@FW8R
O1B0ilpUXO@geCy(Z!gOL

diff --git a/firmware/graphics/icon_replay.png b/firmware/graphics/icon_replay.png
index 445884dad79b5c2303fc7e5a560c161d033dac66..ae6e694770527ea0ac0ac766c333fabcd4dd922b 100644
GIT binary patch
delta 120
zcmbQpIF)gNN@0wri(`m||Iy2ad<+U4%nrZ*yC=)|bgbO6<3&eBVTR#}&W?y=hJ^2x
zZsKMS6odjgSVKB^?@SOoFu|-q$=|{4AA@DWTlqOJa~O4QnH9WlWer(6sUa(cbH#CO
be&H2Y90Y~^_WWjGU|{fc^>bP0l+XkK7OpOt

delta 116
zcmbQrIFWIJN^XRwi(`mIZ*oFH!ViDNV|tCe0;vp!46gi}80=ato+ijB&FPAjo%rua
z7DpT7kv5wyxu!;!8=_B++PktX*f~w<wx>CRcf>=}xiehcV(bnGJF8euH(~BL$iSv`
WU%!bfzlec>fx*+&&t;ucLK6U%W+_Gh

diff --git a/firmware/graphics/icon_scanner.png b/firmware/graphics/icon_scanner.png
index 007c4b7c47b2d25731e3d7eb3e88f0b61c959ae5..d78bb2800a73abd2b10ba51fa101ce028d466c29 100644
GIT binary patch
delta 122
zcmZo-oX$8wr8v&h#WBRf|Li1dJ_ZF2=i9&Kr4BDhoG|~Gi@175rLL<BLxalK_xlzr
zY9FeX@rjNVdoQW6_(bT71xz=56Zz6*Z(40Q9Jz5C^K7T=#^nKaicFzRGw#kf77^I#
dvTn8ogT9>u=drNuh71f044$rjF6*2UngC;&FB1R&

delta 101
zcmbQv*u*$NCC<~+#WBR9H#s38;fKHCG2KpnfmDVw0yQ;FYzo<j7R|I^{*a+|k6{zj
zL=|QZRxvrdsXPlR75LULim0pXVS8}aaE2uNY?)L}P6oyYWit}bdM;&PU|{fc^>bP0
Hl+XkK!{;F;

diff --git a/firmware/graphics/icon_search.png b/firmware/graphics/icon_search.png
new file mode 100644
index 0000000000000000000000000000000000000000..178cb77ffacefacfb878b17f5c998bfcbecae416
GIT binary patch
literal 185
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s78a!PbLoEEaP7dTdpupjL
z{4f7mCe9^gOnRsP1YJmP)e`3k4UIV-<B}r2Jwk2OVc{c;6*KZ*7p+UUWe_`|;oV%0
zhqc@Xu7oTI_@%F~<XuP)*PcbL`*%Cl=O;^~8VOkmPSq28yXMT!hADFC@83UQvt-+#
o{JB45|C%oQd7s1%Y}>~;!J&ZjwSlHA0|Nttr>mdKI;Vst0CaIhj{pDw

literal 0
HcmV?d00001

diff --git a/firmware/graphics/icon_setup.png b/firmware/graphics/icon_setup.png
index 5c4a388e93f5683cc184d884757a1fece64bb9cf..04bf7938b94c9a8010d2906740a8582fa398010f 100644
GIT binary patch
delta 129
zcmd0q&p1J)I?dC?F~q|EY;ZIeg96W~-||&~2|XvSH7}@}dv0f|%DkD9iVOjzLN~-T
zSjs*<x!1a0JEGJ;N#pch1-}z<E><57o^{JobX%zTN4W83PnP$Y7k9;`y>Dm@pKkF=
lZ0%Or%bV{@q&nCzOP3}Ht~1oEVqjok@O1TaS?83{1OW8YHY5N5

delta 78
zcmbQwm@`4e!`RcsF~p)bIUyn8hrgm*K?1|{B$-bwya!m@W-wM9X=`F+Sv=7}fmf8d
jgLj8x7K7?V4u;NUzeGy3H!(3VFfe$!`njxgN@xNAFWed$

diff --git a/firmware/graphics/icon_stealth.png b/firmware/graphics/icon_stealth.png
index d7874e20cb70eb91f95404038e3e38ab2c0278ee..1e44b35dacb1667917d7077f1181b8b4e8447d1b 100644
GIT binary patch
delta 137
zcmZo=T*^2>r9Ru!#WBRfe``=Q-vI@V==b#*V)h0%L{%>SY<G}nn0L5+&HXbv&lpZb
z{XBV=Z;8V@rj#=|##)}~7v{c=<v#Z+EJo}2>9Soxn|JlMT6lyRI8;nkZAj8(?7J2b
tJO9+qNtp{zpG)7%D&ezVtAbJEql=(qR*nV(0|SGntDnm{rv#=Z1_1fHIU4`~

delta 104
zcmZ3=*vdFTCDF&z#WBR9H#s38;fKHCvQ3Nz4c;={GRv5f7`hmrFujs)IDLM{lMhl3
zO%~q-jy+{s6Su%ZtU%JCM~2yK|3Xa#J;j3}fm5ci-(x5;V7UHN^K;$$OIi#J3=E#G
KelF{r5}E)q2Peh=

diff --git a/firmware/graphics/icon_tpms.png b/firmware/graphics/icon_tpms.png
index 868d82bfe5c6514542f8288231803531b372763c..93afb7a5849a0df3586ec32cd524ff4382c85ed3 100644
GIT binary patch
delta 155
zcmbQsxSer=N_~x|i(`m||Ix{TTn7v|oS*;Y&n;Y#F|Egl?QQtVXDdVB3LU?@clMbx
zGhROyY}IhOz_293HTfG;$>LK=2RL>z`t(F<%x5yNy4FA8LeG>#j#uYz_@XJXc-6JE
zoys378GOBcWd9zCzqLXkr{|@@SFxjiFKZ~fZ2eR^b5}<BT=C@_MRqX0x!;k&z`(%Z
O>FVdQ&MBdZfdK#|)<?wv

delta 128
zcmdnaIG1sPN@a?ti(`mI@7BqNd<+U4%)kHpzfNh|a#U~Dh6Wi{5r#1H@++}>g!=a%
zOKu2OXIvP=dQc<Sk<&o6d_u?FgDe*k)*LwaPrKrv8|%8P4V?2O))z7z;n!^Cu>a3$
ke&!w*W61q1wyS3Ke|0|W-m`EL0|Nttr>mdKI;Vst0QJ^15&!@I

diff --git a/firmware/graphics/icon_transmit.png b/firmware/graphics/icon_transmit.png
index 8b4468c2a969d9579038720d8929645c46a1ec44..aba3c91011855d8bc723e928daf2c0238f3382e3 100644
GIT binary patch
delta 115
zcmbQiIDv73N=~?^i(`m||J%uqTnq{vEVuvL-<n{sB1X8yuQWEjOZ8%tveF_$h7E>N
z5;+Q!cQncNskAp7^x4Fbw?TcO?2CexNAx9X_iGyNQk|MQ@1^dgC!6;7=Ou?;V0>8Z
W!^p8~i!lQO1B0ilpUXO@geCw9M=f0d

delta 123
zcmbQhID>J5N=dw@i(`mI@7AExTnq{vxBvg&GS|l9naLuBQ%B`87zDDO2U#RW9T1RM
z-6wrLNLwg5%tU|AfnC>j)t6{4aVY;MTJf$?Dc1MlPkA4v#S2~^RO6j-M{u`ESr7Lo
fod-gU9n7Wk7-TP5cx_-{U|{fc^>bP0l+XkKXd^No

diff --git a/firmware/graphics/icon_utilities.png b/firmware/graphics/icon_utilities.png
index 46423f6b362a56d050b3b05ad96701ed9e9e9a76..8eaf5df563a252457cd72aedec1201ba0c76eb54 100644
GIT binary patch
delta 123
zcmbQhID>J5N=dw@i(`m||J%vdd<+U4&Ts$n_bRq6d896T#Z!IlH%7+5OGd`UoD4rs
zeZ5d&Z<8b}Epf{69#hfIc?+jBN-Mu@XbERCXknhux@OS{)f$J_AKvMoIkqSJacF~y
fN9DDt#jHyrTLd{WoBlE|Ffe$!`njxgN@xNA19dWz

delta 115
zcmbQiIDv73N=~?^i(`mIZ*oFH!jFF5#mq6UBtCc~NHiT*xWgup$+0TQXixLX2`=FR
z+gg>FFWj`?J@AZGLVBiJ21Dnpjqb{JXIXe1!aW>}zZo20?eIG#BJHr`GJ7W@gKVZW
W(~e#2^B5Qy7(8A5T-G@yGywp~BPl8X

diff --git a/firmware/graphics/record.png b/firmware/graphics/record.png
index c44509902363cb2e597cbfc070c438d6e0420b89..420bc1bd91329aaa02ac7b96f05d1ed9ae01de88 100644
GIT binary patch
delta 113
zcmb>LXPlst9p>rc7-Hd{oN|Ea-~a#r<!4(cD=RDSvgl&a>y?-_fu~8@VNKeMM1$)M
zyb7Vln-r%=JFI(K5Z)to;DAS=1W%1s!%_8>agLs+mPj?t(Kg(qzR%#`w7HC*KidEN
UzGE*N0|Nttr>mdKI;Vst02WIv@c;k-

delta 97
zcmeBYte>C~?dIv?7-G?zoRE<4!(VaPM8+2l8O$7vd)NfHIiws;ct`LaSjHeOe^x+B
z${}UVgL1};Y!8Z!8XcA;nFP(5uwv4blLw|qGBBjgVUUfhJ8+nRfq}u()z4*}Q$iB}
Dk8>iT