diff --git a/app/src/main/res/layout/activity_logsetting.xml b/app/src/main/res/layout/activity_logsetting.xml
index 50e1354cf1..4011279d11 100644
--- a/app/src/main/res/layout/activity_logsetting.xml
+++ b/app/src/main/res/layout/activity_logsetting.xml
@@ -23,7 +23,7 @@
         <ImageView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:contentDescription="@string/carbs"
+            android:importantForAccessibility="no"
             app:srcCompat="@mipmap/ic_launcher" />
 
         <TextView
diff --git a/app/src/main/res/layout/activity_stats.xml b/app/src/main/res/layout/activity_stats.xml
index 6335214899..cbadce20e9 100644
--- a/app/src/main/res/layout/activity_stats.xml
+++ b/app/src/main/res/layout/activity_stats.xml
@@ -23,7 +23,7 @@
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:contentDescription="@string/carbs"
+                android:importantForAccessibility="no"
                 app:srcCompat="@mipmap/ic_launcher" />
 
             <TextView
diff --git a/app/src/main/res/layout/dialog_calibration.xml b/app/src/main/res/layout/dialog_calibration.xml
index 1fc30ee0f9..5190ecc325 100644
--- a/app/src/main/res/layout/dialog_calibration.xml
+++ b/app/src/main/res/layout/dialog_calibration.xml
@@ -26,7 +26,7 @@
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:contentDescription="@string/overview_calibration"
+                android:importantForAccessibility="no"
                 app:srcCompat="@drawable/ic_calibration" />
 
             <TextView
diff --git a/app/src/main/res/layout/dialog_carbs.xml b/app/src/main/res/layout/dialog_carbs.xml
index 3d2663e23b..b0bb6b535d 100644
--- a/app/src/main/res/layout/dialog_carbs.xml
+++ b/app/src/main/res/layout/dialog_carbs.xml
@@ -25,7 +25,7 @@
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:contentDescription="@string/carbs"
+                android:importantForAccessibility="no"
                 app:srcCompat="@drawable/ic_cp_bolus_carbs" />
 
             <TextView
diff --git a/app/src/main/res/layout/dialog_care.xml b/app/src/main/res/layout/dialog_care.xml
index 28dac8d1a1..cf4dddc9a6 100644
--- a/app/src/main/res/layout/dialog_care.xml
+++ b/app/src/main/res/layout/dialog_care.xml
@@ -26,7 +26,7 @@
                 android:id="@+id/icon"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:contentDescription="@string/careportal_profileswitch"
+                android:importantForAccessibility="no"
                 app:srcCompat="@drawable/ic_actions_profileswitch" />
 
             <TextView
diff --git a/app/src/main/res/layout/dialog_extendedbolus.xml b/app/src/main/res/layout/dialog_extendedbolus.xml
index 246bf6c2a9..270b58fae3 100644
--- a/app/src/main/res/layout/dialog_extendedbolus.xml
+++ b/app/src/main/res/layout/dialog_extendedbolus.xml
@@ -25,7 +25,7 @@
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:contentDescription="@string/virtualpump_extendedbolus_label"
+                android:importantForAccessibility="no"
                 app:srcCompat="@drawable/ic_actions_startextbolus" />
 
             <TextView
diff --git a/app/src/main/res/layout/dialog_fill.xml b/app/src/main/res/layout/dialog_fill.xml
index 40d01124c1..3e7f29db32 100644
--- a/app/src/main/res/layout/dialog_fill.xml
+++ b/app/src/main/res/layout/dialog_fill.xml
@@ -25,7 +25,7 @@
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:contentDescription="@string/primefill"
+                android:importantForAccessibility="no"
                 app:srcCompat="@drawable/ic_cp_pump_canula" />
 
             <TextView
diff --git a/app/src/main/res/layout/dialog_insulin.xml b/app/src/main/res/layout/dialog_insulin.xml
index 7a1c2d08c7..8452dbe854 100644
--- a/app/src/main/res/layout/dialog_insulin.xml
+++ b/app/src/main/res/layout/dialog_insulin.xml
@@ -25,7 +25,7 @@
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:contentDescription="@string/overview_insulin_label"
+                android:importantForAccessibility="no"
                 app:srcCompat="@drawable/ic_bolus" />
 
             <TextView
diff --git a/app/src/main/res/layout/dialog_loop.xml b/app/src/main/res/layout/dialog_loop.xml
index fa1d97105e..4f015ac3de 100644
--- a/app/src/main/res/layout/dialog_loop.xml
+++ b/app/src/main/res/layout/dialog_loop.xml
@@ -26,7 +26,7 @@
                 android:id="@+id/loop_icon"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
-                android:contentDescription="@string/boluswizard"
+                android:importantForAccessibility="no"
                 app:srcCompat="@drawable/ic_loop_closed" />
 
             <TextView
