diff --git a/source/Core/Drivers/Font.h b/source/Core/Drivers/Font.h
index 115b30b6..16ed3529 100644
--- a/source/Core/Drivers/Font.h
+++ b/source/Core/Drivers/Font.h
@@ -125,79 +125,80 @@ const uint8_t WarningBlock24[] = {
     0x00, 0x00, 0x00, 0xC0, 0xB0, 0x8C, 0x83, 0x80, 0x80, 0x80, 0x80, 0xB3, 0xB3, 0xB3, 0x80, 0x80, 0x80, 0x80, 0x83, 0x8C, 0xB0, 0xC0, 0x00, 0x00};
 
 #if defined(MODEL_TS100) + defined(MODEL_Pinecil) >= 1
-const uint8_t idleScreenBG[] = {
-    // width = 84
+const uint8_t buttonA[] = {
+    // width = 42
     // height = 16
-    0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x04, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x81, 0xbd, 0x81, 0x01, 0x01, 0xfd, 0x01, 0x01, 0x71, 0x55, 0x71,
-    0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x04, 0x18, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x04, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-    0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x19, 0x25, 0xc1, 0x01, 0x19, 0x25, 0xc1, 0x01, 0x31, 0x49, 0x81, 0x01, 0x02, 0x02, 0x04, 0x18, 0xe0, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x18, 0x20, 0x40, 0x40, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x83, 0xba, 0x83, 0x80, 0x8e, 0xaa, 0x8e, 0x80, 0x80, 0xbf, 0x80,
-    0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x20, 0x18, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x18, 0x22, 0x4a, 0x46, 0x8a, 0xa6, 0x8a, 0xa6, 0x8a, 0xa6,
-    0x8a, 0xa6, 0x8e, 0xa6, 0x8e, 0xa6, 0x8e, 0xa6, 0x8e, 0xbe, 0x80, 0xae, 0x94, 0x8c, 0x94, 0x88, 0x8a, 0x89, 0x80, 0x40, 0x40, 0x20, 0x18, 0x07, 0x00, 0x00, 0x00, 0x00};
+    0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x04, 0x02, 0x02, 0x01, 0x81, 0x49, 0x31, 0x01, 0xc1, 0x25, 0x19, 0x01, 0xc1, 0x25, 0x19, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+    0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x04, 0x18, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x18, 0x20, 0x40, 0x40, 0x80, 0x89, 0x8a, 0x88, 0x94,
+    0x8c, 0x94, 0xae, 0x80, 0xbe, 0x8e, 0xa6, 0x8e, 0xa6, 0x8e, 0xa6, 0x8e, 0xa6, 0x8a, 0xa6, 0x8a, 0xa6, 0x8a, 0xa6, 0x8a, 0x46, 0x4a, 0x22, 0x18, 0x07, 0x00, 0x00, 0x00};
+
 const uint8_t disconnectedTip[] = {
-    //
-    // 41 x 16
+    // width = 42
+    // height = 16
     0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0xc0, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xcc, 0x9c, 0x38, 0x70, 0xe0, 0xc0, 0x80, 0x20, 0x70, 0x38, 0x1c, 0xcc, 0x40,
-    0x80, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xc0, 0x60, 0xe0, 0x01, 0x01, 0x01, 0x02, 0x01, 0x02, 0x05, 0x00, 0x07, 0x01, 0x04, 0x01, 0x04, 0x01, 0x04,
-    0x31, 0x38, 0x1c, 0x0e, 0x04, 0x01, 0x03, 0x07, 0x0e, 0x1c, 0x39, 0x30, 0x01, 0x03, 0x00, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x04, 0x09, 0x0f};
+    0x80, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xc0, 0x60, 0xe0, 0x00, 0x01, 0x01, 0x01, 0x02, 0x01, 0x02, 0x05, 0x00, 0x07, 0x01, 0x04, 0x01, 0x04, 0x01,
+    0x04, 0x31, 0x38, 0x1c, 0x0e, 0x04, 0x01, 0x03, 0x07, 0x0e, 0x1c, 0x39, 0x30, 0x01, 0x03, 0x00, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x04, 0x09, 0x0f, 0x00};
 #endif
 
 #if defined(MODEL_TS80) + defined(MODEL_TS80P) >= 1
