diff --git a/Makefile b/Makefile
index 1112a26..e3b5714 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ ENABLE_WIDE_RX                := 1
 ENABLE_TX_WHEN_AM             := 0
 ENABLE_CTCSS_TAIL_PHASE_SHIFT := 1
 ENABLE_MAIN_KEY_HOLD          := 1
-ENABLE_BOOT_BEEPS             := 1
+ENABLE_BOOT_BEEPS             := 0
 ENABLE_DTMF_DECODER           := 1
 ENABLE_COMPANDER              := 1
 #ENABLE_SINGLE_VFO_CHAN       := 1
diff --git a/app/app.c b/app/app.c
index 15cce91..4c5490b 100644
--- a/app/app.c
+++ b/app/app.c
@@ -1200,10 +1200,8 @@ void APP_CheckKeys(void)
 	// scan the hardware keys
 	Key = KEYBOARD_Poll();
 
-	#ifdef ENABLE_BOOT_BEEPS
-		if (Key != KEY_INVALID)
-			boot_counter_10ms = 0;   // cancel bbot beeps if any key pressed
-	#endif
+	if (Key != KEY_INVALID)
+		boot_counter_10ms = 0;   // cancel bbot beeps if any key pressed
 
 	if (gKeyReading0 != Key)
 	{	// new key pressed
diff --git a/bitmaps.c b/bitmaps.c
index b458c82..b918ac4 100644
--- a/bitmaps.c
+++ b/bitmaps.c
@@ -212,7 +212,7 @@ const uint8_t BITMAP_VOX[18] =
 		0b00011000,
 		0b00100000,
 		0b01111111,
-	
+
 		0b00000000,
 		0b01100011,
 		0b00010100,
@@ -298,7 +298,7 @@ const uint8_t BITMAP_TDR2[12] =
 		0b00001001,
 		0b00001001,
 		0b00000001,
-	
+
 		0b00000000,
 		0b01111111,
 		0b00000010,
@@ -325,25 +325,25 @@ const uint8_t BITMAP_TDR2[12] =
 		0b01001001,
 		0b00110001
 	};
-#else
-	const uint8_t BITMAP_SC[12] =
-	{	// "SC"
-		0b00000000,
-		0b01000110,
-		0b01001001,
-		0b01001001,
-		0b01001001,
-		0b00110001,
-	
-		0b00000000,
-		0b00111110,
-		0b01000001,
-		0b01000001,
-		0b01000001,
-		0b00100010
-	};
 #endif
 
+const uint8_t BITMAP_SC[12] =
+{	// "SC"
+	0b00000000,
+	0b01000110,
+	0b01001001,
+	0b01001001,
+	0b01001001,
+	0b00110001,
+
+	0b00000000,
+	0b00111110,
+	0b01000001,
+	0b01000001,
+	0b01000001,
+	0b00100010
+};
+
 const uint8_t BITMAP_Antenna[5] =
 {
 	0b00000011,
diff --git a/bitmaps.h b/bitmaps.h
index 6cfe61d..12205af 100644
--- a/bitmaps.h
+++ b/bitmaps.h
@@ -39,10 +39,10 @@ extern const uint8_t BITMAP_TDR2[12];
 
 #ifdef ENABLE_NOAA
 	extern const uint8_t BITMAP_NOAA[12];
-#else
-	extern const uint8_t BITMAP_SC[12];
 #endif
 
+extern const uint8_t BITMAP_SC[12];
+
 extern const uint8_t BITMAP_Antenna[5];
 extern const uint8_t BITMAP_AntennaLevel1[3];
 extern const uint8_t BITMAP_AntennaLevel2[3];
diff --git a/firmware b/firmware
index 3c84416..e81fb93 100644
Binary files a/firmware and b/firmware differ
diff --git a/firmware.bin b/firmware.bin
index 5648def..c800a90 100644
Binary files a/firmware.bin and b/firmware.bin differ
diff --git a/firmware.packed.bin b/firmware.packed.bin
index 5ad9dfd..44ed2f8 100644
Binary files a/firmware.packed.bin and b/firmware.packed.bin differ
diff --git a/main.c b/main.c
index 61dd2ea..2ea1eba 100644
--- a/main.c
+++ b/main.c
@@ -97,9 +97,7 @@ void Main(void)
 
 	gMenuListCount = 0;
 
-	#ifdef ENABLE_BOOT_BEEPS
-		boot_counter_10ms = 250;   // 2.5 sec
-	#endif
+	boot_counter_10ms = 250;   // 2.5 sec
 	
 	if (!gChargingWithTypeC && !gBatteryDisplayLevel)
 	{
diff --git a/misc.c b/misc.c
index b19d5d9..5966656 100644
--- a/misc.c
+++ b/misc.c
@@ -198,9 +198,7 @@ volatile bool     gFlagTailNoteEliminationComplete;
 	volatile bool gScheduleFM;
 #endif
 
-#ifdef ENABLE_BOOT_BEEPS
-	volatile uint8_t  boot_counter_10ms;
-#endif
+volatile uint8_t  boot_counter_10ms;
 
 uint16_t          gCurrentRSSI;
 
diff --git a/misc.h b/misc.h
index 9e0b777..fc4ce95 100644
--- a/misc.h
+++ b/misc.h
@@ -255,9 +255,7 @@ extern volatile bool         gFlagTailNoteEliminationComplete;
 #endif
 extern uint16_t              gCurrentRSSI;
 extern uint8_t               gIsLocked;
-#ifdef ENABLE_BOOT_BEEPS
-	extern volatile uint8_t  boot_counter_10ms;
-#endif
+extern volatile uint8_t      boot_counter_10ms;
 
 void    NUMBER_Get(char *pDigits, uint32_t *pInteger);
 void    NUMBER_ToDigits(uint32_t Value, char *pDigits);
diff --git a/scheduler.c b/scheduler.c
index 7b7f35a..4c236aa 100644
--- a/scheduler.c
+++ b/scheduler.c
@@ -104,7 +104,5 @@ void SystickHandler(void)
 
 	DECREMENT(gVoxStopCountdown_10ms);
 
-	#ifdef ENABLE_BOOT_BEEPS
-		DECREMENT(boot_counter_10ms);
-	#endif
+	DECREMENT(boot_counter_10ms);
 }
diff --git a/ui/status.c b/ui/status.c
index 1fa8df4..e493399 100644
--- a/ui/status.c
+++ b/ui/status.c
@@ -42,14 +42,14 @@ void UI_DisplayStatus(const bool test_display)
 	#ifdef ENABLE_NOAA
 		if (gIsNoaaMode || test_display)
 			memmove(gStatusLine + 7, BITMAP_NOAA, sizeof(BITMAP_NOAA));
-	#else
-		if (gScanState != SCAN_OFF ||
-		    gCssScanMode != CSS_SCAN_MODE_OFF ||
-		    gScanCssState != SCAN_CSS_STATE_OFF ||
-			gScreenToDisplay == DISPLAY_SCANNER ||
-		    test_display)
-			memmove(gStatusLine + 7, BITMAP_SC, sizeof(BITMAP_SC));
+		else
 	#endif
+	if (gScanState != SCAN_OFF ||
+	    gCssScanMode != CSS_SCAN_MODE_OFF ||
+	    gScanCssState != SCAN_CSS_STATE_OFF ||
+		gScreenToDisplay == DISPLAY_SCANNER ||
+	    test_display)
+		memmove(gStatusLine + 7, BITMAP_SC, sizeof(BITMAP_SC));
 	
 	#ifdef ENABLE_FMRADIO
 		if (gSetting_KILLED)