diff --git a/app/src/main/res/layout/dialog_profileswitch.xml b/app/src/main/res/layout/dialog_profileswitch.xml
index ece79d8b91..b6c2843250 100644
--- a/app/src/main/res/layout/dialog_profileswitch.xml
+++ b/app/src/main/res/layout/dialog_profileswitch.xml
@@ -25,7 +25,7 @@
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:contentDescription="@string/careportal_profileswitch"
+                android:importantForAccessibility="no"
                 app:srcCompat="@drawable/ic_actions_profileswitch" />
 
             <TextView
diff --git a/app/src/main/res/layout/dialog_tempbasal.xml b/app/src/main/res/layout/dialog_tempbasal.xml
index 4e8f6e2a31..df8cfa0530 100644
--- a/app/src/main/res/layout/dialog_tempbasal.xml
+++ b/app/src/main/res/layout/dialog_tempbasal.xml
@@ -25,7 +25,7 @@
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:contentDescription="@string/tempbasal_label"
+                android:importantForAccessibility="no"
                 app:srcCompat="@drawable/ic_cp_basal_start" />
 
             <TextView
diff --git a/app/src/main/res/layout/dialog_temptarget.xml b/app/src/main/res/layout/dialog_temptarget.xml
index 0becef1d5d..be45b61313 100644
--- a/app/src/main/res/layout/dialog_temptarget.xml
+++ b/app/src/main/res/layout/dialog_temptarget.xml
@@ -25,7 +25,7 @@
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:contentDescription="@string/careportal_temporarytarget"
+                android:importantForAccessibility="no"
                 app:srcCompat="@drawable/ic_temptarget_high" />
 
             <TextView
diff --git a/app/src/main/res/layout/dialog_treatment.xml b/app/src/main/res/layout/dialog_treatment.xml
index 2927d9a040..033dd54723 100644
--- a/app/src/main/res/layout/dialog_treatment.xml
+++ b/app/src/main/res/layout/dialog_treatment.xml
@@ -25,30 +25,21 @@
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:contentDescription="@string/overview_treatment_label"
+                android:importantForAccessibility="no"
                 app:srcCompat="@drawable/ic_bolus" />
 
-        </RelativeLayout>
-
-        <LinearLayout
-            android:id="@+id/spacer"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:padding="5dp" >
-
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_centerHorizontal="true"
-                android:layout_centerVertical="true"
+                android:layout_centerInParent="true"
                 android:layout_gravity="center"
                 android:layout_marginLeft="10dp"
                 android:layout_marginRight="10dp"
                 android:text="@string/overview_treatment_label"
                 android:textAlignment="center"
                 android:textAppearance="?android:attr/textAppearanceLarge" />
-        </LinearLayout>
+
+        </RelativeLayout>
 
         <LinearLayout
             android:id="@+id/recordOnlyLayout"
diff --git a/app/src/main/res/layout/dialog_wizard.xml b/app/src/main/res/layout/dialog_wizard.xml
index 0fe3d2f660..7f4000d9ab 100644
--- a/app/src/main/res/layout/dialog_wizard.xml
+++ b/app/src/main/res/layout/dialog_wizard.xml
@@ -25,7 +25,7 @@
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
-                android:contentDescription="@string/boluswizard"
+                android:importantForAccessibility="no"
                 app:srcCompat="@drawable/ic_calculator" />
 
             <TextView
diff --git a/app/src/main/res/layout/dialog_wizardinfo.xml b/app/src/main/res/layout/dialog_wizardinfo.xml
index d83c7f7d4e..771af78e82 100644
--- a/app/src/main/res/layout/dialog_wizardinfo.xml
+++ b/app/src/main/res/layout/dialog_wizardinfo.xml
@@ -25,7 +25,7 @@
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:contentDescription="@string/carbs"
+                android:importantForAccessibility="no"
                 app:srcCompat="@drawable/ic_calculator" />
 
             <TextView
diff --git a/app/src/main/res/layout/overview_editquickwizard_dialog.xml b/app/src/main/res/layout/overview_editquickwizard_dialog.xml
index 76459b1f03..422b787269 100644
--- a/app/src/main/res/layout/overview_editquickwizard_dialog.xml
+++ b/app/src/main/res/layout/overview_editquickwizard_dialog.xml
@@ -21,7 +21,7 @@
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:contentDescription="@string/quickwizard"
+                android:importantForAccessibility="no"
                 app:srcCompat="@drawable/ic_quick_wizard" />
 
             <TextView
diff --git a/automation/src/main/res/layout/automation_dialog_action.xml b/automation/src/main/res/layout/automation_dialog_action.xml
index 7bb9b1dff8..e45b73ffe9 100644
--- a/automation/src/main/res/layout/automation_dialog_action.xml
+++ b/automation/src/main/res/layout/automation_dialog_action.xml
@@ -25,7 +25,7 @@
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:contentDescription="@string/action"
+                android:importantForAccessibility="no"
                 app:srcCompat="@drawable/ic_action_orange_48dp" />
 
             <TextView