-const uint8_t idleScreenBG[] = {
-    // width = 84
+const uint8_t buttonA[] = {
+    // width = 42
     // height = 16
-    0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x04, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x81, 0xbd, 0x81, 0x01, 0x01, 0xfd, 0x01, 0x01, 0x71, 0x55, 0x71,
-    0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x04, 0x18, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x04, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-    0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x19, 0x25, 0xc1, 0x01, 0x19, 0x25, 0xc1, 0x01, 0x31, 0x49, 0x81, 0x01, 0x02, 0x02, 0x04, 0x18, 0xe0, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x18, 0x20, 0x40, 0x40, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x83, 0xba, 0x83, 0x80, 0x8e, 0xaa, 0x8e, 0x80, 0x80, 0xbf, 0x80,
-    0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x20, 0x18, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x18, 0x20, 0x48, 0x48, 0x88, 0x88, 0x88, 0x80, 0x94, 0x8c,
-    0x94, 0x8c, 0x94, 0x8c, 0x94, 0x80, 0x8c, 0xa6, 0x8e, 0xa6, 0x9c, 0x80, 0x95, 0x8c, 0x88, 0x88, 0x8a, 0x81, 0x80, 0x40, 0x40, 0x20, 0x18, 0x07, 0x00, 0x00, 0x00, 0x00};
+    0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x04, 0x02, 0x02, 0x01, 0x81, 0x49, 0x31, 0x01, 0xc1, 0x25, 0x19, 0x01, 0xc1, 0x25, 0x19, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+    0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x04, 0x18, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x18, 0x20, 0x40, 0x40, 0x80, 0x81, 0x8a, 0x88, 0x88,
+    0x8c, 0x95, 0x80, 0x9c, 0xa6, 0x8e, 0xa6, 0x8c, 0x80, 0x94, 0x8c, 0x94, 0x8c, 0x94, 0x8c, 0x94, 0x80, 0x88, 0x88, 0x88, 0x48, 0x48, 0x20, 0x18, 0x07, 0x00, 0x00, 0x00};
+
 const uint8_t disconnectedTip[] = {
-    //
-    // 41 x 16
+    // width = 42
+    // height = 16
     0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x80, 0xc0, 0xc0, 0xc0, 0x80, 0x00, 0x80, 0x80, 0x80, 0x8c, 0x9c, 0x38, 0x70, 0xe0, 0xc0, 0x80, 0x20, 0x70, 0x38, 0x1c, 0x0c, 0x00,
-    0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xe0, 0xa0, 0xe0, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x03, 0x04, 0x01, 0x04, 0x01, 0x00, 0x02, 0x01, 0x02,
-    0x31, 0x38, 0x1c, 0x0e, 0x04, 0x01, 0x03, 0x07, 0x0e, 0x1c, 0x39, 0x31, 0x01, 0x01, 0x00, 0x02, 0x01, 0x02, 0x01, 0x04, 0x01, 0x04, 0x01, 0x0a, 0x01, 0x0f};
+    0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xe0, 0xa0, 0xe0, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x03, 0x04, 0x01, 0x04, 0x01, 0x00, 0x02, 0x01,
+    0x02, 0x31, 0x38, 0x1c, 0x0e, 0x04, 0x01, 0x03, 0x07, 0x0e, 0x1c, 0x39, 0x31, 0x01, 0x01, 0x00, 0x02, 0x01, 0x02, 0x01, 0x04, 0x01, 0x04, 0x01, 0x0a, 0x01, 0x0f, 0x00};
 #endif
 
 #ifdef MODEL_MHP30
