diff --git a/wear/src/main/java/info/nightscout/androidaps/interaction/utils/EditPlusMinusViewAdapter.kt b/wear/src/main/java/info/nightscout/androidaps/interaction/utils/EditPlusMinusViewAdapter.kt
index a1de3f1e9d..81c343db74 100644
--- a/wear/src/main/java/info/nightscout/androidaps/interaction/utils/EditPlusMinusViewAdapter.kt
+++ b/wear/src/main/java/info/nightscout/androidaps/interaction/utils/EditPlusMinusViewAdapter.kt
@@ -36,8 +36,8 @@ class EditPlusMinusViewAdapter(
     val editText =
         eD?.editText ?: eDP?.editText ?: eQL?.editText ?: eQLP?.editText ?: eQR?.editText ?: eQRP?.editText ?: eV?.editText
         ?: throw IllegalArgumentException("Missing require View Binding parameter display")
-    val minusButton =
-        eD?.minusButton ?: eDP?.minusButton ?: eQL?.minusButton ?: eQLP?.minusButton ?: eQR?.minusButton ?: eQRP?.minusButton ?: eV?.minusButton
+    val minButton =
+        eD?.minButton ?: eDP?.minButton ?: eQL?.minButton ?: eQLP?.minButton ?: eQR?.minButton ?: eQRP?.minButton ?: eV?.minButton
         ?: throw IllegalArgumentException("Missing require View Binding parameter display")
     val plusButton1 =
         eD?.plusButton1 ?: eDP?.plusButton1 ?: eQL?.plusButton1 ?: eQLP?.plusButton1 ?: eQR?.plusButton1 ?: eQRP?.plusButton1 ?: eV?.plusButton1
diff --git a/wear/src/main/java/info/nightscout/androidaps/interaction/utils/PlusMinusEditText.kt b/wear/src/main/java/info/nightscout/androidaps/interaction/utils/PlusMinusEditText.kt
index 2430c9e677..f3af7a89eb 100644
--- a/wear/src/main/java/info/nightscout/androidaps/interaction/utils/PlusMinusEditText.kt
+++ b/wear/src/main/java/info/nightscout/androidaps/interaction/utils/PlusMinusEditText.kt
@@ -253,9 +253,9 @@ import java.util.concurrent.TimeUnit
 
         editText.showSoftInputOnFocus = false
         editText.setTextIsSelectable(false)
-        binding.minusButton.setOnTouchListener(this)
-        binding.minusButton.setOnKeyListener(this)
-        binding.minusButton.setOnClickListener(this)
+        binding.minButton.setOnTouchListener(this)
+        binding.minButton.setOnKeyListener(this)
+        binding.minButton.setOnClickListener(this)
         binding.plusButton1.setOnTouchListener(this)
         binding.plusButton1.setOnKeyListener(this)
         binding.plusButton1.setOnClickListener(this)
diff --git a/wear/src/main/res/layout/action_editplusminus_item.xml b/wear/src/main/res/layout/action_editplusminus_item.xml
index 75c3b21594..5360d811dd 100644
--- a/wear/src/main/res/layout/action_editplusminus_item.xml
+++ b/wear/src/main/res/layout/action_editplusminus_item.xml
@@ -1,131 +1,67 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <View
-        android:id="@+id/center"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <EditText
-        android:id="@+id/edit_text"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="-10dp"
-        android:layout_marginHorizontal="10dp"
-        android:cursorVisible="false"
-        android:inputType="numberDecimal"
-        android:textColor="@color/white"
-        android:textSize="40sp"
-        android:gravity="center"
-        app:layout_constraintEnd_toEndOf="@+id/value_background"
-        app:layout_constraintStart_toStartOf="@+id/value_background"
-        app:layout_constraintTop_toTopOf="@+id/value_background"
-        tools:text="123" />
-
-    <TextView
-        android:id="@+id/label"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="-8dp"
-        android:layout_below="@+id/edit_text"
-        android:gravity="center"
-        android:labelFor="@+id/edit_text"
-        android:textColor="@color/white"
-        android:textSize="25sp"
-        app:layout_constraintEnd_toEndOf="@+id/edit_text"
-        app:layout_constraintStart_toStartOf="@+id/edit_text"
-        app:layout_constraintTop_toBottomOf="@id/edit_text"
-        tools:ignore="LabelFor"
-        tools:text="label" />
+    android:layout_height="match_parent"
+    android:layout_gravity="center"
+    android:gravity="center"
+    android:orientation="horizontal">
 
     <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/minus_button"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
+        android:id="@+id/min_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
         android:background="@drawable/circle"
         android:backgroundTint="@color/white"
         android:contentDescription="@string/decrement"
         android:src="@drawable/ic_action_minus"
-        android:tint="@color/white"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintCircle="@+id/center"
-        app:layout_constraintCircleAngle="145"
-        app:layout_constraintCircleRadius="70dp"
-        app:layout_constraintLeft_toLeftOf="parent" />
+        android:tint="@color/white" />
 
-    <androidx.appcompat.widget.AppCompatButton
-        android:id="@+id/plus_button3"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
-        android:background="@drawable/circle"
-        android:backgroundTint="@color/white"
-        android:gravity="center"
-        android:textColor="@color/white"
-        android:textSize="25sp"
-        android:visibility="visible"
-        app:layout_constraintCircle="@+id/center"
-        app:layout_constraintCircleAngle="325"
-        app:layout_constraintCircleRadius="70dp"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="+10" />
-
-    <androidx.appcompat.widget.AppCompatButton
-        android:id="@+id/plus_button2"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
-        android:background="@drawable/circle"
-        android:backgroundTint="@color/white"
-        android:gravity="center"
-        android:textColor="@color/white"
-        android:textSize="30sp"
-        app:layout_constraintBottom_toTopOf="@+id/plus_button1"
-        app:layout_constraintCircle="@+id/center"
-        app:layout_constraintCircleAngle="270"
-        app:layout_constraintCircleRadius="70dp"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/plus_button3"
-        tools:text="+5" />
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/value_background"
-        android:layout_width="108dp"
-        android:layout_height="108dp"
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:layout_marginBottom="8dp"
-        android:background="@drawable/circle"
-        android:backgroundTint="@color/gray_700"
-        android:contentDescription="@string/increment"
-        app:layout_constraintBottom_toTopOf="@+id/minus_button"
-        app:layout_constraintCircle="@+id/center"
-        app:layout_constraintCircleAngle="55"
-        app:layout_constraintCircleRadius="40dp"
-        app:layout_constraintRight_toLeftOf="@id/plus_button1">
+        android:orientation="vertical">
 
-    </androidx.appcompat.widget.AppCompatImageView>
+        <EditText
+            android:id="@+id/edit_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:cursorVisible="false"
+            android:gravity="center_horizontal"
+            android:inputType="numberDecimal"
+            android:minWidth="50dp"
+            android:padding="10dp"
+            android:textColor="@color/white"
+            android:textSize="45sp"
+            tools:text="112" />
+
+        <TextView
+            android:id="@+id/label"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:labelFor="@+id/edit_text"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="@color/white"
+            android:textSize="25sp"
+            tools:ignore="LabelFor"
+            tools:text="label" />
+
+    </LinearLayout>
 
     <androidx.appcompat.widget.AppCompatImageButton
         android:id="@+id/plus_button1"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:background="@drawable/circle"
         android:backgroundTint="@color/white"
         android:contentDescription="@string/increment"
         android:src="@drawable/ic_action_add"
-        android:tint="@color/white"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintCircle="@+id/center"
-        app:layout_constraintCircleAngle="215"
-        app:layout_constraintCircleRadius="70dp"
-        app:layout_constraintRight_toRightOf="parent" />
+        android:tint="@color/white" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</LinearLayout>
diff --git a/wear/src/main/res/layout/action_editplusminus_item_plus.xml b/wear/src/main/res/layout/action_editplusminus_item_plus.xml
index 18ea44cc13..2cbf3a620c 100644
--- a/wear/src/main/res/layout/action_editplusminus_item_plus.xml
+++ b/wear/src/main/res/layout/action_editplusminus_item_plus.xml
@@ -18,13 +18,13 @@
         android:id="@+id/edit_text"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginTop="-6dp"
         android:layout_marginHorizontal="10dp"
+        android:layout_marginTop="-6dp"
         android:cursorVisible="false"
+        android:gravity="center"
         android:inputType="numberDecimal"
         android:textColor="@color/white"
         android:textSize="40sp"
-        android:gravity="center"
         app:layout_constraintEnd_toEndOf="@+id/value_background"
         app:layout_constraintStart_toStartOf="@+id/value_background"
         app:layout_constraintTop_toTopOf="@+id/value_background"
@@ -34,8 +34,8 @@
         android:id="@+id/label"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="-10dp"
         android:layout_below="@+id/edit_text"
+        android:layout_marginTop="-10dp"
         android:gravity="center"
         android:labelFor="@+id/edit_text"
         android:textColor="@color/white"
@@ -47,7 +47,7 @@
         tools:text="label" />
 
     <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/minus_button"
+        android:id="@+id/min_button"
         android:layout_width="48dp"
         android:layout_height="48dp"
         android:background="@drawable/circle"
@@ -95,13 +95,10 @@
         app:layout_constraintTop_toBottomOf="@+id/plus_button3"
         tools:text="+5" />
 
-    <androidx.appcompat.widget.AppCompatImageView
+    <View
         android:id="@+id/value_background"
         android:layout_width="108dp"
         android:layout_height="108dp"
-        android:layout_gravity="center"
-        android:backgroundTint="@color/gray_700"
-        android:contentDescription="@string/increment"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/wear/src/main/res/layout/action_editplusminus_item_quicklefty.xml b/wear/src/main/res/layout/action_editplusminus_item_quicklefty.xml
index d857446caa..c19fb49b50 100644
--- a/wear/src/main/res/layout/action_editplusminus_item_quicklefty.xml
+++ b/wear/src/main/res/layout/action_editplusminus_item_quicklefty.xml
@@ -62,7 +62,7 @@
             tools:text="label" />
 
         <androidx.appcompat.widget.AppCompatImageButton
-            android:id="@+id/minus_button"
+            android:id="@+id/min_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
diff --git a/wear/src/main/res/layout/action_editplusminus_item_quicklefty_plus.xml b/wear/src/main/res/layout/action_editplusminus_item_quicklefty_plus.xml
index a6a92a3eb1..121be927ac 100644
--- a/wear/src/main/res/layout/action_editplusminus_item_quicklefty_plus.xml
+++ b/wear/src/main/res/layout/action_editplusminus_item_quicklefty_plus.xml
@@ -47,7 +47,7 @@
         tools:text="label" />
 
     <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/minus_button"
+        android:id="@+id/min_button"
         android:layout_width="48dp"
         android:layout_height="48dp"
         android:background="@drawable/circle"
@@ -57,8 +57,8 @@
         android:tint="@color/white"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintCircle="@+id/center"
-        app:layout_constraintCircleAngle="145"
-        app:layout_constraintCircleRadius="65dp"
+        app:layout_constraintCircleAngle="215"
+        app:layout_constraintCircleRadius="70dp"
         app:layout_constraintLeft_toLeftOf="parent" />
 
     <androidx.appcompat.widget.AppCompatButton
@@ -72,8 +72,8 @@
         android:textSize="25sp"
         android:visibility="visible"
         app:layout_constraintCircle="@+id/center"
-        app:layout_constraintCircleAngle="325"
-        app:layout_constraintCircleRadius="65dp"
+        app:layout_constraintCircleAngle="35"
+        app:layout_constraintCircleRadius="70dp"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="+10" />
@@ -89,26 +89,25 @@
         android:textSize="30sp"
         app:layout_constraintBottom_toTopOf="@+id/plus_button1"
         app:layout_constraintCircle="@+id/center"
-        app:layout_constraintCircleAngle="270"
-        app:layout_constraintCircleRadius="65dp"
+        app:layout_constraintCircleAngle="90"
+        app:layout_constraintCircleRadius="70dp"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/plus_button3"
         tools:text="+5" />
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/value_background"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
+        android:layout_width="108dp"
+        android:layout_height="108dp"
         android:layout_gravity="center"
-        android:layout_marginLeft="2dp"
-        android:layout_marginBottom="8dp"
         android:background="@drawable/circle"
         android:backgroundTint="@color/gray_700"
         android:importantForAccessibility="no"
-        app:layout_constraintBottom_toTopOf="@+id/minus_button"
-        app:layout_constraintDimensionRatio="1:1"
-        app:layout_constraintLeft_toRightOf="@+id/plus_button3"
-        app:layout_constraintTop_toTopOf="@+id/plus_button3" />
+        app:layout_constraintBottom_toTopOf="@+id/min_button"
+        app:layout_constraintCircle="@+id/center"
+        app:layout_constraintCircleAngle="305"
+        app:layout_constraintCircleRadius="40dp"
+        app:layout_constraintRight_toLeftOf="@id/plus_button1" />
 
     <androidx.appcompat.widget.AppCompatImageButton
         android:id="@+id/plus_button1"
@@ -122,8 +121,8 @@
         android:tint="@color/white"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintCircle="@+id/center"
-        app:layout_constraintCircleAngle="215"
-        app:layout_constraintCircleRadius="65dp"
+        app:layout_constraintCircleAngle="145"
+        app:layout_constraintCircleRadius="70dp"
         app:layout_constraintRight_toRightOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/wear/src/main/res/layout/action_editplusminus_item_quickrighty.xml b/wear/src/main/res/layout/action_editplusminus_item_quickrighty.xml
index d2e7950a05..16daa2e8c6 100644
--- a/wear/src/main/res/layout/action_editplusminus_item_quickrighty.xml
+++ b/wear/src/main/res/layout/action_editplusminus_item_quickrighty.xml
@@ -42,7 +42,7 @@
             tools:text="label" />
 
         <androidx.appcompat.widget.AppCompatImageButton
-            android:id="@+id/minus_button"
+            android:id="@+id/min_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
diff --git a/wear/src/main/res/layout/action_editplusminus_item_quickrighty_plus.xml b/wear/src/main/res/layout/action_editplusminus_item_quickrighty_plus.xml
index 8c5d9cc712..67202d6fe8 100644
--- a/wear/src/main/res/layout/action_editplusminus_item_quickrighty_plus.xml
+++ b/wear/src/main/res/layout/action_editplusminus_item_quickrighty_plus.xml
@@ -18,8 +18,8 @@
         android:id="@+id/edit_text"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginTop="-1dp"
         android:layout_marginHorizontal="10dp"
+        android:layout_marginTop="-1dp"
         android:cursorVisible="false"
         android:gravity="center"
         android:inputType="numberDecimal"
@@ -47,7 +47,7 @@
         tools:text="label" />
 
     <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/minus_button"
+        android:id="@+id/min_button"
         android:layout_width="48dp"
         android:layout_height="48dp"
         android:background="@drawable/circle"
@@ -101,12 +101,14 @@
         android:layout_height="108dp"
         android:layout_gravity="center"
         android:layout_marginBottom="8dp"
-        android:importantForAccessibility="no"
-
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"  />
+        android:background="@drawable/circle"
+        android:backgroundTint="@color/gray_700"
+        android:contentDescription="@string/increment"
+        app:layout_constraintBottom_toTopOf="@+id/min_button"
+        app:layout_constraintCircle="@+id/center"
+        app:layout_constraintCircleAngle="305"
+        app:layout_constraintCircleRadius="40dp"
+        app:layout_constraintRight_toLeftOf="@id/plus_button1" />
 
     <androidx.appcompat.widget.AppCompatImageButton
         android:id="@+id/plus_button1"
diff --git a/wear/src/main/res/layout/action_editplusminus_item_viktoria.xml b/wear/src/main/res/layout/action_editplusminus_item_viktoria.xml
index 2970fcd4d5..be79b0931c 100644
--- a/wear/src/main/res/layout/action_editplusminus_item_viktoria.xml
+++ b/wear/src/main/res/layout/action_editplusminus_item_viktoria.xml
@@ -17,7 +17,7 @@
         android:textColor="@color/white"
         android:textSize="25sp"
         tools:ignore="LabelFor"
-        tools:text="labelx" />
+        tools:text="label" />
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -51,7 +51,7 @@
             tools:text="112" />
 
         <androidx.appcompat.widget.AppCompatImageButton
-            android:id="@+id/minus_button"
+            android:id="@+id/min_button"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical|center_horizontal"
@@ -63,5 +63,3 @@
     </LinearLayout>
 
 </LinearLayout>
-
-