diff --git a/app/src/main/res/layout/combopump_fragment.xml b/app/src/main/res/layout/combopump_fragment.xml
index 37dbd6c759..369e4afcd6 100644
--- a/app/src/main/res/layout/combopump_fragment.xml
+++ b/app/src/main/res/layout/combopump_fragment.xml
@@ -470,13 +470,6 @@
                 android:layout_marginTop="5dp"
                 android:background="@color/listdelimiter" />
 
-            <TextView
-                android:id="@+id/combo_queue"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text=""
-                android:textAlignment="center" />
-
         </LinearLayout>
 
     </ScrollView>
@@ -495,47 +488,51 @@
             android:layout_height="wrap_content"
             android:orientation="horizontal">
 
-            <Button
+            <info.nightscout.utils.SingleClickButton
                 android:id="@+id/combo_refresh_button"
                 style="@style/ButtonSmallFontStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
+                android:layout_weight="0.5"
+                android:layout_marginRight="-4dp"
                 android:drawableTop="@drawable/icon_actions_refill"
                 android:paddingLeft="0dp"
                 android:paddingRight="0dp"
                 android:text="@string/combo_refresh" />
 
-            <Button
+            <info.nightscout.utils.SingleClickButton
                 android:id="@+id/combo_alerts_button"
                 style="@style/ButtonSmallFontStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
+                android:layout_weight="0.5"
+                android:layout_marginRight="-4dp"
                 android:drawableTop="@drawable/icon_cp_announcement"
                 android:paddingLeft="0dp"
                 android:paddingRight="0dp"
                 android:visibility="gone"
                 android:text="@string/combo_pump_alerts" />
 
-            <Button
+            <info.nightscout.utils.SingleClickButton
                 android:id="@+id/combo_tdds_button"
                 style="@style/ButtonSmallFontStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
+                android:layout_weight="0.5"
+                android:layout_marginRight="-4dp"
                 android:drawableTop="@drawable/icon_danarstats"
                 android:paddingLeft="0dp"
                 android:paddingRight="0dp"
                 android:visibility="gone"
                 android:text="@string/combo_tdds" />
 
-            <Button
+            <info.nightscout.utils.SingleClickButton
                 android:id="@+id/combo_full_history_button"
                 style="@style/ButtonSmallFontStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
+                android:layout_weight="0.5"
+                android:layout_marginRight="-4dp"
                 android:drawableTop="@drawable/icon_danarhistory"
                 android:paddingLeft="0dp"
                 android:paddingRight="0dp"