-const uint8_t idleScreenBG[] = {
-    // width = 84
+const uint8_t buttonA[] = {
+    // width = 42
     // height = 16
-    0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x04, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x81, 0xbd, 0x81, 0x01, 0x01, 0xfd, 0x01, 0x01, 0x71, 0x55, 0x71,
-    0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x04, 0x18, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x04, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x81,
-    0x81, 0x99, 0xa5, 0x01, 0xc1, 0xd9, 0xe5, 0x21, 0xe1, 0xf1, 0x89, 0x41, 0xc1, 0x81, 0x81, 0x81, 0x81, 0x01, 0x01, 0x02, 0x02, 0x04, 0x18, 0xe0, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x18, 0x20, 0x40, 0x40, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x83, 0xba, 0x83, 0x80, 0x8e, 0xaa, 0x8e, 0x80, 0x80, 0xbf, 0x80,
-    0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x20, 0x18, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x18, 0x20, 0x40, 0x40, 0x86, 0x89, 0x85, 0x91, 0x8b, 0x93,
-    0x8b, 0xa3, 0x97, 0xa7, 0x97, 0xa7, 0x8f, 0xaf, 0x87, 0x97, 0xa5, 0x86, 0x93, 0x8b, 0x93, 0x83, 0x89, 0xa5, 0x89, 0x46, 0x40, 0x20, 0x18, 0x07, 0x00, 0x00, 0x00, 0x00};
+    0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x04, 0x02, 0x02, 0x81, 0x81, 0x41, 0x41, 0x41, 0x41, 0x21, 0x01, 0xc1, 0x25, 0x19, 0x01, 0x81, 0x49, 0x31, 0x01, 0xc1, 0x25, 0x19,
+    0x01, 0xa1, 0xa1, 0x41, 0x41, 0x01, 0x02, 0x02, 0x04, 0x18, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x18, 0x20, 0x40, 0x40, 0x83, 0x87, 0x83, 0xab, 0x86,
+    0x96, 0x8e, 0xa6, 0x9c, 0xad, 0x8c, 0xb8, 0x89, 0xa4, 0x84, 0x84, 0x92, 0x82, 0x81, 0xa9, 0x80, 0x84, 0x80, 0x81, 0x80, 0x40, 0x40, 0x20, 0x18, 0x07, 0x00, 0x00, 0x00};
+
 const uint8_t disconnectedTip[] = {
-    //
-    // 41 x 16
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x20, 0xa0, 0x30, 0x70, 0x70, 0x60, 0x4c, 0x9c, 0x38, 0x70, 0xe4, 0xcc, 0x88, 0x20, 0x70, 0x38, 0x9c, 0x4c, 0x60,
-    0x70, 0x60, 0x20, 0xa0, 0x20, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x04, 0x29, 0x10, 0x22, 0x01,
-    0x32, 0x38, 0x1c, 0x0e, 0x04, 0x01, 0x03, 0x07, 0x0e, 0x1c, 0x38, 0x30, 0x01, 0x12, 0x29, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+    // width = 42
+    // height = 16
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0xd0, 0xc8, 0x08, 0x10, 0x10, 0x10, 0x10,
+    0x20, 0x20, 0x20, 0x40, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x04, 0x04, 0x38, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x37, 0x37, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x04, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 #endif
 
-// 16 x 16
-const uint8_t brightnessIcon[]
-    = {0x80, 0x86, 0x8E, 0x9C, 0x18, 0xC0, 0xE0, 0xEF, 0xEF, 0xE0, 0xC0, 0x18, 0x9C, 0x8E, 0x86, 0x80, 0x01, 0x61, 0x71, 0x39, 0x18, 0x03, 0x07, 0xF7, 0xF7, 0x07, 0x03, 0x18, 0x39, 0x71, 0x61, 0x01};
+const uint8_t buttonB[] = {
+    // width = 42
+    // height = 16
+    0x00, 0x00, 0x00, 0xe0, 0x18, 0x04, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x71, 0x55, 0x71, 0x01, 0x01, 0xfd, 0x01, 0x01, 0x81, 0xbd, 0x81, 0x01, 0x01,
+    0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x04, 0x18, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x18, 0x20, 0x40, 0x40, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+    0x80, 0x80, 0xbf, 0x80, 0x80, 0x8e, 0xaa, 0x8e, 0x80, 0x83, 0xba, 0x83, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x20, 0x18, 0x07, 0x00, 0x00, 0x00, 0x00};
 
-// 24 x 16
-const uint8_t invertDisplayIcon[] = {0xFE, 0x01, 0x79, 0x25, 0x79, 0x01, 0xFE, 0x00, 0x20, 0x20, 0x20, 0x20, 0xDF, 0x07, 0x8F, 0xDF, 0xFF, 0x01, 0xFE, 0x86, 0xDA, 0x86, 0xFE, 0x01,
-                                     0x7F, 0x80, 0xA4, 0xBE, 0xA0, 0x80, 0x7F, 0x00, 0x04, 0x0E, 0x1F, 0x04, 0xFB, 0xFB, 0xFB, 0xFB, 0xFF, 0x80, 0x7F, 0x5B, 0x41, 0x5F, 0x7F, 0x80};
+const uint8_t brightnessIcon[] = {
+    // width = 16
+    // height = 16
+    0x80, 0x86, 0x8E, 0x9C, 0x18, 0xC0, 0xE0, 0xEF, 0xEF, 0xE0, 0xC0, 0x18, 0x9C, 0x8E, 0x86, 0x80, 0x01, 0x61, 0x71, 0x39, 0x18, 0x03, 0x07, 0xF7, 0xF7, 0x07, 0x03, 0x18, 0x39, 0x71, 0x61, 0x01};
+
+const uint8_t invertDisplayIcon[] = {
+    // width = 24
+    // height = 16
+    0xFE, 0x01, 0x79, 0x25, 0x79, 0x01, 0xFE, 0x00, 0x20, 0x20, 0x20, 0x20, 0xDF, 0x07, 0x8F, 0xDF, 0xFF, 0x01, 0xFE, 0x86, 0xDA, 0x86, 0xFE, 0x01,
+    0x7F, 0x80, 0xA4, 0xBE, 0xA0, 0x80, 0x7F, 0x00, 0x04, 0x0E, 0x1F, 0x04, 0xFB, 0xFB, 0xFB, 0xFB, 0xFF, 0x80, 0x7F, 0x5B, 0x41, 0x5F, 0x7F, 0x80};
 
 /*
  * 16x16 icons
  * 32 * 3 = Frame size * Frame count
  * */
 const uint8_t SettingsMenuIcons[][32 * 3] = {
-
     // Power
     // 3 frames
-    // width = 16
-    // height = 16
     {
-        // Power 1 frame
+        // Power 1st frame
         // width = 16
         // height = 16
         0x00,
@@ -233,7 +234,7 @@ const uint8_t SettingsMenuIcons[][32 * 3] = {
         0x00,
         0x00,
 
-        // Power 2 frame
+        // Power 2nd frame
         // width = 16
         // height = 16
         0x00,
@@ -308,10 +309,8 @@ const uint8_t SettingsMenuIcons[][32 * 3] = {
 
     // Soldering
     // 3 frames
-    // width = 16
-    // height = 16
     {
-        // Soldering 1 frame
+        // Soldering 1st frame
         // width = 16
         // height = 16
         0x00,
@@ -347,7 +346,7 @@ const uint8_t SettingsMenuIcons[][32 * 3] = {
         0x00,
         0x00,
 
-        // Soldering 2 frame
+        // Soldering 2nd frame
         // width = 16
         // height = 16
         0x00,
@@ -422,10 +421,8 @@ const uint8_t SettingsMenuIcons[][32 * 3] = {
 
     // Sleep
     // 3 frames
-    // width = 16
-    // height = 16
     {
-        // Sleep 1 frame
+        // Sleep 1st frame
         // width = 16
         // height = 16
         0x00,
@@ -461,7 +458,7 @@ const uint8_t SettingsMenuIcons[][32 * 3] = {
         0x00,
         0x00,
 
-        // Sleep 2 frame
+        // Sleep 2nd frame
         // width = 16
         // height = 16
         0x00,
@@ -536,10 +533,8 @@ const uint8_t SettingsMenuIcons[][32 * 3] = {
 
     // UI
     // 3 frames
-    // width = 16
-    // height = 16
     {
-        // UI 1 frame
+        // UI 1st frame
         // width = 16
         // height = 16
         0x00,
@@ -575,7 +570,7 @@ const uint8_t SettingsMenuIcons[][32 * 3] = {
         0x61,
         0x00,
 
-        // UI 2 frame
+        // UI 2nd frame
         // width = 16
         // height = 16
         0x00,
@@ -650,11 +645,9 @@ const uint8_t SettingsMenuIcons[][32 * 3] = {
 
     // Advanced
     // 3 frames
-    /// width = 16
-    // height = 16
     {
-        // Advanced 1 frame
-        /// width = 16
+        // Advanced 1st frame
+        // width = 16
         // height = 16
         0x00,
         0xfe,
@@ -689,8 +682,8 @@ const uint8_t SettingsMenuIcons[][32 * 3] = {
         0x22,
         0x0c,
 
-        // Advanced 2 frame
-        /// width = 16
+        // Advanced 2nd frame
+        // width = 16
         // height = 16
         0xe0,
         0xae,
@@ -726,7 +719,7 @@ const uint8_t SettingsMenuIcons[][32 * 3] = {
         0x1c,
 
         // Advanced final frame
-        /// width = 16
+        // width = 16
         // height = 16
         0x00,
         0x7e,
@@ -765,10 +758,8 @@ const uint8_t SettingsMenuIcons[][32 * 3] = {
 
     // Calibration (Not used, kept for future menu layouts)
     // 3 frames
-    // width = 16
-    // height = 16
     {
-        // Calibration 1 frame (Not used, kept for future menu layouts)
+        // Calibration 1st frame (Not used, kept for future menu layouts)
         // width = 16
         // height = 16
         0x00,
@@ -804,7 +795,7 @@ const uint8_t SettingsMenuIcons[][32 * 3] = {
         0x00,
         0x00,
 
-        // Calibration 2 frame (Not used, kept for future menu layouts)
+        // Calibration 2nd frame (Not used, kept for future menu layouts)
         // width = 16
         // height = 16
         0x00,
diff --git a/source/Core/Threads/GUIThread.cpp b/source/Core/Threads/GUIThread.cpp
index b452d5d0..5c99f085 100644
--- a/source/Core/Threads/GUIThread.cpp
+++ b/source/Core/Threads/GUIThread.cpp
@@ -831,7 +831,8 @@ void showWarnings() {
 #endif
 }
 
-uint8_t idleScreenBGF[sizeof(idleScreenBG)];
+uint8_t buttonAF[sizeof(buttonA)];
+uint8_t buttonBF[sizeof(buttonB)];
 uint8_t disconnectedTipF[sizeof(disconnectedTip)];
 /* StartGUITask function */
 void startGUITask(void const *argument) {
@@ -851,11 +852,10 @@ void startGUITask(void const *argument) {
     // Generate the flipped screen into ram for later use
     // flipped is generated by flipping each row
     for (int row = 0; row < 2; row++) {
-      for (int x = 0; x < 84; x++) {
-        idleScreenBGF[(row * 84) + x] = idleScreenBG[(row * 84) + (83 - x)];
-      }
-      for (int x = 0; x < 41; x++) {
-        disconnectedTipF[(row * 41) + x] = disconnectedTip[(row * 41) + (40 - x)];
+      for (int x = 0; x < 42; x++) {
+        buttonAF[(row * 42) + x]         = buttonA[(row * 42) + (41 - x)];
+        buttonBF[(row * 42) + x]         = buttonB[(row * 42) + (41 - x)];
+        disconnectedTipF[(row * 42) + x] = disconnectedTip[(row * 42) + (41 - x)];
       }
     }
   }
@@ -967,9 +967,9 @@ void startGUITask(void const *argument) {
         if (OLED::getRotation()) {
 #endif
           // in right handed mode we want to draw over the first part
-          OLED::drawArea(55, 0, 41, 16, disconnectedTipF);
+          OLED::drawArea(54, 0, 42, 16, disconnectedTipF);
         } else {
-          OLED::drawArea(0, 0, 41, 16, disconnectedTip);
+          OLED::drawArea(0, 0, 42, 16, disconnectedTip);
         }
 #ifdef OLED_FLIP
         if (!OLED::getRotation()) {
@@ -1033,12 +1033,13 @@ void startGUITask(void const *argument) {
 #else
       if (OLED::getRotation()) {
 #endif
-        OLED::drawArea(12, 0, 84, 16, idleScreenBG);
+        OLED::drawArea(54, 0, 42, 16, buttonAF);
+        OLED::drawArea(12, 0, 42, 16, buttonBF);
         OLED::setCursor(0, 0);
         gui_drawBatteryIcon();
       } else {
-        OLED::drawArea(0, 0, 84, 16, idleScreenBGF); // Needs to be flipped so button ends up
-                                                     // on right side of screen
+        OLED::drawArea(0, 0, 42, 16, buttonA);  // Needs to be flipped so button ends up
+        OLED::drawArea(42, 0, 42, 16, buttonB); // on right side of screen
         OLED::setCursor(84, 0);
         gui_drawBatteryIcon();
       }
@@ -1080,9 +1081,9 @@ void startGUITask(void const *argument) {
           if (OLED::getRotation()) {
 #endif
             // in right handed mode we want to draw over the first part
-            OLED::drawArea(55, 0, 41, 16, disconnectedTipF);
+            OLED::drawArea(54, 0, 42, 16, disconnectedTipF);
           } else {
-            OLED::drawArea(0, 0, 41, 16, disconnectedTip);
+            OLED::drawArea(0, 0, 42, 16, disconnectedTip);
           }
         }
       }