diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/activities/QuickWizardListActivity.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/activities/QuickWizardListActivity.kt
index 128f6c6613..5c1ffc8c27 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/activities/QuickWizardListActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/activities/QuickWizardListActivity.kt
@@ -76,6 +76,10 @@ class QuickWizardListActivity : DaggerAppCompatActivityWithResult(), OnStartDrag
                         else                          -> R.drawable.ic_smartphone
                     }
                 )
+                holder.binding.device.contentDescription = when (quickWizard[position].device()) {
+                    QuickWizardEntry.DEVICE_WATCH -> rh.gs(R.string.a11y_only_on_watch)
+                    else                          -> rh.gs(R.string.a11y_only_on_phone)
+                }
             }
             holder.binding.root.setOnClickListener {
                 if (actionHelper.isNoAction) {
diff --git a/app/src/main/res/layout/activity_historybrowse.xml b/app/src/main/res/layout/activity_historybrowse.xml
index f3792b7e91..2cbd13c683 100644
--- a/app/src/main/res/layout/activity_historybrowse.xml
+++ b/app/src/main/res/layout/activity_historybrowse.xml
@@ -59,7 +59,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
-                android:text="24" />
+                tools:text="24" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_profilehelper.xml b/app/src/main/res/layout/activity_profilehelper.xml
index ddad35b461..509d23b6b8 100644
--- a/app/src/main/res/layout/activity_profilehelper.xml
+++ b/app/src/main/res/layout/activity_profilehelper.xml
@@ -27,8 +27,7 @@
                 android:gravity="center"
                 android:paddingStart="5dp"
                 android:paddingEnd="5dp"
-                android:text="1"
-                tools:ignore="HardcodedText" />
+                android:text="Profile 1" />
 
             <TextView
                 android:id="@+id/menu2"
@@ -38,8 +37,7 @@
                 android:gravity="center"
                 android:paddingStart="5dp"
                 android:paddingEnd="5dp"
-                android:text="2"
-                tools:ignore="HardcodedText" />
+                android:text="Profile 2" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_setupwizard.xml b/app/src/main/res/layout/activity_setupwizard.xml
index 24403b64a3..a60004b8f8 100644
--- a/app/src/main/res/layout/activity_setupwizard.xml
+++ b/app/src/main/res/layout/activity_setupwizard.xml
@@ -20,6 +20,7 @@
             android:layout_marginTop="16dp"
             android:layout_weight="1"
             android:background="@android:color/transparent"
+            android:importantForAccessibility="no"
             android:onClick="exitPressed"
             app:srcCompat="@drawable/ic_exit_to_app" />
 
diff --git a/app/src/main/res/layout/activity_smscommunicator_otp.xml b/app/src/main/res/layout/activity_smscommunicator_otp.xml
index 99c410f02e..dc6e69e303 100644
--- a/app/src/main/res/layout/activity_smscommunicator_otp.xml
+++ b/app/src/main/res/layout/activity_smscommunicator_otp.xml
@@ -35,6 +35,7 @@
                 android:id="@+id/otp_provisioning"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
+                android:contentDescription="@string/a11y_otp_qr_code"
                 android:layout_marginTop="10dp"
                 android:scaleType="center" />
 
@@ -72,6 +73,7 @@
                     android:layout_width="140sp"
                     android:layout_height="wrap_content"
                     android:hint="@string/smscommunicator_code_verify_hint"
+                    android:importantForAutofill="no"
                     android:inputType="number"
                     android:maxLength="12"
                     android:textAlignment="center"
diff --git a/app/src/main/res/layout/bgsource_item.xml b/app/src/main/res/layout/bgsource_item.xml
index 5d3e8595c6..261b3c0475 100644
--- a/app/src/main/res/layout/bgsource_item.xml
+++ b/app/src/main/res/layout/bgsource_item.xml
@@ -3,6 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:card_view="http://schemas.android.com/tools"
+    xmlns:tools="http://schemas.android.com/tools"
     style="@style/Widget.MaterialComponents.CardView"
     android:id="@+id/bg_card"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/configbuilder_single_category.xml b/app/src/main/res/layout/configbuilder_single_category.xml
index 2f6177b593..8d653c61bc 100644
--- a/app/src/main/res/layout/configbuilder_single_category.xml
+++ b/app/src/main/res/layout/configbuilder_single_category.xml
@@ -36,8 +36,10 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:layout_margin="4dp"
-            app:tint="?android:attr/colorAccent"
-            app:srcCompat="@drawable/ic_visibility" />
+            android:importantForAccessibility="no"
+            app:srcCompat="@drawable/ic_visibility"
+            app:tint="?android:attr/colorAccent" />
+
     </LinearLayout>
 
     <LinearLayout
@@ -45,4 +47,5 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical" />
-</LinearLayout>
\ No newline at end of file
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/configbuilder_single_plugin.xml b/app/src/main/res/layout/configbuilder_single_plugin.xml
index d48ef40a5f..397c755aba 100644
--- a/app/src/main/res/layout/configbuilder_single_plugin.xml
+++ b/app/src/main/res/layout/configbuilder_single_plugin.xml
@@ -38,7 +38,8 @@
                 android:layout_width="36dp"
                 android:layout_height="36dp"
                 android:layout_gravity="center_vertical"
-                android:layout_marginEnd="8dp" />
+                android:layout_marginEnd="8dp"
+                android:importantForAccessibility="no" />
 
             <ImageView
                 android:id="@+id/plugin_icon2"
@@ -46,6 +47,7 @@
                 android:layout_height="36dp"
                 android:layout_gravity="center_vertical"
                 android:layout_marginEnd="8dp"
+                android:importantForAccessibility="no"
                 tools:visibility="gone" />
 
         </LinearLayout>
@@ -70,6 +72,7 @@
                 android:layout_height="wrap_content"
                 android:textSize="12sp"
                 tools:text="A super exquisite plugin description" />
+
         </LinearLayout>
 
     </LinearLayout>
@@ -80,6 +83,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginEnd="16dp"
+        android:contentDescription="@string/a11y_open_settings"
         android:background="?attr/selectableItemBackgroundBorderless"
         app:srcCompat="@drawable/ic_settings" />
 
@@ -88,4 +92,5 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:saveEnabled="false" />
-</LinearLayout>
\ No newline at end of file
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/dialog_carbs.xml b/app/src/main/res/layout/dialog_carbs.xml
index e8b9e70bf6..71b771bb15 100644
--- a/app/src/main/res/layout/dialog_carbs.xml
+++ b/app/src/main/res/layout/dialog_carbs.xml
@@ -75,6 +75,7 @@
         <TableLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:paddingStart="0dp"
             android:paddingEnd="5dp">
 
             <TableRow
@@ -91,7 +92,7 @@
 
                     <TextView
                         android:id="@+id/time_label"
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
                         android:width="120dp"
@@ -267,6 +268,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
+                android:importantForAccessibility="no"
                 android:src="@drawable/ic_access_alarm_24dp" />
 
             <CheckBox
@@ -276,6 +278,7 @@
                 android:layout_gravity="center_vertical"
                 android:checked="false"
                 android:padding="2dp" />
+
         </LinearLayout>
 
         <include
diff --git a/app/src/main/res/layout/dialog_insulin.xml b/app/src/main/res/layout/dialog_insulin.xml
index 0e523a391f..e61bf09b21 100644
--- a/app/src/main/res/layout/dialog_insulin.xml
+++ b/app/src/main/res/layout/dialog_insulin.xml
@@ -145,29 +145,28 @@
             android:padding="5dp">
 
             <com.google.android.material.button.MaterialButton
-                style="@style/GrayButton"
                 android:id="@+id/plus05"
+                style="@style/GrayButton"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
-                android:contentDescription="Increment insulin with 0.5"
-                android:text="+0.5" />
+                tools:text="+0.5" />
 
             <com.google.android.material.button.MaterialButton
-                style="@style/GrayButton"
                 android:id="@+id/plus10"
+                style="@style/GrayButton"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
-                android:text="+1.0" />
+                tools:text="+1.0" />
 
             <com.google.android.material.button.MaterialButton
-                style="@style/GrayButton"
                 android:id="@+id/plus20"
+                style="@style/GrayButton"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
-                android:text="+2.0" />
+                tools:text="+2.0" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/dialog_loop.xml b/app/src/main/res/layout/dialog_loop.xml
index dccc545c6d..f0289139d3 100644
--- a/app/src/main/res/layout/dialog_loop.xml
+++ b/app/src/main/res/layout/dialog_loop.xml
@@ -182,7 +182,7 @@
                 android:id="@+id/overview_resume"
                 style="@style/ButtonSmallFontStyle"
                 android:layout_width="wrap_content"
-                android:layout_height="fill_parent"
+                android:layout_height="0dp"
                 android:layout_gravity="center"
                 android:layout_marginEnd="-4dp"
                 android:layout_weight="0.5"
@@ -291,7 +291,7 @@
                 android:id="@+id/overview_reconnect"
                 style="@style/ButtonSmallFontStyle"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="0dp"
                 android:layout_gravity="center"
                 android:layout_marginEnd="-4dp"
                 android:layout_weight="0.5"
@@ -396,7 +396,7 @@
             android:id="@+id/cancel"
             style="@style/OkCancelButton.Text"
             android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="0dp"
             android:layout_marginEnd="8dp"
             android:layout_weight="1"
             android:text="@string/cancel"
@@ -404,4 +404,5 @@
             android:textAlignment="textEnd" />
 
     </LinearLayout>
-</ScrollView>
\ No newline at end of file
+
+</ScrollView>
diff --git a/app/src/main/res/layout/dialog_profileswitch.xml b/app/src/main/res/layout/dialog_profileswitch.xml
index 7b1f72d2bd..8dfca79eae 100644
--- a/app/src/main/res/layout/dialog_profileswitch.xml
+++ b/app/src/main/res/layout/dialog_profileswitch.xml
@@ -151,7 +151,8 @@
                 android:paddingStart="5dp"
                 android:paddingEnd="5dp"
                 android:text="%"
-                android:textAppearance="?android:attr/textAppearanceSmall" />
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                tools:ignore="HardcodedText" />
 
         </LinearLayout>
 
@@ -210,7 +211,7 @@
 
             <CheckBox
                 android:id="@+id/tt"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:layout_weight="1"
diff --git a/app/src/main/res/layout/dialog_tempbasal.xml b/app/src/main/res/layout/dialog_tempbasal.xml
index 1df4978e30..94a4d347d4 100644
--- a/app/src/main/res/layout/dialog_tempbasal.xml
+++ b/app/src/main/res/layout/dialog_tempbasal.xml
@@ -77,7 +77,8 @@
                 android:paddingStart="5dp"
                 android:paddingEnd="5dp"
                 android:text="%"
-                android:textAppearance="?android:attr/textAppearanceSmall" />
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                tools:ignore="HardcodedText" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/dialog_wizard.xml b/app/src/main/res/layout/dialog_wizard.xml
index 7ce4846a4d..9064fe76d2 100644
--- a/app/src/main/res/layout/dialog_wizard.xml
+++ b/app/src/main/res/layout/dialog_wizard.xml
@@ -48,8 +48,8 @@
         <TableLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:paddingEnd="5dp"
-            tools:ignore="RtlSymmetry">
+            android:paddingStart="0dp"
+            android:paddingEnd="5dp">
 
             <TableRow
                 android:layout_width="match_parent"
@@ -149,7 +149,8 @@
                         android:padding="2dp"
                         android:text="%"
                         android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-                        android:textStyle="bold" />
+                        android:textStyle="bold"
+                        tools:ignore="HardcodedText" />
 
                 </LinearLayout>
 
@@ -347,7 +348,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
                     android:checked="false"
-                    android:contentDescription="set carb timer alarm"
+                    android:contentDescription="@string/a11y_set_carb_timer"
                     android:drawableEnd="@drawable/ic_access_alarm_24dp"
                     android:layoutDirection="rtl"
                     android:padding="2dp" />
@@ -384,7 +385,8 @@
                     android:layout_marginEnd="5dp"
                     android:layout_weight="0.5"
                     android:hint="@string/profile"
-                    android:paddingStart="7dp">
+                    android:paddingStart="7dp"
+                    android:paddingEnd="0dp">
 
                     <com.google.android.material.textfield.MaterialAutoCompleteTextView
                         android:id="@+id/profileList"
diff --git a/app/src/main/res/layout/objectives_exam_fragment.xml b/app/src/main/res/layout/objectives_exam_fragment.xml
index b5fd8b70b9..7d014bb248 100644
--- a/app/src/main/res/layout/objectives_exam_fragment.xml
+++ b/app/src/main/res/layout/objectives_exam_fragment.xml
@@ -50,7 +50,7 @@
                 android:text="@string/reset" />
 
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:text="" />
@@ -76,10 +76,10 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
-            android:text="Question"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/exam_name" />
+            app:layout_constraintTop_toBottomOf="@id/exam_name"
+            tools:text="Question" />
 
         <TextView
             android:id="@+id/exam_hint"
@@ -94,22 +94,22 @@
             android:id="@+id/exam_name"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:text="Name"
             android:textAppearance="@style/TextAppearance.AppCompat.Large"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="Name" />
 
         <TextView
             android:id="@+id/exam_disabledto"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
-            android:text="Disabled until:"
             android:textColor="?attr/objectivesDisabledTextColor"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/exam_hints" />
+            app:layout_constraintTop_toBottomOf="@+id/exam_hints"
+            tools:text="Disabled until:" />
 
         <LinearLayout
             android:id="@+id/navigation"
@@ -130,7 +130,7 @@
                 android:text="@string/previous_button" />
 
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:text="" />
diff --git a/app/src/main/res/layout/objectives_item.xml b/app/src/main/res/layout/objectives_item.xml
index 07e05be638..9083300a3c 100644
--- a/app/src/main/res/layout/objectives_item.xml
+++ b/app/src/main/res/layout/objectives_item.xml
@@ -95,7 +95,7 @@
             android:id="@+id/requestcode"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="Request code: XXXXX" />
+            tools:text="Request code: XXXXX" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -108,8 +108,9 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:ems="10"
-                android:hint="XXXXXXXXXX"
-                android:inputType="text" />
+                android:inputType="text"
+                tools:hint="XXXXXXXXXX"
+                android:importantForAutofill="no" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/enterbutton"
diff --git a/app/src/main/res/layout/overview_editquickwizard_dialog.xml b/app/src/main/res/layout/overview_editquickwizard_dialog.xml
index 25ec9a31ce..b9cc1f8ca4 100644
--- a/app/src/main/res/layout/overview_editquickwizard_dialog.xml
+++ b/app/src/main/res/layout/overview_editquickwizard_dialog.xml
@@ -85,15 +85,16 @@
                 android:layout_gravity="center"
                 android:gravity="center_horizontal|center_vertical"
                 android:padding="10dp"
-                android:text="08:20pm"
-                android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+                android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+                tools:text="08:20pm" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:gravity="center_vertical"
                 android:text="-"
-                android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+                android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+                tools:ignore="HardcodedText" />
 
             <TextView
                 android:id="@+id/to"
@@ -102,8 +103,8 @@
                 android:layout_gravity="center"
                 android:gravity="center_horizontal|center_vertical"
                 android:padding="10dp"
-                android:text="08:20pm"
-                android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+                android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+                tools:text="08:20pm" />
 
         </LinearLayout>
 
@@ -123,17 +124,17 @@
             <RadioButton
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="All" />
+                android:text="@string/device_all" />
 
             <RadioButton
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="Phone" />
+                android:text="@string/device_phone" />
 
             <RadioButton
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="Watch" />
+                android:text="@string/device_watch" />
 
         </RadioGroup>
 
@@ -366,9 +367,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:ems="10"
+            android:importantForAutofill="no"
             android:inputType="number"
-            android:maxLength="3"
-            android:paddingStart="10dp" />
+            android:maxLength="3"/>
 
         <include
             android:id="@+id/okcancel"
diff --git a/app/src/main/res/layout/overview_graphs_layout.xml b/app/src/main/res/layout/overview_graphs_layout.xml
index dd35dc7684..70bcfa678e 100644
--- a/app/src/main/res/layout/overview_graphs_layout.xml
+++ b/app/src/main/res/layout/overview_graphs_layout.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
diff --git a/app/src/main/res/layout/overview_quickwizardlist_item.xml b/app/src/main/res/layout/overview_quickwizardlist_item.xml
index 56824188e9..594721d43e 100644
--- a/app/src/main/res/layout/overview_quickwizardlist_item.xml
+++ b/app/src/main/res/layout/overview_quickwizardlist_item.xml
@@ -2,7 +2,6 @@
 <com.google.android.material.card.MaterialCardView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:card_view="http://schemas.android.com/tools"
     xmlns:tools="http://schemas.android.com/tools"
     style="@style/Widget.MaterialComponents.CardView"
     android:id="@+id/card"
@@ -30,6 +29,7 @@
                 android:layout_height="wrap_content"
                 android:adjustViewBounds="false"
                 android:cropToPadding="false"
+                android:importantForAccessibility="no"
                 android:scaleType="fitStart"
                 app:srcCompat="@drawable/ic_quick_wizard" />
 
@@ -81,14 +81,15 @@
                         android:adjustViewBounds="false"
                         android:cropToPadding="false"
                         android:scaleType="fitStart"
-                        app:srcCompat="@drawable/ic_smartphone"
-                        tools:ignore="RtlSymmetry" />
+                        android:contentDescription="@string/a11y_only_on_phone"
+                        app:srcCompat="@drawable/ic_smartphone" />
 
                     <ImageView
                         android:id="@+id/sortHandle"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:adjustViewBounds="false"
+                        android:contentDescription="@string/a11y_drag_and_drop_handle"
                         android:cropToPadding="false"
                         android:scaleType="fitStart"
                         app:srcCompat="@drawable/ic_reorder_gray_24dp" />
diff --git a/app/src/main/res/layout/overview_statuslights_layout.xml b/app/src/main/res/layout/overview_statuslights_layout.xml
index c49e01b0c7..546409aa7e 100644
--- a/app/src/main/res/layout/overview_statuslights_layout.xml
+++ b/app/src/main/res/layout/overview_statuslights_layout.xml
@@ -9,14 +9,16 @@
     android:layout_marginBottom="3dp"
     android:orientation="horizontal"
     android:paddingTop="4dp"
-    android:paddingBottom="4dp">
+    android:paddingBottom="4dp"
+    android:baselineAligned="false">
 
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:focusable="true"
-        android:gravity="center_horizontal">
+        android:gravity="center_horizontal"
+        tools:ignore="UseCompoundDrawables">
 
         <ImageView
             android:id="@+id/cannula_or_patch"
@@ -64,6 +66,7 @@
             android:layout_height="wrap_content"
             android:lines="1"
             android:paddingStart="2dp"
+            android:paddingEnd="0dp"
             tools:text="50+U" />
 
     </LinearLayout>
@@ -73,7 +76,8 @@
         android:layout_height="fill_parent"
         android:layout_weight="1"
         android:focusable="true"
-        android:gravity="center_horizontal">
+        android:gravity="center_horizontal"
+        tools:ignore="UseCompoundDrawables">
 
         <ImageView
             android:layout_width="28dp"
@@ -121,6 +125,7 @@
             android:layout_height="fill_parent"
             android:lines="1"
             android:paddingStart="2dp"
+            android:paddingEnd="0dp"
             tools:text="100%" />
 
     </LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a8f8bf0efd..12e9f6b607 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1212,4 +1212,13 @@
     <string name="show_hide_records">Hide loop records</string>
     <string name="widget_description">AndroidAPS widget</string>
     <string name="configure">Configure opacity</string>
+    <string name="a11y_otp_qr_code">QR Code for setup one time password</string>
+    <string name="a11y_open_settings">open settings</string>
+    <string name="a11y_set_carb_timer">set carb timer alarm</string>
+    <string name="device_all">All</string>
+    <string name="device_phone">Phone</string>
+    <string name="device_watch">Watch</string>
+    <string name="a11y_only_on_watch">only on watch</string>
+    <string name="a11y_only_on_phone">only on phone</string>
+    <string name="a11y_drag_and_drop_handle">drag and drop handle</string>
 </resources>
diff --git a/automation/src/main/res/layout/automation_action_item.xml b/automation/src/main/res/layout/automation_action_item.xml
index 24697cee75..187abda4a9 100644
--- a/automation/src/main/res/layout/automation_action_item.xml
+++ b/automation/src/main/res/layout/automation_action_item.xml
@@ -2,6 +2,7 @@
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_height="wrap_content"
     android:layout_width="match_parent"
     android:background="?attr/ribbonDefaultColor"
@@ -30,12 +31,14 @@
         android:layout_alignParentBottom="true"
         android:layout_toStartOf="@id/automation_iconTrash"
         android:gravity="center_vertical"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        tools:ignore="UseCompoundDrawables">
 
         <ImageView
             android:id="@+id/automation_action_image"
             android:layout_width="24dp"
             android:layout_height="24dp"
+            android:importantForAccessibility="no"
             app:srcCompat="@drawable/ic_action_orange_48dp" />
 
         <TextView
@@ -48,4 +51,4 @@
 
     </LinearLayout>
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/automation/src/main/res/layout/automation_dialog_action.xml b/automation/src/main/res/layout/automation_dialog_action.xml
index 0ec8a68c46..ba6a516e70 100644
--- a/automation/src/main/res/layout/automation_dialog_action.xml
+++ b/automation/src/main/res/layout/automation_dialog_action.xml
@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:focusableInTouchMode="true"
-    tools:context=".plugins.general.automation.dialogs.EditActionDialog">
+    tools:context="info.nightscout.androidaps.plugins.general.automation.dialogs.EditActionDialog">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -56,4 +56,4 @@
 
     </LinearLayout>
 
-</ScrollView>
\ No newline at end of file
+</ScrollView>
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 f3aaebd19b..ac3997cf97 100644
--- a/automation/src/main/res/layout/automation_dialog_choose_action.xml
+++ b/automation/src/main/res/layout/automation_dialog_choose_action.xml
@@ -2,12 +2,10 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-
-
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:focusableInTouchMode="true"
-    tools:context=".plugins.general.automation.dialogs.EditEventDialog">
+    tools:context="info.nightscout.androidaps.plugins.general.automation.dialogs.EditEventDialog">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -56,4 +54,4 @@
 
     </LinearLayout>
 
-</ScrollView>
\ No newline at end of file
+</ScrollView>
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 f88d4a1078..c4c139c607 100644
--- a/automation/src/main/res/layout/automation_dialog_choose_trigger.xml
+++ b/automation/src/main/res/layout/automation_dialog_choose_trigger.xml
@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:focusableInTouchMode="true"
-    tools:context=".plugins.general.automation.dialogs.EditEventDialog">
+    tools:context="info.nightscout.androidaps.plugins.general.automation.dialogs.EditEventDialog">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -48,4 +48,4 @@
 
     </LinearLayout>
 
-</ScrollView>
\ No newline at end of file
+</ScrollView>
diff --git a/automation/src/main/res/layout/automation_dialog_event.xml b/automation/src/main/res/layout/automation_dialog_event.xml
index 9109c1a520..a94169dd49 100644
--- a/automation/src/main/res/layout/automation_dialog_event.xml
+++ b/automation/src/main/res/layout/automation_dialog_event.xml
@@ -26,7 +26,7 @@
                 app:srcCompat="@drawable/ic_action_orange_48dp" />
 
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:layout_marginStart="10dp"
@@ -66,6 +66,7 @@
                     android:id="@+id/imageButton"
                     android:layout_width="27dp"
                     android:layout_height="match_parent"
+                    android:importantForAccessibility="no"
                     android:scaleX="0.7"
                     android:scaleY="0.7"
                     android:src="@drawable/ic_danar_useropt" />
@@ -93,6 +94,7 @@
                     android:layout_width="24dp"
                     android:layout_height="24dp"
                     android:layout_centerVertical="true"
+                    android:importantForAccessibility="no"
                     app:srcCompat="@drawable/ic_trigger_green_48dp" />
 
                 <TextView
@@ -113,7 +115,8 @@
                     android:layout_centerVertical="true"
                     android:background="?attr/activity_title_backgroundColor"
                     android:padding="8dp"
-                    android:text="@string/edit_short" />
+                    android:text="@string/edit_short"
+                    tools:ignore="RelativeOverlap" />
 
             </RelativeLayout>
 
@@ -156,6 +159,7 @@
                     android:layout_width="24dp"
                     android:layout_height="24dp"
                     android:layout_centerVertical="true"
+                    android:importantForAccessibility="no"
                     app:srcCompat="@drawable/ic_action_orange_48dp" />
 
                 <TextView
@@ -176,7 +180,8 @@
                     android:layout_centerVertical="true"
                     android:background="?attr/activity_title_backgroundColor"
                     android:padding="8dp"
-                    android:text="@string/add_short" />
+                    android:text="@string/add_short"
+                    tools:ignore="RelativeOverlap" />
 
             </RelativeLayout>
 
@@ -195,4 +200,4 @@
 
     </LinearLayout>
 
-</ScrollView>
\ No newline at end of file
+</ScrollView>
diff --git a/core/src/main/res/layout/datetime.xml b/core/src/main/res/layout/datetime.xml
index 07e7ba30fe..507595174d 100644
--- a/core/src/main/res/layout/datetime.xml
+++ b/core/src/main/res/layout/datetime.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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="wrap_content"
-    android:paddingTop="2dp"
-    android:orientation="horizontal">
+    android:orientation="horizontal"
+    android:paddingTop="2dp">
 
     <TextView
         android:layout_width="wrap_content"
@@ -24,10 +25,10 @@
         android:layout_gravity="center"
         android:layout_marginEnd="20dp"
         android:background="@drawable/background_input_border"
-        android:foreground="?attr/selectableItemBackgroundBorderless"
         android:clickable="true"
+        android:foreground="?attr/selectableItemBackgroundBorderless"
         android:padding="10dp"
-        android:text="2017/05/05" />
+        tools:text="2017/05/05" />
 
     <TextView
         android:id="@+id/eventtime"
@@ -35,9 +36,9 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:background="@drawable/background_input_border"
-        android:foreground="?attr/selectableItemBackgroundBorderless"
         android:clickable="true"
+        android:foreground="?attr/selectableItemBackgroundBorderless"
         android:padding="10dp"
-        android:text="08:20pm" />
+        tools:text="08:20pm" />
 
 </LinearLayout>
diff --git a/core/src/main/res/layout/dialog_alert_custom_title.xml b/core/src/main/res/layout/dialog_alert_custom_title.xml
index 624b970c12..0c0641954d 100644
--- a/core/src/main/res/layout/dialog_alert_custom_title.xml
+++ b/core/src/main/res/layout/dialog_alert_custom_title.xml
@@ -18,6 +18,7 @@
             android:id="@+id/alertdialog_icon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:importantForAccessibility="no"
             app:tint="?dialogTitleIconTint" />
 
         <TextView
@@ -48,4 +49,4 @@
         android:orientation="horizontal"
         android:padding="5dp" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/core/src/main/res/layout/maintenance_import_list_item.xml b/core/src/main/res/layout/maintenance_import_list_item.xml
index 39d68cfa89..d7e8cd1f18 100644
--- a/core/src/main/res/layout/maintenance_import_list_item.xml
+++ b/core/src/main/res/layout/maintenance_import_list_item.xml
@@ -27,7 +27,8 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:baselineAligned="true"
-            android:orientation="horizontal">
+            android:orientation="horizontal"
+            tools:ignore="UseCompoundDrawables">
 
             <ImageView
                 android:layout_width="18dp"
@@ -36,6 +37,7 @@
                 android:layout_marginTop="4dp"
                 android:layout_marginEnd="6dp"
                 android:layout_marginBottom="1dp"
+                android:contentDescription="@string/a11y_file"
                 app:srcCompat="@drawable/ic_meta_format"
                 app:tint="?attr/importListFileNameColor" />
 
@@ -46,6 +48,7 @@
                 android:layout_weight="1"
                 android:ellipsize="none"
                 android:maxLines="2"
+                android:paddingStart="0dp"
                 android:paddingEnd="10dp"
                 android:scrollHorizontally="false"
                 android:text="File name here"
@@ -53,7 +56,6 @@
                 android:textColor="?attr/importListFileNameColor"
                 tools:ignore="HardcodedText" />
 
-
         </LinearLayout>
 
         <LinearLayout
@@ -70,7 +72,7 @@
                 android:layout_weight="1"
                 android:ellipsize="none"
                 android:maxLines="2"
-
+                android:paddingStart="0dp"
                 android:paddingEnd="10dp"
                 android:scrollHorizontally="false"
                 android:text="File dir here"
@@ -79,7 +81,6 @@
                 android:textSize="11sp"
                 tools:ignore="HardcodedText" />
 
-
         </LinearLayout>
 
         <LinearLayout
@@ -87,16 +88,17 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_marginTop="6dp"
-            android:orientation="horizontal">
+            android:orientation="horizontal"
+            tools:ignore="UseCompoundDrawables">
 
             <ImageView
-
                 android:layout_width="16dp"
                 android:layout_height="16dp"
                 android:layout_marginStart="30dp"
                 android:layout_marginTop="1dp"
                 android:layout_marginEnd="8dp"
                 android:layout_marginBottom="1dp"
+                android:contentDescription="@string/a11y_user"
                 app:srcCompat="@drawable/ic_meta_name"
                 app:tint="?attr/importListAdditionalInfoColor" />
 
@@ -110,17 +112,14 @@
                 android:textColor="?attr/importListAdditionalInfoColor"
                 tools:ignore="HardcodedText" />
 
-
         </LinearLayout>
 
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_marginTop="3dp"
             android:orientation="horizontal">
 
-
             <ImageView
                 android:id="@+id/meta_date_time_icon"
                 android:layout_width="16dp"
@@ -129,6 +128,7 @@
                 android:layout_marginTop="1dp"
                 android:layout_marginEnd="8dp"
                 android:layout_marginBottom="1dp"
+                android:importantForAccessibility="no"
                 app:srcCompat="@drawable/ic_meta_date"
                 app:tint="?attr/importListAdditionalInfoColor" />
 
diff --git a/core/src/main/res/layout/passwordprompt.xml b/core/src/main/res/layout/passwordprompt.xml
index ea4209edc3..05c300a702 100644
--- a/core/src/main/res/layout/passwordprompt.xml
+++ b/core/src/main/res/layout/passwordprompt.xml
@@ -21,9 +21,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:hint="@string/password_hint"
+        android:importantForAutofill="no"
         android:inputType="textPassword">
 
         <requestFocus />
+
     </EditText>
 
     <EditText
@@ -31,6 +33,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:hint="@string/password_hint"
+        android:importantForAutofill="no"
         android:inputType="textPassword" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/core/src/main/res/layout/toast.xml b/core/src/main/res/layout/toast.xml
index 4572e3b408..8b79189760 100644
--- a/core/src/main/res/layout/toast.xml
+++ b/core/src/main/res/layout/toast.xml
@@ -26,8 +26,9 @@
         android:layout_marginTop="4dp"
         android:layout_marginEnd="18dp"
         android:layout_marginBottom="4dp"
-        android:text="Toast goes here..."
         android:textColor="?attr/toastBaseTextColor"
         android:textSize="18sp"
-        tools:ignore="HardcodedText,RtlHardcoded" />
-</LinearLayout>
\ No newline at end of file
+        tools:ignore="RtlHardcoded"
+        tools:text="Toast goes here..." />
+
+</LinearLayout>
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 74e30a005c..39ff22b27b 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -561,6 +561,8 @@
     <string name="remove_items">Remove Items</string>
     <string name="sort_items">Sort Items</string>
     <string name="remove_selected_items">Remove Selected Items</string>
+    <string name="a11y_file">file</string>
+    <string name="a11y_user">user</string>
 
     <plurals name="days">
         <item quantity="one">%1$d day</item>
diff --git a/dana/src/main/res/layout/danar_history_item.xml b/dana/src/main/res/layout/danar_history_item.xml
index 23b37e9e00..ddae424524 100644
--- a/dana/src/main/res/layout/danar_history_item.xml
+++ b/dana/src/main/res/layout/danar_history_item.xml
@@ -14,7 +14,6 @@
     app:cardUseCompatPadding="true"
     android:layout_gravity="center">
 
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -26,7 +25,6 @@
             android:baselineAligned="true"
             android:orientation="horizontal">
 
-
             <TextView
                 android:id="@+id/time"
                 android:layout_width="120dp"
@@ -39,7 +37,7 @@
                 android:id="@+id/value"
                 android:layout_width="50dp"
                 android:layout_height="wrap_content"
-                android:gravity="right"
+                android:gravity="end"
                 android:paddingStart="5dp"
                 android:text="0.25"
                 tools:ignore="HardcodedText,RtlHardcoded,RtlSymmetry" />
@@ -64,7 +62,7 @@
                 android:id="@+id/duration"
                 android:layout_width="30dp"
                 android:layout_height="wrap_content"
-                android:gravity="right"
+                android:gravity="end"
                 android:paddingStart="5dp"
                 android:text="30"
                 tools:ignore="HardcodedText,RtlHardcoded,RtlSymmetry" />
@@ -73,7 +71,7 @@
                 android:id="@+id/daily_basal"
                 android:layout_width="50dp"
                 android:layout_height="wrap_content"
-                android:gravity="right"
+                android:gravity="end"
                 android:paddingStart="5dp"
                 tools:ignore="RtlHardcoded,RtlSymmetry" />
 
@@ -81,7 +79,7 @@
                 android:id="@+id/daily_bolus"
                 android:layout_width="50dp"
                 android:layout_height="wrap_content"
-                android:gravity="right"
+                android:gravity="end"
                 android:paddingStart="5dp"
                 tools:ignore="RtlHardcoded,RtlSymmetry" />
 
@@ -89,7 +87,7 @@
                 android:id="@+id/daily_total"
                 android:layout_width="56dp"
                 android:layout_height="wrap_content"
-                android:gravity="right"
+                android:gravity="end"
                 android:paddingStart="10dp"
                 android:visibility="gone"
                 tools:ignore="RtlHardcoded,RtlSymmetry" />
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 ee76cba6bf..6e4f850ab1 100644
--- a/dana/src/main/res/layout/danar_user_options_activity.xml
+++ b/dana/src/main/res/layout/danar_user_options_activity.xml
@@ -8,7 +8,6 @@
     android:focusableInTouchMode="true"
     tools:context="info.nightscout.androidaps.dana.activities.DanaUserOptionsActivity">
 
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -49,16 +48,16 @@
             android:orientation="horizontal"
             android:padding="5dp" />
 
-        <Switch
+        <com.google.android.material.switchmaterial.SwitchMaterial
             android:id="@+id/timeformat"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="20dp"
             android:layout_marginEnd="20dp"
-            android:showText="true"
             android:text="@string/danar_timedisplay"
             android:textOff="@string/timeformat12h"
-            android:textOn="@string/timeformat24h" />
+            android:textOn="@string/timeformat24h"
+            app:showText="true" />
 
         <View
             android:layout_width="fill_parent"
@@ -69,7 +68,7 @@
             android:layout_marginBottom="5dp"
             android:background="?android:attr/dividerHorizontal" />
 
-        <Switch
+        <com.google.android.material.switchmaterial.SwitchMaterial
             android:id="@+id/buttonscroll"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -77,7 +76,8 @@
             android:layout_marginEnd="20dp"
             android:text="@string/danar_buttonscroll"
             android:textOff="@string/option_off"
-            android:textOn="@string/option_on" />
+            android:textOn="@string/option_on"
+            app:showText="true" />
 
         <View
             android:layout_width="fill_parent"
@@ -88,7 +88,7 @@
             android:layout_marginBottom="5dp"
             android:background="?android:attr/dividerHorizontal" />
 
-        <Switch
+        <com.google.android.material.switchmaterial.SwitchMaterial
             android:id="@+id/beep"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -96,7 +96,8 @@
             android:layout_marginEnd="20dp"
             android:text="@string/danar_beep"
             android:textOff="@string/option_off"
-            android:textOn="@string/option_on" />
+            android:textOn="@string/option_on"
+            app:showText="true" />
 
         <View
             android:layout_width="fill_parent"
@@ -232,17 +233,17 @@
             android:layout_marginBottom="5dp"
             android:background="?android:attr/dividerHorizontal" />
 
-        <Switch
+        <com.google.android.material.switchmaterial.SwitchMaterial
             android:id="@+id/units"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="20dp"
             android:layout_marginEnd="20dp"
-            android:showText="true"
             android:splitTrack="false"
             android:text="@string/danar_glucoseunits"
             android:textOff="@string/mgdl"
-            android:textOn="@string/mmol" />
+            android:textOn="@string/mmol"
+            app:showText="true" />
 
         <View
             android:layout_width="fill_parent"
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 044f01f8a8..825a8a899d 100644
--- a/danars/src/main/res/layout/danars_pairing_progress_dialog.xml
+++ b/danars/src/main/res/layout/danars_pairing_progress_dialog.xml
@@ -44,7 +44,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="15dp"
-        android:text="STATUS" />
+        tools:text="STATUS" />
 
     <ProgressBar
         android:id="@+id/danars_pairingprogress_progressbar"
diff --git a/diaconn/src/main/res/layout/diaconn_g8_history_item.xml b/diaconn/src/main/res/layout/diaconn_g8_history_item.xml
index 6ca31e4a7d..a86ac98505 100644
--- a/diaconn/src/main/res/layout/diaconn_g8_history_item.xml
+++ b/diaconn/src/main/res/layout/diaconn_g8_history_item.xml
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.card.MaterialCardView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    style="@style/Widget.MaterialComponents.CardView"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/danar_history_card"
+    style="@style/Widget.MaterialComponents.CardView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layout_gravity="center"
     android:layout_marginStart="4dp"
     app:cardCornerRadius="4dp"
-    app:contentPadding="2dp"
     app:cardElevation="4dp"
     app:cardUseCompatPadding="true"
-    android:layout_gravity="center">
-
+    app:contentPadding="2dp">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -20,73 +19,79 @@
         android:baselineAligned="true"
         android:orientation="horizontal">
 
-
         <TextView
             android:id="@+id/diaconn_g8_history_time"
             android:layout_width="120dp"
             android:layout_height="wrap_content"
             android:paddingStart="5dp"
-            android:text="27.06.2016 18:00" />
+            android:paddingEnd="0dp"
+            tools:text="27.06.2016 18:00" />
 
         <TextView
             android:id="@+id/diaconn_g8_history_value"
             android:layout_width="50dp"
             android:layout_height="wrap_content"
+            android:gravity="end"
             android:paddingStart="5dp"
-            android:text="0.25"
-            android:gravity="right" />
+            android:paddingEnd="0dp"
+            tools:text="0.25" />
 
         <TextView
             android:id="@+id/diaconn_g8_history_bolustype"
             android:layout_width="20dp"
             android:layout_height="wrap_content"
             android:paddingStart="5dp"
-            android:text="E"
-/>
+            android:paddingEnd="0dp"
+            tools:text="E" />
 
         <TextView
             android:id="@+id/diaconn_g8_history_stringvalue"
             android:layout_width="150dp"
             android:layout_height="wrap_content"
             android:paddingStart="5dp"
-            android:text="XXXXXXX"
-/>
+            android:paddingEnd="0dp"
+            tools:text="XXXXXXX" />
 
         <TextView
             android:id="@+id/diaconn_g8_history_duration"
             android:layout_width="30dp"
             android:layout_height="wrap_content"
+            android:gravity="end"
             android:paddingStart="5dp"
-            android:text="30"
-            android:gravity="right" />
+            android:paddingEnd="0dp"
+            tools:text="30" />
 
         <TextView
             android:id="@+id/diaconn_g8_history_dailybasal"
             android:layout_width="50dp"
             android:layout_height="wrap_content"
+            android:gravity="end"
             android:paddingStart="5dp"
-            android:gravity="right" />
+            android:paddingEnd="0dp" />
 
         <TextView
             android:id="@+id/diaconn_g8_history_dailybolus"
             android:layout_width="50dp"
             android:layout_height="wrap_content"
+            android:gravity="end"
             android:paddingStart="5dp"
-            android:gravity="right" />
+            android:paddingEnd="0dp" />
 
         <TextView
             android:id="@+id/diaconn_g8_history_dailytotal"
             android:layout_width="56dp"
             android:layout_height="wrap_content"
+            android:gravity="end"
             android:paddingStart="10dp"
-            android:gravity="right"
-            android:visibility="gone"/>
+            android:paddingEnd="0dp"
+            android:visibility="gone" />
 
         <TextView
             android:id="@+id/diaconn_g8_history_alarm"
             android:layout_width="100dp"
             android:layout_height="wrap_content"
-            android:paddingStart="5dp" />
+            android:paddingStart="5dp"
+            android:paddingEnd="0dp" />
 
     </LinearLayout>
 
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 61a43250a5..85a4ba9aa8 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
@@ -8,7 +8,6 @@
     android:focusableInTouchMode="true"
     tools:context="info.nightscout.androidaps.diaconn.activities.DiaconnG8UserOptionsActivity">
 
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -110,16 +109,11 @@
 
         </LinearLayout>
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="40dp"
-            android:orientation="horizontal"
-            android:padding="5dp" />
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="20dp"
+            android:layout_marginTop="40dp"
             android:layout_marginEnd="20dp"
             android:gravity="center"
             android:orientation="horizontal">
@@ -191,17 +185,11 @@
 
         </LinearLayout>
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="40dp"
-            android:orientation="horizontal"
-            android:padding="5dp" />
-
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="20dp"
+            android:layout_marginTop="40dp"
             android:layout_marginEnd="20dp"
             android:gravity="center"
             android:orientation="horizontal">
@@ -273,16 +261,11 @@
 
         </LinearLayout>
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="40dp"
-            android:orientation="horizontal"
-            android:padding="5dp" />
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="20dp"
+            android:layout_marginTop="40dp"
             android:layout_marginEnd="20dp"
             android:gravity="center"
             android:orientation="horizontal">
@@ -306,7 +289,6 @@
             android:layout_marginBottom="5dp"
             android:background="?android:attr/dividerHorizontal" />
 
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/insight/src/main/res/layout/bluetooth_device.xml b/insight/src/main/res/layout/bluetooth_device.xml
index 16230591ca..9287922b46 100644
--- a/insight/src/main/res/layout/bluetooth_device.xml
+++ b/insight/src/main/res/layout/bluetooth_device.xml
@@ -2,10 +2,11 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:paddingStart="16dp"
-    android:textSize="20sp"
-    android:gravity="center_vertical"
-    android:textColor="#FFFFFF"
-    tools:text="Test"
+    android:layout_height="56dp"
     android:background="?selectableItemBackground"
-    android:layout_height="56dp" />
\ No newline at end of file
+    android:gravity="center_vertical"
+    android:paddingStart="16dp"
+    android:paddingEnd="0dp"
+    android:textColor="#FFFFFF"
+    android:textSize="20sp"
+    tools:text="Test" />
diff --git a/insight/src/main/res/layout/local_insight_status_item.xml b/insight/src/main/res/layout/local_insight_status_item.xml
index 38216e9b33..987d71b50e 100644
--- a/insight/src/main/res/layout/local_insight_status_item.xml
+++ b/insight/src/main/res/layout/local_insight_status_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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"
     android:orientation="horizontal">
@@ -10,6 +11,7 @@
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:gravity="end"
+        android:paddingStart="0dp"
         android:paddingEnd="5dp"
         android:textSize="14sp" />
 
@@ -21,7 +23,8 @@
         android:paddingStart="2dp"
         android:paddingEnd="2dp"
         android:text=":"
-        android:textSize="14sp" />
+        android:textSize="14sp"
+        tools:ignore="HardcodedText" />
 
     <TextView
         android:id="@+id/value"
@@ -30,6 +33,8 @@
         android:layout_weight="1"
         android:gravity="start"
         android:paddingStart="5dp"
+        android:paddingEnd="0dp"
         android:textColor="@android:color/white"
         android:textSize="14sp" />
-</LinearLayout>
\ No newline at end of file
+
+</LinearLayout>
diff --git a/medtronic/src/main/res/layout/medtronic_fragment.xml b/medtronic/src/main/res/layout/medtronic_fragment.xml
index ea92f2a590..db76e71150 100644
--- a/medtronic/src/main/res/layout/medtronic_fragment.xml
+++ b/medtronic/src/main/res/layout/medtronic_fragment.xml
@@ -4,14 +4,12 @@
     android:layout_height="match_parent"
     tools:context="info.nightscout.androidaps.plugins.pump.medtronic.MedtronicFragment">
 
-
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_above="@+id/buttons"
         android:fillViewport="true">
 
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -38,7 +36,6 @@
                     android:textAppearance="?android:attr/textAppearanceSmall" />
             </LinearLayout>
 
-
             <View
                 android:layout_width="fill_parent"
                 android:layout_height="2dip"
@@ -86,10 +83,8 @@
                     android:textSize="14sp"
                     tools:ignore="HardcodedText,RtlSymmetry" />
 
-
             </LinearLayout>
 
-
             <View
                 android:id="@+id/rl_battery_view"
                 android:layout_width="fill_parent"
@@ -141,10 +136,8 @@
                     android:textSize="14sp"
                     tools:ignore="RtlSymmetry" />
 
-
             </LinearLayout>
 
-
             <View
                 android:layout_width="fill_parent"
                 android:layout_height="2dip"
@@ -192,7 +185,6 @@
                     android:textSize="14sp"
                     tools:ignore="HardcodedText,RtlSymmetry" />
 
-
             </LinearLayout>
 
             <TextView
@@ -249,7 +241,6 @@
                     android:textSize="14sp"
                     tools:ignore="RtlSymmetry" />
 
-
             </LinearLayout>
 
             <View
@@ -348,7 +339,6 @@
 
             </LinearLayout>
 
-
             <View
                 android:layout_width="fill_parent"
                 android:layout_height="2dip"
@@ -454,7 +444,6 @@
                 android:layout_marginBottom="5dp"
                 android:background="?android:attr/dividerHorizontal" />
 
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -494,7 +483,6 @@
 
             </LinearLayout>
 
-
             <View
                 android:layout_width="fill_parent"
                 android:layout_height="2dip"
@@ -581,7 +569,6 @@
             android:paddingEnd="0dp"
             android:text="@string/refresh" />
 
-
         <com.google.android.material.button.MaterialButton
             android:id="@+id/history"
             style="@style/ButtonSmallFontStyle"
@@ -602,8 +589,7 @@
             android:drawableTop="@drawable/ic_danarstats"
             android:paddingStart="0dp"
             android:paddingEnd="0dp"
-            android:text="RL Stats" />
-
+            android:text="@string/riley_statistics" />
 
     </LinearLayout>
 
diff --git a/medtronic/src/main/res/layout/medtronic_history_activity.xml b/medtronic/src/main/res/layout/medtronic_history_activity.xml
index b9e95908df..91e8ddbc45 100644
--- a/medtronic/src/main/res/layout/medtronic_history_activity.xml
+++ b/medtronic/src/main/res/layout/medtronic_history_activity.xml
@@ -7,7 +7,6 @@
     android:paddingTop="@dimen/activity_vertical_margin"
     tools:context="info.nightscout.androidaps.plugins.pump.medtronic.dialog.MedtronicHistoryActivity">
 
-
     <LinearLayout
         android:id="@+id/medtronic_historytop"
         android:layout_width="match_parent"
@@ -20,7 +19,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="5dp"
             android:layout_marginEnd="20dp"
-            android:text="Type:"
+            android:text="@string/medtronic_history_type"
             android:textAppearance="?android:attr/textAppearanceSmall" />
 
         <Spinner
@@ -30,16 +29,15 @@
             android:layout_marginEnd="20dp" />
 
         <TextView
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_gravity="right"
+            android:layout_gravity="end"
             android:layout_marginEnd="5dp"
             android:layout_weight="1"
             android:background="@drawable/pillborder"
             android:gravity="center_horizontal"
             android:text="@string/medtronic_pump_history" />
 
-
     </LinearLayout>
 
     <TextView
diff --git a/medtronic/src/main/res/layout/medtronic_history_item.xml b/medtronic/src/main/res/layout/medtronic_history_item.xml
index e5ee5bdd5b..4f460cd109 100644
--- a/medtronic/src/main/res/layout/medtronic_history_item.xml
+++ b/medtronic/src/main/res/layout/medtronic_history_item.xml
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="40dp"
+    android:orientation="horizontal"
     android:paddingStart="20dp">
 
-
     <TextView
         android:id="@+id/medtronic_history_time"
         android:layout_width="88dp"
         android:layout_height="match_parent"
         android:gravity="center_vertical"
-        android:text="Date"
-        android:textSize="12dp" />
+        android:textSize="12sp"
+        tools:text="Date" />
 
     <TextView
         android:id="@+id/medtronic_history_source"
         android:layout_width="132dp"
         android:layout_height="match_parent"
         android:gravity="center_vertical"
-        android:text="Source"
-        android:textSize="12dp" />
+        android:textSize="12sp"
+        tools:text="Source" />
 
     <TextView
         android:id="@+id/medtronic_history_description"
         android:layout_width="fill_parent"
         android:layout_height="match_parent"
-        android:text="Description"
         android:gravity="center_vertical"
-        android:textSize="12dp" />
+        android:textSize="12sp"
+        tools:text="Description" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/medtronic/src/main/res/values/strings.xml b/medtronic/src/main/res/values/strings.xml
index 5ec63bcdfd..0e247f48b1 100644
--- a/medtronic/src/main/res/values/strings.xml
+++ b/medtronic/src/main/res/values/strings.xml
@@ -123,5 +123,7 @@
     <string name="mdt_tbr_remaining">%1$.1f U/h (%2$d min remaining)</string>
     <string name="sixdigitnumber" translatable="false">^\\d{6}</string>
     <string name="invalid_history_data">Invalid pump history data detected. Open new issue and provide logs.</string>
+    <string name="riley_statistics">RL Stats</string>
+    <string name="medtronic_history_type">Type:</string>
 
 </resources>
\ No newline at end of file
diff --git a/omnipod-dash/src/main/res/layout/omnipod_dash_pod_history_activity.xml b/omnipod-dash/src/main/res/layout/omnipod_dash_pod_history_activity.xml
index be8a49d07a..fba452e2a2 100644
--- a/omnipod-dash/src/main/res/layout/omnipod_dash_pod_history_activity.xml
+++ b/omnipod-dash/src/main/res/layout/omnipod_dash_pod_history_activity.xml
@@ -29,7 +29,7 @@
         <TextView
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_gravity="right"
+            android:layout_gravity="end"
             android:layout_marginEnd="5dp"
             android:layout_weight="1"
             android:background="@drawable/pillborder"
diff --git a/omnipod-eros/src/main/res/layout/omnipod_eros_pod_history_activity.xml b/omnipod-eros/src/main/res/layout/omnipod_eros_pod_history_activity.xml
index c34ff11276..c604a5d437 100644
--- a/omnipod-eros/src/main/res/layout/omnipod_eros_pod_history_activity.xml
+++ b/omnipod-eros/src/main/res/layout/omnipod_eros_pod_history_activity.xml
@@ -29,7 +29,7 @@
         <TextView
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_gravity="right"
+            android:layout_gravity="end"
             android:layout_marginEnd="5dp"
             android:layout_weight="1"
             android:background="@drawable/pillborder"
diff --git a/rileylink/src/main/res/layout/riley_link_ble_config_activity.xml b/rileylink/src/main/res/layout/riley_link_ble_config_activity.xml
index 9260825887..c4601610fb 100644
--- a/rileylink/src/main/res/layout/riley_link_ble_config_activity.xml
+++ b/rileylink/src/main/res/layout/riley_link_ble_config_activity.xml
@@ -27,6 +27,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingStart="10dp"
+                android:paddingEnd="0dp"
                 android:textSize="16sp" />
 
             <TextView
@@ -34,7 +35,9 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingStart="10dp"
+                android:paddingEnd="0dp"
                 android:textSize="12sp" />
+
         </LinearLayout>
 
         <com.google.android.material.button.MaterialButton
diff --git a/rileylink/src/main/res/layout/riley_link_ble_config_scan_item.xml b/rileylink/src/main/res/layout/riley_link_ble_config_scan_item.xml
index c55785a64d..b4fb7985e5 100644
--- a/rileylink/src/main/res/layout/riley_link_ble_config_scan_item.xml
+++ b/rileylink/src/main/res/layout/riley_link_ble_config_scan_item.xml
@@ -5,6 +5,7 @@
     android:orientation="vertical"
     android:paddingStart="10dp"
     android:paddingTop="5dp"
+    android:paddingEnd="0dp"
     android:paddingBottom="5dp">
 
     <TextView
@@ -21,4 +22,4 @@
         android:layout_height="wrap_content"
         android:textSize="12sp" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/rileylink/src/main/res/layout/rileylink_status.xml b/rileylink/src/main/res/layout/rileylink_status.xml
index d73f137bcb..42882d46de 100644
--- a/rileylink/src/main/res/layout/rileylink_status.xml
+++ b/rileylink/src/main/res/layout/rileylink_status.xml
@@ -5,7 +5,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
-
     tools:context="info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyLinkStatusActivity">
 
     <com.google.android.material.appbar.AppBarLayout
@@ -21,8 +20,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-
         </com.google.android.material.tabs.TabLayout>
+
     </com.google.android.material.appbar.AppBarLayout>
 
     <androidx.viewpager.widget.ViewPager
@@ -32,14 +31,13 @@
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
         tools:layout_editor_absoluteY="55dp" />
 
-
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/rileylink_settings_fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="end|bottom"
+        android:contentDescription="@string/refresh"
         android:layout_margin="@dimen/fab_margin"
         app:srcCompat="@drawable/ic_refresh" />
 
-
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/rileylink/src/main/res/layout/rileylink_status_device.xml b/rileylink/src/main/res/layout/rileylink_status_device.xml
index f56c4b0d6d..e8d1a63552 100644
--- a/rileylink/src/main/res/layout/rileylink_status_device.xml
+++ b/rileylink/src/main/res/layout/rileylink_status_device.xml
@@ -2,7 +2,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".plugins.pump.medtronic.dialog.RileyLinkStatusDevice">
+    tools:context="info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyLinkStatusDevice">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -15,6 +15,7 @@
             android:id="@+id/rileyLinkDeviceList"
             tools:layout_editor_absoluteX="8dp"
             tools:layout_editor_absoluteY="8dp" />
+
     </LinearLayout>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/rileylink/src/main/res/layout/rileylink_status_device_item.xml b/rileylink/src/main/res/layout/rileylink_status_device_item.xml
index e8a81fbc6f..f37596f31f 100644
--- a/rileylink/src/main/res/layout/rileylink_status_device_item.xml
+++ b/rileylink/src/main/res/layout/rileylink_status_device_item.xml
@@ -1,25 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="40dp"
-    android:paddingStart="15dp">
+    android:orientation="horizontal"
+    android:paddingStart="15dp"
+    android:paddingEnd="0dp">
 
     <TextView
         android:id="@+id/rileylink_device_label"
         android:layout_width="184dp"
         android:layout_height="match_parent"
         android:gravity="center_vertical"
-        android:text="Command"
-        android:textSize="12dp" />
+        android:textSize="12sp"
+        tools:text="Command" />
 
     <com.google.android.material.button.MaterialButton
-        style="@style/GrayButton"
         android:id="@+id/rileylink_device_action"
+        style="@style/GrayButton"
         android:layout_width="fill_parent"
         android:layout_height="match_parent"
-        android:text="Description"
         android:gravity="center_vertical"
-        android:textSize="12dp" />
+        android:textSize="12sp"
+        tools:text="Description" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/rileylink/src/main/res/layout/rileylink_status_history.xml b/rileylink/src/main/res/layout/rileylink_status_history.xml
index 3a44c3a8e8..21a37379cb 100644
--- a/rileylink/src/main/res/layout/rileylink_status_history.xml
+++ b/rileylink/src/main/res/layout/rileylink_status_history.xml
@@ -12,17 +12,15 @@
         <TextView
             android:id="@+id/rileylink_historystatus"
             android:layout_width="match_parent"
-            android:layout_height="10px"
-            android:layout_below="@+id/medtronic_historytop"
+            android:layout_height="10dp"
             android:layout_gravity="center_horizontal"
             android:gravity="center_horizontal" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rileylink_history_list"
             android:layout_width="match_parent"
-            android:layout_height="fill_parent"
-            android:layout_below="@+id/rileylink_historystatus" />
+            android:layout_height="fill_parent"/>
 
     </LinearLayout>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/rileylink/src/main/res/layout/rileylink_status_history_item.xml b/rileylink/src/main/res/layout/rileylink_status_history_item.xml
index 1a9a7a61c2..4e522c8899 100644
--- a/rileylink/src/main/res/layout/rileylink_status_history_item.xml
+++ b/rileylink/src/main/res/layout/rileylink_status_history_item.xml
@@ -1,33 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="40dp"
-    android:paddingStart="20dp">
-
+    android:orientation="horizontal"
+    android:paddingStart="20dp"
+    android:paddingEnd="0dp">
 
     <TextView
         android:id="@+id/rileylink_history_time"
         android:layout_width="100dp"
         android:layout_height="match_parent"
-        android:text="Date"
         android:gravity="center_vertical"
-        android:textSize="12dp" />
+        android:textSize="12sp"
+        tools:text="Date" />
 
     <TextView
         android:id="@+id/rileylink_history_source"
         android:layout_width="80dp"
         android:layout_height="match_parent"
-        android:text="Source"
         android:gravity="center_vertical"
-        android:textSize="12dp" />
+        android:textSize="12sp"
+        tools:text="Source" />
 
     <TextView
         android:id="@+id/rileylink_history_description"
         android:layout_width="fill_parent"
         android:layout_height="match_parent"
-        android:text="Description"
         android:gravity="center_vertical"
-        android:textSize="12dp" />
+        android:textSize="12sp"
+        tools:text="Description" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>