diff --git a/firmware/application/apps/ui_encoders.hpp b/firmware/application/apps/ui_encoders.hpp
index 4316522044313176ce310027f8847f6743ba8ab3..ee311e38999184805fd8debb3edc2ff21971237b 100644
--- a/firmware/application/apps/ui_encoders.hpp
+++ b/firmware/application/apps/ui_encoders.hpp
@@ -55,7 +55,7 @@ private:
 	//uint8_t scan_count;
 	//double scan_progress;
 	//unsigned int scan_index;
-	int16_t waveform_buffer[512];
+	int16_t waveform_buffer[550];
 	const encoder_def_t * encoder_def { };
 	//uint8_t enc_type = 0;
 
diff --git a/firmware/application/bitmap.hpp b/firmware/application/bitmap.hpp
index 1d62a4158ab716b73a5ccab78d0db19903df00e2..bddc5d3dc8b6497a7e0f004c720a9f2bebda21bf 100644
--- a/firmware/application/bitmap.hpp
+++ b/firmware/application/bitmap.hpp
@@ -439,9 +439,9 @@ static constexpr uint8_t bitmap_icon_debug_data[] = {
 	0xAA, 0x0A, 
 	0x52, 0x01, 
 	0xAA, 0x12, 
-	0x02, 0x18, 
+	0x02, 0x08, 
 	0x02, 0xFC, 
-	0x02, 0x18, 
+	0x02, 0x08, 
 	0xFE, 0x13, 
 	0x00, 0x00, 
 };