diff --git a/automation/src/main/res/layout/automation_dialog_choose_action.xml b/automation/src/main/res/layout/automation_dialog_choose_action.xml
index d5cec102a2..f74536c3aa 100644
--- a/automation/src/main/res/layout/automation_dialog_choose_action.xml
+++ b/automation/src/main/res/layout/automation_dialog_choose_action.xml
@@ -25,7 +25,7 @@
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:contentDescription="@string/please_choose_an_action_type"
+                android:importantForAccessibility="no"
                 app:srcCompat="@drawable/ic_action_orange_48dp" />
 
             <TextView
diff --git a/automation/src/main/res/layout/automation_dialog_choose_operation.xml b/automation/src/main/res/layout/automation_dialog_choose_operation.xml
index 6f380dfbda..34e088df8c 100644
--- a/automation/src/main/res/layout/automation_dialog_choose_operation.xml
+++ b/automation/src/main/res/layout/automation_dialog_choose_operation.xml
@@ -25,7 +25,7 @@
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:contentDescription="@string/please_choose_a_operation_type"
+                android:importantForAccessibility="no"
                 app:srcCompat="@drawable/ic_trigger_green_48dp" />
 
             <TextView
diff --git a/automation/src/main/res/layout/automation_dialog_choose_trigger.xml b/automation/src/main/res/layout/automation_dialog_choose_trigger.xml
index 4c85d8d401..11013ea7a0 100644
--- a/automation/src/main/res/layout/automation_dialog_choose_trigger.xml
+++ b/automation/src/main/res/layout/automation_dialog_choose_trigger.xml
@@ -25,7 +25,7 @@
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:contentDescription="@string/please_choose_a_trigger_type"
+                android:importantForAccessibility="no"
                 app:srcCompat="@drawable/ic_trigger_green_48dp" />
 
             <TextView
diff --git a/automation/src/main/res/layout/automation_dialog_edit_trigger.xml b/automation/src/main/res/layout/automation_dialog_edit_trigger.xml
index bb019f1ef3..a5365ca1d5 100644
--- a/automation/src/main/res/layout/automation_dialog_edit_trigger.xml
+++ b/automation/src/main/res/layout/automation_dialog_edit_trigger.xml
@@ -25,7 +25,7 @@
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:contentDescription="@string/triggers"
+                android:importantForAccessibility="no"
                 app:srcCompat="@drawable/ic_trigger_green_48dp" />
 
             <TextView
diff --git a/automation/src/main/res/layout/automation_dialog_event.xml b/automation/src/main/res/layout/automation_dialog_event.xml
index d40056549e..bcfdb70ef8 100644
--- a/automation/src/main/res/layout/automation_dialog_event.xml
+++ b/automation/src/main/res/layout/automation_dialog_event.xml
@@ -25,7 +25,7 @@
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:contentDescription="@string/automation"
+                android:importantForAccessibility="no"
                 app:srcCompat="@drawable/ic_action_orange_48dp" />
 
             <TextView
diff --git a/core/src/main/res/layout/dialog_bolusprogress.xml b/core/src/main/res/layout/dialog_bolusprogress.xml
index cd080eec64..e5bc052bb5 100644
--- a/core/src/main/res/layout/dialog_bolusprogress.xml
+++ b/core/src/main/res/layout/dialog_bolusprogress.xml
@@ -18,6 +18,7 @@
             android:id="@+id/header_icon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:importantForAccessibility="no"
             app:srcCompat="@drawable/ic_trending_flat_white_48dp" />
 
         <TextView
diff --git a/core/src/main/res/layout/dialog_error.xml b/core/src/main/res/layout/dialog_error.xml
index 085ecb6afb..825dc33d20 100644
--- a/core/src/main/res/layout/dialog_error.xml
+++ b/core/src/main/res/layout/dialog_error.xml
@@ -17,7 +17,7 @@
         <ImageView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:contentDescription="@string/error"
+            android:importantForAccessibility="no"
             app:srcCompat="@drawable/ic_error_red_48dp" />
 
         <TextView
diff --git a/core/src/main/res/layout/dialog_profileviewer.xml b/core/src/main/res/layout/dialog_profileviewer.xml
index 880b79aa9b..d4bcdc4f94 100644
--- a/core/src/main/res/layout/dialog_profileviewer.xml
+++ b/core/src/main/res/layout/dialog_profileviewer.xml
@@ -26,6 +26,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
+                android:importantForAccessibility="no"
                 app:srcCompat="@drawable/ic_home_profile" />
 
             <TextView
