diff --git a/src/pyefis/config/preferences.yaml b/src/pyefis/config/preferences.yaml
index 91877437..89618d9f 100644
--- a/src/pyefis/config/preferences.yaml
+++ b/src/pyefis/config/preferences.yaml
@@ -116,7 +116,7 @@ includes:
   SCREENS_CONFIG: screens/default_list.yaml
   # The include for the main navigations buttons:
   BUTTON_GROUP1: includes/buttons/vertical/screen_changing_PFD-EMS-EMS2-ANDROID-RADIO-SIXPACK-Units.yaml
-  #BUTTON_GROUP1: includes/buttons/horizontal/screen_changing_PFD-EMS-EMS2-ANDROID-RADIO-SIXPACK-Units.yaml
+  BUTTON_GROUP2: includes/buttons/horizontal/screen_changing_PFD-EMS-EMS2-ANDROID-RADIO-SIXPACK-Units.yaml
 
   # The include for the encoder button control feature
   HMI_ENCODER_BUTTONS: hmi/encoder_input.yaml
diff --git a/src/pyefis/config/screens/android-portrait.yaml b/src/pyefis/config/screens/android-portrait.yaml
index 86b04775..dfac9b7c 100644
--- a/src/pyefis/config/screens/android-portrait.yaml
+++ b/src/pyefis/config/screens/android-portrait.yaml
@@ -61,7 +61,7 @@ ANDROID:
       span:
         columns: 195.5
         rows: 15
-    - type: include,BUTTON_GROUP1
+    - type: include,BUTTON_GROUP2
       disabled: BUTTONS
       row: 100
       column: 0
diff --git a/src/pyefis/config/screens/ems-portrait.yaml b/src/pyefis/config/screens/ems-portrait.yaml
index 8e5864f0..fef4f2d1 100644
--- a/src/pyefis/config/screens/ems-portrait.yaml
+++ b/src/pyefis/config/screens/ems-portrait.yaml
@@ -53,7 +53,7 @@ EMS:
       span:
         columns: 195.5
         rows: 15
-    - type: include,BUTTON_GROUP1
+    - type: include,BUTTON_GROUP2
       disabled: BUTTONS 
       row: 100
       column: 0
diff --git a/src/pyefis/config/screens/ems2-portrait.yaml b/src/pyefis/config/screens/ems2-portrait.yaml
index 5aa816f6..966a0bf8 100644
--- a/src/pyefis/config/screens/ems2-portrait.yaml
+++ b/src/pyefis/config/screens/ems2-portrait.yaml
@@ -233,7 +233,7 @@ EMS2:
             -
               preferences: BAR21
 
-    - type: include,BUTTON_GROUP1
+    - type: include,BUTTON_GROUP2
       disabled: BUTTONS
       row: 100
       column: 0
diff --git a/src/pyefis/config/screens/pfd-portrait.yaml b/src/pyefis/config/screens/pfd-portrait.yaml
index ddb17b5f..2baaa549 100644
--- a/src/pyefis/config/screens/pfd-portrait.yaml
+++ b/src/pyefis/config/screens/pfd-portrait.yaml
@@ -34,7 +34,7 @@ PFD:
       span:
         columns: 195.5
         rows: 15
-    - type: include,BUTTON_GROUP1
+    - type: include,BUTTON_GROUP2
       disabled: BUTTONS 
       row: 100
       column: 0
diff --git a/src/pyefis/config/screens/radio-portrait.yaml b/src/pyefis/config/screens/radio-portrait.yaml
index 149cd722..eaf19e4a 100644
--- a/src/pyefis/config/screens/radio-portrait.yaml
+++ b/src/pyefis/config/screens/radio-portrait.yaml
@@ -29,7 +29,7 @@ RADIO:
       span:
         rows: 45
         columns: 200
-    - type: include,BUTTON_GROUP1
+    - type: include,BUTTON_GROUP2
       disabled: BUTTONS
       row: 100
       column: 0
diff --git a/src/pyefis/config/screens/sixpack-portrait.yaml b/src/pyefis/config/screens/sixpack-portrait.yaml
index 635ce2f0..666ea7e3 100644
--- a/src/pyefis/config/screens/sixpack-portrait.yaml
+++ b/src/pyefis/config/screens/sixpack-portrait.yaml
@@ -8,7 +8,7 @@ SIXPACK:
     columns: 200
     draw_grid: false
   instruments:
-    - type: include,BUTTON_GROUP1
+    - type: include,BUTTON_GROUP2
       disabled: BUTTONS
       row: 100
       column: 0