@@ -1008,8 +1008,8 @@ static constexpr uint8_t bitmap_icon_receivers_data[] = {
 	0x80, 0x01, 
 	0x80, 0x01, 
 	0x80, 0x01, 
-	0xF8, 0x1F, 
-	0xF0, 0x0F, 
+	0x98, 0x19, 
+	0xB0, 0x0D, 
 	0xE0, 0x07, 
 	0xC0, 0x03, 
 	0x83, 0xC1, 
@@ -1074,10 +1074,10 @@ static constexpr uint8_t bitmap_icon_scanner_data[] = {
 	0x00, 0x00, 
 	0x03, 0x01, 
 	0x80, 0x01, 
-	0xC3, 0x01, 
+	0xC3, 0x00, 
 	0xE0, 0xFF, 
 	0xEF, 0xFF, 
-	0xC0, 0x01, 
+	0xC0, 0x00, 
 	0x83, 0x01, 
 	0x00, 0x01, 
 	0x03, 0x00, 
@@ -1355,8 +1355,8 @@ static constexpr uint8_t bitmap_icon_transmit_data[] = {
 	0x80, 0x01, 
 	0xC0, 0x03, 
 	0xE0, 0x07, 
-	0xF0, 0x0F, 
-	0xF8, 0x1F, 
+	0xB0, 0x0D, 
+	0x98, 0x19, 
 	0x80, 0x01, 
 	0x80, 0x01, 
 	0x80, 0x01, 
@@ -1396,14 +1396,14 @@ static constexpr Bitmap bitmap_icon_utilities {
 };
 
 static constexpr uint8_t bitmap_more_data[] = {
-	0x18, 
-	0x18, 
-	0x18, 
-	0x18, 
-	0xFF, 
-	0x7E, 
-	0x3C, 
-	0x18, 
+	0x20, 
+	0x00, 
+	0x20, 
+	0x00, 
+	0x20, 
+	0xA8, 
+	0x70, 
+	0x20, 
 };
 static constexpr Bitmap bitmap_more {
 	{ 8, 8 }, bitmap_more_data
@@ -1432,22 +1432,22 @@ static constexpr Bitmap bitmap_play {
 };
 
 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, 
+	0xC0, 0x07, 
+	0xF0, 0x1F, 
+	0xF8, 0x3F, 
+	0xFC, 0x7F, 
+	0xFC, 0x7F, 
+	0x66, 0xCC, 
+	0x56, 0xF7, 
+	0x66, 0xF6, 
+	0x56, 0xF7, 
+	0x56, 0xCC, 
+	0xFC, 0x7F, 
+	0xFC, 0x7F, 
+	0xF8, 0x3F, 
+	0xF0, 0x1F, 
+	0xC0, 0x07, 
+	0x00, 0x00, 
 };
 static constexpr Bitmap bitmap_record {
 	{ 16, 16 }, bitmap_record_data
@@ -1808,21 +1808,21 @@ static constexpr Bitmap bitmap_sig_tri {
 };
 
 static constexpr uint8_t bitmap_stop_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, 
-	0x00, 0x00, 
+	0xFF, 0xFF, 
+	0xFF, 0xFF, 
+	0xFF, 0xFF, 
+	0xFF, 0xFF, 
+	0xFF, 0xFF, 
+	0x8B, 0xCD, 
+	0xDD, 0xAA, 
+	0xDB, 0xCA, 
+	0xDB, 0xEA, 
+	0xDD, 0xED, 
+	0xFF, 0xFF, 
+	0xFF, 0xFF, 
+	0xFF, 0xFF, 
+	0xFF, 0xFF, 
+	0xFF, 0xFF, 
 	0x00, 0x00, 
 };
 static constexpr Bitmap bitmap_stop {
diff --git a/firmware/application/ui/ui_receiver.hpp b/firmware/application/ui/ui_receiver.hpp
index 6d38775b8790975cd07c958e4906ad0d56be72cd..6bad8886b707bfdc27cedf597b59b8282d409f5e 100644
--- a/firmware/application/ui/ui_receiver.hpp
+++ b/firmware/application/ui/ui_receiver.hpp
@@ -247,8 +247,6 @@ public:
 			parent_pos,
 			5,
 			{
-				{ "  1  ",        1 },
-				{ "  10 ",       10 },
 				{ "  100",      100 },
 				{ "  1k ",     1000 },
 				{ "  3k ",     3000 },	/* Approximate SSB bandwidth */
diff --git a/firmware/application/ui_record_view.cpp b/firmware/application/ui_record_view.cpp
index be8c818e44823c82c4cafe600d2b1024180ce0ca..8d174e2202b7ae5c05aa2fabaa33834f3e34e9d5 100644
--- a/firmware/application/ui_record_view.cpp
+++ b/firmware/application/ui_record_view.cpp
@@ -201,6 +201,11 @@ void RecordView::start() {
 	update_status_display();
 }
 
+void RecordView::on_hide() {
+	stop(); // Stop current recording
+	View::on_hide();
+}
+
 void RecordView::stop() {
 	if( is_active() ) {
 		capture_thread.reset();
diff --git a/firmware/application/ui_record_view.hpp b/firmware/application/ui_record_view.hpp
index d1911d1dfe38ba5df84736fec21d5afbe94aee12..6f3a6a142b2a92d9e0164cda5841cf556ffa7c0e 100644
--- a/firmware/application/ui_record_view.hpp
+++ b/firmware/application/ui_record_view.hpp
@@ -59,6 +59,7 @@ public:
 
 	void start();
 	void stop();
+	void on_hide() override;
 
 	bool is_active() const;
 
diff --git a/firmware/graphics/icon_debug.png b/firmware/graphics/icon_debug.png
index cddab6049a86fd883806e131091cd88a0b74b7d4..7d5101e4b8805a6e45172e6167c94e8877a5b6dd 100644
Binary files a/firmware/graphics/icon_debug.png and b/firmware/graphics/icon_debug.png differ
diff --git a/firmware/graphics/icon_receivers.png b/firmware/graphics/icon_receivers.png
index 7e6be2f7bb2a3b5609fb9e0976d26a9b878b3aee..6eba70a1568673345a5eba246a5e1fd93117044e 100644
Binary files a/firmware/graphics/icon_receivers.png and b/firmware/graphics/icon_receivers.png differ
diff --git a/firmware/graphics/icon_scanner.png b/firmware/graphics/icon_scanner.png
index d78bb2800a73abd2b10ba51fa101ce028d466c29..27a253f39022441f7328fcdf025954c5aafb0fe7 100644
Binary files a/firmware/graphics/icon_scanner.png and b/firmware/graphics/icon_scanner.png differ
diff --git a/firmware/graphics/icon_transmit.png b/firmware/graphics/icon_transmit.png
index aba3c91011855d8bc723e928daf2c0238f3382e3..6570b39cc53572db1750c1cd0a7d7417fb307aba 100644
Binary files a/firmware/graphics/icon_transmit.png and b/firmware/graphics/icon_transmit.png differ
diff --git a/firmware/graphics/more.png b/firmware/graphics/more.png
index 9a96ee75a7f5b9f49bbeb23dd8f5a67511290fa5..e16250a92a9622c22ff2fb834768366cb3f067ae 100644
Binary files a/firmware/graphics/more.png and b/firmware/graphics/more.png differ
diff --git a/firmware/graphics/record.png b/firmware/graphics/record.png
index 420bc1bd91329aaa02ac7b96f05d1ed9ae01de88..879d87aead0ef2a6384cd22a00e13bad18fef4e5 100644
Binary files a/firmware/graphics/record.png and b/firmware/graphics/record.png differ
diff --git a/firmware/graphics/stop.png b/firmware/graphics/stop.png
index 1a72cb0549f969a7a7182526473345131f120512..e1f4ccdaa005f2d27db5638c4e7fe8b05cd1946d 100644
Binary files a/firmware/graphics/stop.png and b/firmware/graphics/stop.png differ
diff --git a/firmware/tools/make_bitmap.py b/firmware/tools/make_bitmap.py
index 7c3c6ea680455b2310574051a1bcecf16f5300e7..103a58c08e326cbefbd87e4cc6bdd5cb342c8e28 100755
--- a/firmware/tools/make_bitmap.py
+++ b/firmware/tools/make_bitmap.py
@@ -112,4 +112,4 @@ f.write("\n")
 f.write("} /* namespace ui */\n\n")
 f.write("#endif/*__BITMAP_HPP__*/\n")
 
-print "Converted " + str(count) + " files"
+print("Converted " + str(count) + " files")