diff --git a/dana/src/main/res/layout/danar_history_activity.xml b/dana/src/main/res/layout/danar_history_activity.xml
index 4ba5e3c7d1..c45ee98c72 100644
--- a/dana/src/main/res/layout/danar_history_activity.xml
+++ b/dana/src/main/res/layout/danar_history_activity.xml
@@ -25,7 +25,7 @@
             android:id="@+id/imageView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:contentDescription="@string/pumphistory"
+            android:importantForAccessibility="no"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:srcCompat="@drawable/ic_pump_history" />
diff --git a/dana/src/main/res/layout/danar_user_options_activity.xml b/dana/src/main/res/layout/danar_user_options_activity.xml
index 6ba6be69ad..8daeba5f1e 100644
--- a/dana/src/main/res/layout/danar_user_options_activity.xml
+++ b/dana/src/main/res/layout/danar_user_options_activity.xml
@@ -26,7 +26,7 @@
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:contentDescription="@string/danar_pump_settings"
+                android:importantForAccessibility="no"
                 app:srcCompat="@drawable/ic_danar_useropt" />
 
             <TextView
diff --git a/danars/src/main/res/layout/danars_blescanner_activity.xml b/danars/src/main/res/layout/danars_blescanner_activity.xml
index 4b1539c7fb..b3bd15598f 100644
--- a/danars/src/main/res/layout/danars_blescanner_activity.xml
+++ b/danars/src/main/res/layout/danars_blescanner_activity.xml
@@ -18,7 +18,7 @@
         <ImageView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:contentDescription="@string/danars_pairing"
+            android:importantForAccessibility="no"
             app:srcCompat="@drawable/ic_bluetooth_white_48dp" />
 
         <TextView
diff --git a/danars/src/main/res/layout/danars_enter_pin_activity.xml b/danars/src/main/res/layout/danars_enter_pin_activity.xml
index b16d8fd1d5..ad8d92037e 100644
--- a/danars/src/main/res/layout/danars_enter_pin_activity.xml
+++ b/danars/src/main/res/layout/danars_enter_pin_activity.xml
@@ -18,7 +18,7 @@
         <ImageView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:contentDescription="@string/pairing"
+            android:importantForAccessibility="no"
             app:srcCompat="@drawable/ic_bluetooth_white_48dp" />
 
         <TextView
diff --git a/danars/src/main/res/layout/danars_pairing_progress_dialog.xml b/danars/src/main/res/layout/danars_pairing_progress_dialog.xml
index 5874e9bff8..9bae290353 100644
--- a/danars/src/main/res/layout/danars_pairing_progress_dialog.xml
+++ b/danars/src/main/res/layout/danars_pairing_progress_dialog.xml
@@ -17,7 +17,7 @@
         <ImageView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:contentDescription="@string/pairing"
+            android:importantForAccessibility="no"
             app:srcCompat="@drawable/ic_bluetooth_white_48dp" />
 
         <TextView
diff --git a/diaconn/src/main/res/layout/diaconn_g8_blescanner_activity.xml b/diaconn/src/main/res/layout/diaconn_g8_blescanner_activity.xml
index 86b6406ee1..46f9fc2056 100644
--- a/diaconn/src/main/res/layout/diaconn_g8_blescanner_activity.xml
+++ b/diaconn/src/main/res/layout/diaconn_g8_blescanner_activity.xml
@@ -18,7 +18,7 @@
         <ImageView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:contentDescription="@string/diaconn_pairing"
+            android:importantForAccessibility="no"
             app:srcCompat="@drawable/ic_bluetooth_white_48dp" />
 
         <TextView
diff --git a/diaconn/src/main/res/layout/diaconn_g8_history_activity.xml b/diaconn/src/main/res/layout/diaconn_g8_history_activity.xml
index ccb3a3522a..bfea6d5dff 100644
--- a/diaconn/src/main/res/layout/diaconn_g8_history_activity.xml
+++ b/diaconn/src/main/res/layout/diaconn_g8_history_activity.xml
@@ -20,7 +20,7 @@
         <ImageView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:contentDescription="@string/pumphistory"
+            android:importantForAccessibility="no"
             app:srcCompat="@drawable/ic_pump_history" />
 
         <TextView
diff --git a/diaconn/src/main/res/layout/diaconn_g8_user_options_activity.xml b/diaconn/src/main/res/layout/diaconn_g8_user_options_activity.xml
index c652b6516f..42a9446d56 100644
--- a/diaconn/src/main/res/layout/diaconn_g8_user_options_activity.xml
+++ b/diaconn/src/main/res/layout/diaconn_g8_user_options_activity.xml
@@ -26,7 +26,7 @@
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:contentDescription="@string/diaconng8_pump_settings"
+                android:importantForAccessibility="no"
                 app:srcCompat="@drawable/ic_danar_useropt" />
 
             <TextView