diff --git a/app/src/main/res/layout/localprofile_fragment.xml b/app/src/main/res/layout/localprofile_fragment.xml
index f1bd26f410..ff453c53e0 100644
--- a/app/src/main/res/layout/localprofile_fragment.xml
+++ b/app/src/main/res/layout/localprofile_fragment.xml
@@ -302,6 +302,7 @@
                 android:paddingStart="10dp"
                 android:paddingEnd="10dp"
                 android:text="@string/activate_profile"
+                android:visibility="gone"
                 app:icon="@drawable/ic_local_activate"
                 app:iconTint="@color/ic_local_activate" />
 
@@ -323,6 +324,7 @@
                     android:paddingStart="1dp"
                     android:paddingEnd="1dp"
                     android:text="@string/reset"
+                    android:visibility="gone"
                     app:icon="@drawable/ic_local_reset"
                     app:iconTint="@color/ic_local_reset" />
 
@@ -338,6 +340,7 @@
                     android:paddingStart="1dp"
                     android:paddingEnd="1dp"
                     android:text="@string/save"
+                    android:visibility="gone"
                     app:icon="@drawable/ic_local_save"
                     app:iconTint="@color/ic_local_save" />
             </LinearLayout>
diff --git a/core/src/main/res/drawable/ic_danarstats.xml b/core/src/main/res/drawable/ic_danarstats.xml
index 81b3952eb4..a95eef3884 100644
--- a/core/src/main/res/drawable/ic_danarstats.xml
+++ b/core/src/main/res/drawable/ic_danarstats.xml
@@ -7,24 +7,24 @@
       android:pathData="M5.719,19.125L5.719,11.828"
       android:strokeWidth="2.2677"
       android:fillColor="#00000000"
-      android:strokeColor="#FEAF05"
+      android:strokeColor="?attr/statsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M9.792,19.125L9.792,8.01"
       android:strokeWidth="2.2677"
       android:fillColor="#00000000"
-      android:strokeColor="#FEAF05"
+      android:strokeColor="?attr/statsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M13.865,19.125L13.865,9.51"
       android:strokeWidth="2.2677"
       android:fillColor="#00000000"
-      android:strokeColor="#FEAF05"
+      android:strokeColor="?attr/statsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M17.938,19.125L17.938,4.594"
       android:strokeWidth="2.2677"
       android:fillColor="#00000000"
-      android:strokeColor="#FEAF05"
+      android:strokeColor="?attr/statsColor"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/dana/src/main/res/layout/danar_fragment.xml b/dana/src/main/res/layout/danar_fragment.xml
index e26919aebd..8cc0d95305 100644
--- a/dana/src/main/res/layout/danar_fragment.xml
+++ b/dana/src/main/res/layout/danar_fragment.xml
@@ -2,6 +2,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:context="info.nightscout.androidaps.dana.DanaFragment"
     android:orientation="vertical">
 
@@ -658,50 +659,58 @@
         android:layout_height="wrap_content"
         android:orientation="horizontal">
 
-        <com.google.android.material.button.MaterialButton
+        <info.nightscout.androidaps.utils.ui.SingleClickButton
             android:id="@+id/view_profile"
             style="@style/ButtonSmallFontStyle"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_weight="1"
+            android:layout_marginEnd="-2dp"
             android:drawableTop="@drawable/ic_danarprofile"
-            android:paddingStart="0dp"
-            android:paddingEnd="0dp"
-            android:text="@string/viewprofile" />
+            android:text="@string/viewprofile"
+            android:maxLines="2"
+            android:ellipsize="end"
+            app:iconPadding="-4dp"/>
 
-        <com.google.android.material.button.MaterialButton
+        <info.nightscout.androidaps.utils.ui.SingleClickButton
             android:id="@+id/history"
             style="@style/ButtonSmallFontStyle"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_weight="1"
+            android:layout_marginEnd="-2dp"
             android:drawableTop="@drawable/ic_pump_history"
-            android:paddingStart="0dp"
-            android:paddingEnd="0dp"
             android:text="@string/pumphistory"
+            android:maxLines="2"
+            android:ellipsize="end"
+            app:iconPadding="-4dp"
             tools:ignore="TooManyViews" />
 
-        <com.google.android.material.button.MaterialButton
+        <info.nightscout.androidaps.utils.ui.SingleClickButton
             android:id="@+id/stats"
             style="@style/ButtonSmallFontStyle"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_weight="1"
+            android:layout_marginEnd="-2dp"
             android:drawableTop="@drawable/ic_danarstats"
-            android:paddingStart="0dp"
-            android:paddingEnd="0dp"
-            android:text="@string/stats" />
+            android:text="@string/stats"
+            android:maxLines="2"
+            android:ellipsize="end"
+            app:iconPadding="-4dp"/>
 
-        <com.google.android.material.button.MaterialButton
+        <info.nightscout.androidaps.utils.ui.SingleClickButton
             android:id="@+id/user_options"
             style="@style/ButtonSmallFontStyle"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_weight="1"
+            android:layout_marginEnd="-2dp"
             android:drawableTop="@drawable/ic_danar_useropt"
-            android:paddingStart="0dp"
-            android:paddingEnd="0dp"
-            android:text="@string/danar_useroptions" />
+            android:text="@string/danar_useroptions"
+            android:maxLines="2"
+            android:ellipsize="end"
+            app:iconPadding="-4dp"/>
 
     </LinearLayout>