diff --git a/wear/src/main/java/info/nightscout/androidaps/watchfaces/BaseWatchFace.kt b/wear/src/main/java/info/nightscout/androidaps/watchfaces/BaseWatchFace.kt
index a25d320dd4..07fbc4d63d 100644
--- a/wear/src/main/java/info/nightscout/androidaps/watchfaces/BaseWatchFace.kt
+++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/BaseWatchFace.kt
@@ -13,11 +13,11 @@ import android.os.Vibrator
 import android.support.wearable.watchface.WatchFaceStyle
 import android.view.LayoutInflater
 import android.view.View
+import android.view.ViewGroup
 import android.view.WindowInsets
 import android.view.WindowManager
 import android.widget.ImageView
 import android.widget.LinearLayout
-import android.widget.RelativeLayout
 import android.widget.TextView
 import androidx.annotation.LayoutRes
 import androidx.core.content.ContextCompat
@@ -100,14 +100,14 @@ abstract class BaseWatchFace : WatchFace() {
     var mDay: TextView? = null
     var mDayName: TextView? = null
     var mMonth: TextView? = null
-    var isAAPSv2: TextView? = null
+    var isAAPSv2: View? = null
     var mHighLight: TextView? = null
     var mLowLight: TextView? = null
     var mGlucoseDial: ImageView? = null
     var mDeltaGauge: ImageView? = null
     var mHourHand: ImageView? = null
     var mMinuteHand: ImageView? = null
-    var mRelativeLayout: RelativeLayout? = null
+    var mRelativeLayout: ViewGroup? = null
     var mLinearLayout: LinearLayout? = null
     var mLinearLayout2: LinearLayout? = null
     var mDate: LinearLayout? = null
@@ -594,4 +594,4 @@ abstract class BaseWatchFace : WatchFace() {
         val BOLD_TYPEFACE: Typeface = Typeface.create(Typeface.SANS_SERIF, Typeface.BOLD)
         const val SCREEN_SIZE_SMALL = 280
     }
-}
\ No newline at end of file
+}
diff --git a/wear/src/main/res/layout-notround/activity_bigchart.xml b/wear/src/main/res/layout-notround/activity_bigchart.xml
index d610c6f38b..8c3a136e6a 100644
--- a/wear/src/main/res/layout-notround/activity_bigchart.xml
+++ b/wear/src/main/res/layout-notround/activity_bigchart.xml
@@ -1,108 +1,111 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout 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" tools:context=".watchfaces.AapsWatchface" tools:deviceIds="wear_square"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/main_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:background="@color/black"
-    android:id="@+id/main_layout">
+    android:gravity="center_horizontal"
+    android:orientation="vertical"
+    android:textAlignment="center"
+    tools:context=".watchfaces.AapsWatchface"
+    tools:deviceIds="wear_square"
+    tools:ignore="MissingDefaultResource">
 
     <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:textAlignment="center"
-        android:gravity="center_horizontal">
-
-        <LinearLayout
-            android:orientation="horizontal"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAlignment="center"
-            android:paddingTop="5dp"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="-5dp"
-            android:gravity="center_horizontal">
-
-            <TextView
-                android:id="@+id/delta"
-                android:textSize="30sp"
-                android:text="---"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textColor="#FFFFFF"
-                android:layout_gravity="bottom"
-                android:gravity="center_horizontal|bottom"
-                android:layout_marginEnd="5dp" />
-
-            <TextView
-                android:id="@+id/sgv"
-                android:textSize="41sp"
-                android:text="---"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textColor="#FFFFFF"
-                android:layout_gravity="center_horizontal"
-                android:gravity="center_horizontal" />
-
-            <TextView
-                android:id="@+id/avgdelta"
-                android:textSize="30sp"
-                android:text="---"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textColor="#FFFFFF"
-                android:layout_gravity="bottom"
-                android:gravity="center_horizontal|bottom"
-                android:layout_marginStart="5dp" />
-
-        </LinearLayout>
-
-        <lecho.lib.hellocharts.view.LineChartView
-            android:id="@+id/chart"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_gravity="bottom"
-            android:layout_weight="1"
-            android:gravity="center_horizontal" />
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="-5dp"
+        android:gravity="center_horizontal"
+        android:orientation="horizontal"
+        android:paddingTop="5dp"
+        android:textAlignment="center">
 
         <TextView
-            android:id="@+id/externaltstatus"
-            android:textSize="18sp"
-            android:text="E xU/h  IOB: x (x+x)"
-            android:layout_width="wrap_content"
-            android:textAlignment="center"
-            android:textColor="#FFFFFF"
-            android:layout_gravity="center_horizontal"
-            android:layout_height="wrap_content"/>
-
-        <LinearLayout
-            android:orientation="horizontal"
+            android:id="@+id/delta"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textAlignment="center"
-            android:gravity="center_horizontal">
+            android:layout_gravity="bottom"
+            android:layout_marginEnd="5dp"
+            android:gravity="center_horizontal|bottom"
+            android:text="---"
+            android:textColor="@color/white"
+            android:textSize="30sp"
+            tools:ignore="HardcodedText" />
 
-            <TextView
-                android:id="@+id/watch_time"
-                android:textSize="35sp"
-                android:text="12:00"
-                android:textColor="#FFFFFF"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textAlignment="center"
-                android:layout_marginEnd="6dp"
-                android:layout_gravity="center_horizontal" />
+        <TextView
+            android:id="@+id/sgv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:gravity="center_horizontal"
+            android:text="---"
+            android:textColor="@color/white"
+            android:textSize="41sp"
+            tools:ignore="HardcodedText" />
 
-            <TextView
-                android:id="@+id/timestamp"
-                android:textSize="26sp"
-                android:text="-- '"
-                android:layout_width="wrap_content"
-                android:textAlignment="center"
-                android:textColor="#FFFFFF"
-                android:layout_gravity="center_horizontal"
-                android:layout_height="wrap_content" />
-        </LinearLayout>
+        <TextView
+            android:id="@+id/avgdelta"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom"
+            android:layout_marginStart="5dp"
+            android:gravity="center_horizontal|bottom"
+            android:text="---"
+            android:textColor="@color/white"
+            android:textSize="30sp"
+            tools:ignore="HardcodedText" />
 
     </LinearLayout>
 
-</RelativeLayout>
+    <lecho.lib.hellocharts.view.LineChartView
+        android:id="@+id/chart"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_gravity="bottom"
+        android:layout_weight="1"
+        android:gravity="center_horizontal" />
+
+    <TextView
+        android:id="@+id/externaltstatus"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:textAlignment="center"
+        android:textColor="@color/white"
+        android:textSize="18sp"
+        tools:text="E xU/h  IOB: x (x+x)" />
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:orientation="horizontal"
+        android:textAlignment="center">
+
+        <TextView
+            android:id="@+id/watch_time"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginEnd="6dp"
+            android:textAlignment="center"
+            android:textColor="@color/white"
+            android:textSize="35sp"
+            tools:text="12:00" />
+
+        <TextView
+            android:id="@+id/timestamp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:textAlignment="center"
+            android:textColor="@color/white"
+            android:textSize="26sp"
+            tools:text="-- '" />
+
+    </LinearLayout>
+
+</LinearLayout>
+
diff --git a/wear/src/main/res/layout-notround/activity_bigchart_small.xml b/wear/src/main/res/layout-notround/activity_bigchart_small.xml
index 3a271e9ea0..9462a35612 100644
--- a/wear/src/main/res/layout-notround/activity_bigchart_small.xml
+++ b/wear/src/main/res/layout-notround/activity_bigchart_small.xml
@@ -1,111 +1,114 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout 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" tools:context=".watchfaces.AapsWatchface" tools:deviceIds="wear_square"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/main_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:background="@color/black"
-    android:id="@+id/main_layout">
+    android:gravity="center_horizontal"
+    android:orientation="vertical"
+    android:textAlignment="center"
+    tools:context=".watchfaces.AapsWatchface"
+    tools:deviceIds="wear_square"
+    tools:ignore="MissingDefaultResource">
 
     <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:textAlignment="center"
-        android:gravity="center_horizontal">
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="-5dp"
-            android:gravity="center_horizontal"
-            android:orientation="horizontal"
-            android:paddingTop="5dp"
-            android:textAlignment="center">
-
-            <TextView
-                android:id="@+id/delta"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical|center_horizontal|center"
-                android:layout_marginEnd="5dp"
-                android:gravity="center_horizontal|bottom"
-                android:text="---"
-                android:textColor="#FFFFFF"
-                android:textSize="24sp" />
-
-            <TextView
-                android:id="@+id/sgv"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:gravity="center_horizontal"
-                android:text="---"
-                android:textColor="#FFFFFF"
-                android:textSize="34sp" />
-
-            <TextView
-                android:id="@+id/avgdelta"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical|center_horizontal|center"
-                android:layout_marginStart="5dp"
-                android:gravity="center_horizontal|bottom"
-                android:text="---"
-                android:textColor="#FFFFFF"
-                android:textSize="24sp" />
-
-        </LinearLayout>
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="-5dp"
+        android:gravity="center_horizontal"
+        android:orientation="horizontal"
+        android:paddingTop="5dp"
+        android:textAlignment="center">
 
         <TextView
-            android:id="@+id/externaltstatus"
+            android:id="@+id/delta"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical|center_horizontal|center"
+            android:layout_marginEnd="5dp"
+            android:gravity="center_horizontal|bottom"
+            android:text="---"
+            android:textColor="@color/white"
+            android:textSize="24sp"
+            tools:ignore="HardcodedText" />
+
+        <TextView
+            android:id="@+id/sgv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:layout_marginTop="-5sp"
-            android:text="E xU/h  IOB: x (x+x)"
-            android:textAlignment="center"
-            android:textColor="#FFFFFF"
-            android:textSize="18sp" />
+            android:gravity="center_horizontal"
+            android:text="---"
+            android:textColor="@color/white"
+            android:textSize="34sp"
+            tools:ignore="HardcodedText" />
 
-        <lecho.lib.hellocharts.view.LineChartView
-            android:id="@+id/chart"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_gravity="bottom"
-            android:layout_weight="1"
-            android:gravity="center_horizontal" />
-
-        <LinearLayout
+        <TextView
+            android:id="@+id/avgdelta"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="-5sp"
-            android:gravity="center_horizontal"
-            android:orientation="horizontal"
-            android:textAlignment="center">
-
-            <TextView
-                android:id="@+id/watch_time"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginEnd="6dp"
-                android:paddingTop="-5sp"
-                android:text="12:00"
-                android:textAlignment="center"
-                android:textColor="#FFFFFF"
-                android:textSize="34sp" />
-
-            <TextView
-                android:id="@+id/timestamp"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical|center_horizontal|center"
-                android:text="--'"
-                android:textAlignment="center"
-                android:textColor="#FFFFFF"
-                android:textSize="24sp" />
-        </LinearLayout>
+            android:layout_gravity="center_vertical|center_horizontal|center"
+            android:layout_marginStart="5dp"
+            android:gravity="center_horizontal|bottom"
+            android:text="---"
+            android:textColor="@color/white"
+            android:textSize="24sp"
+            tools:ignore="HardcodedText" />
 
     </LinearLayout>
 
-</RelativeLayout>
+    <TextView
+        android:id="@+id/externaltstatus"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="-5sp"
+        android:textAlignment="center"
+        android:textColor="@color/white"
+        android:textSize="18sp"
+        tools:text="E xU/h  IOB: x (x+x)" />
+
+    <lecho.lib.hellocharts.view.LineChartView
+        android:id="@+id/chart"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_gravity="bottom"
+        android:layout_weight="1"
+        android:gravity="center_horizontal" />
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="-5sp"
+        android:gravity="center_horizontal"
+        android:orientation="horizontal"
+        android:textAlignment="center">
+
+        <TextView
+            android:id="@+id/watch_time"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginEnd="6dp"
+            android:paddingTop="-5sp"
+            android:textAlignment="center"
+            android:textColor="@color/white"
+            android:textSize="34sp"
+            tools:text="12:00" />
+
+        <TextView
+            android:id="@+id/timestamp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical|center_horizontal|center"
+            android:text="--'"
+            android:textAlignment="center"
+            android:textColor="@color/white"
+            android:textSize="24sp"
+            tools:ignore="HardcodedText" />
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/wear/src/main/res/layout-notround/activity_cockpit.xml b/wear/src/main/res/layout-notround/activity_cockpit.xml
index 75290deb00..9170bc9880 100644
--- a/wear/src/main/res/layout-notround/activity_cockpit.xml
+++ b/wear/src/main/res/layout-notround/activity_cockpit.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout 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" tools:context=".watchfaces.CockpitWatchface" tools:deviceIds="wear_square"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/main_layout"
-    android:background="@drawable/airplane_cockpit_outside_clouds">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/airplane_cockpit_outside_clouds"
+    tools:context=".watchfaces.CockpitWatchface"
+    tools:deviceIds="wear_square"
+    tools:ignore="MissingDefaultResource">
 
     <LinearLayout
         android:id="@+id/inside"
@@ -13,105 +17,91 @@
         android:orientation="vertical"
         android:weightSum="1">
 
-        <LinearLayout
+        <View
             android:layout_width="fill_parent"
             android:layout_height="0px"
-            android:orientation="vertical"
-            android:layout_weight="0.095">
-
-        </LinearLayout>
+            android:layout_weight="0.095" />
 
         <LinearLayout
             android:id="@+id/windows"
             android:layout_width="fill_parent"
             android:layout_height="0px"
-            android:orientation="vertical"
-            android:layout_weight="0.2575">
+            android:layout_weight="0.2575"
+            android:orientation="horizontal">
+
+            <View
+                android:layout_width="0px"
+                android:layout_height="match_parent"
+                android:layout_weight="0.47" />
 
             <LinearLayout
-                android:layout_width="match_parent"
+                android:id="@+id/warnings"
+                android:layout_width="0px"
                 android:layout_height="match_parent"
-                android:orientation="horizontal"
-                android:weightSum="1">
+                android:layout_weight="0.06"
+                android:baselineAligned="false"
+                android:orientation="vertical">
+
+                <View
+                    android:layout_width="fill_parent"
+                    android:layout_height="0px"
+                    android:layout_weight="0.2" />
 
                 <TextView
-                    android:layout_width="0px"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="bottom"
-                    android:layout_weight="0.47" />
+                    android:id="@+id/highLight"
+                    android:layout_width="fill_parent"
+                    android:layout_height="0px"
+                    android:layout_gravity="center"
+                    android:layout_weight="1"
+                    android:background="@drawable/airplane_led_grey_unlit"
+                    android:gravity="center"
+                    android:text="@string/first_char_high"
+                    android:textAlignment="center"
+                    android:textColor="@color/primary_text_dark"
+                    android:textSize="8sp"
+                    android:textStyle="bold"
+                    tools:ignore="SmallSp" />
 
-                <LinearLayout
-                    android:id="@+id/warnings"
-                    android:layout_width="0px"
-                    android:layout_height="match_parent"
-                    android:layout_weight="0.06"
-                    android:baselineAligned="false"
-                    android:orientation="vertical">
-
-                    <TextView
-                        android:layout_width="fill_parent"
-                        android:layout_height="0px"
-                        android:layout_gravity="bottom"
-                        android:layout_weight="0.2" />
-
-                    <TextView
-                        android:id="@+id/highLight"
-                        android:layout_width="fill_parent"
-                        android:layout_height="0px"
-                        android:layout_gravity="center"
-                        android:layout_weight="1"
-                        android:background="@drawable/airplane_led_grey_unlit"
-                        android:gravity="center"
-                        android:text="H"
-                        android:textAlignment="center"
-                        android:textColor="@color/primary_text_dark"
-                        android:textSize="8sp"
-                        android:textStyle="bold" />
-
-                    <TextView
-                        android:layout_width="fill_parent"
-                        android:layout_height="0px"
-                        android:layout_gravity="bottom"
-                        android:layout_weight="2" />
-
-                    <TextView
-                        android:id="@+id/lowLight"
-                        android:layout_width="fill_parent"
-                        android:layout_height="0px"
-                        android:layout_gravity="center"
-                        android:layout_weight="1"
-                        android:background="@drawable/airplane_led_grey_unlit"
-                        android:gravity="center"
-                        android:text="L"
-                        android:textAlignment="center"
-                        android:textColor="@color/primary_text_dark"
-                        android:textSize="8sp"
-                        android:textStyle="bold" />
-
-                    <TextView
-                        android:layout_width="fill_parent"
-                        android:layout_height="0px"
-                        android:layout_gravity="bottom"
-                        android:layout_weight="0.2" />
-
-                </LinearLayout>
+                <View
+                    android:layout_width="fill_parent"
+                    android:layout_height="0px"
+                    android:layout_weight="2" />
 
                 <TextView
-                    android:layout_width="0px"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="bottom"
-                    android:layout_weight="0.47" />
+                    android:id="@+id/lowLight"
+                    android:layout_width="fill_parent"
+                    android:layout_height="0px"
+                    android:layout_gravity="center"
+                    android:layout_weight="1"
+                    android:background="@drawable/airplane_led_grey_unlit"
+                    android:gravity="center"
+                    android:text="@string/first_char_low"
+                    android:textAlignment="center"
+                    android:textColor="@color/primary_text_dark"
+                    android:textSize="8sp"
+                    android:textStyle="bold"
+                    tools:ignore="SmallSp" />
+
+                <View
+                    android:layout_width="fill_parent"
+                    android:layout_height="0px"
+                    android:layout_weight="0.2" />
 
             </LinearLayout>
 
+            <View
+                android:layout_width="0px"
+                android:layout_height="match_parent"
+                android:layout_weight="0.47" />
+
         </LinearLayout>
 
         <LinearLayout
             android:id="@+id/dashboard"
             android:layout_width="fill_parent"
             android:layout_height="0px"
-            android:orientation="vertical"
-            android:layout_weight="0.0775">
+            android:layout_weight="0.0775"
+            android:orientation="vertical">
 
         </LinearLayout>
 
@@ -120,369 +110,332 @@
             android:layout_width="match_parent"
             android:layout_height="0px"
             android:layout_weight="0.57"
-            android:orientation="vertical">
+            android:orientation="horizontal">
+
+            <View
+                android:layout_width="0px"
+                android:layout_height="match_parent"
+                android:layout_weight="0.08" />
 
             <LinearLayout
-                android:layout_width="match_parent"
+                android:id="@+id/panel1"
+                android:layout_width="0px"
                 android:layout_height="match_parent"
-                android:orientation="horizontal"
-                android:weightSum="1">
+                android:layout_weight="0.275"
+                android:orientation="vertical">
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="0px"
+                    android:layout_weight="0.07" />
 
                 <LinearLayout
-                    android:layout_width="0px"
-                    android:layout_height="match_parent"
-                    android:layout_weight="0.08"
-                    android:baselineAligned="false"
-                    android:orientation="horizontal">
+                    android:layout_width="match_parent"
+                    android:layout_height="0px"
+                    android:layout_weight="0.5"
+                    android:orientation="vertical"
+                    android:weightSum="1">
+
+                    <TextView
+                        android:id="@+id/sgv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:layout_gravity="center"
+                        android:text="---"
+                        android:textColor="@color/primary_text_dark"
+                        android:textSize="30sp"
+                        tools:ignore="HardcodedText" />
 
                 </LinearLayout>
 
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="0px"
+                    android:layout_weight="0.03" />
+
                 <LinearLayout
-                    android:id="@+id/panel1"
-                    android:layout_width="0px"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="center"
-                    android:layout_weight="0.275"
-                    android:baselineAligned="false"
+                    android:layout_width="match_parent"
+                    android:layout_height="0px"
+                    android:layout_weight="0.276"
                     android:orientation="horizontal"
-                    android:gravity="center"
-                    android:textAlignment="center">
+                    android:weightSum="1">
 
-                    <LinearLayout
-                        android:layout_width="match_parent"
+                    <TextView
+                        android:layout_width="0px"
                         android:layout_height="match_parent"
-                        android:orientation="vertical"
-                        android:weightSum="1">
+                        android:layout_weight="0.35" />
 
-                        <TextView
-                            android:layout_width="match_parent"
-                            android:layout_height="0px"
-                            android:layout_weight="0.07" />
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="0px"
-                            android:layout_weight="0.5"
-                            android:orientation="vertical"
-                            android:weightSum="1">
-
-                            <TextView
-                                android:id="@+id/sgv"
-                                android:layout_width="wrap_content"
-                                android:layout_height="0px"
-                                android:layout_gravity="center"
-                                android:layout_weight="1"
-                                android:text="---"
-                                android:textColor="@color/primary_text_dark"
-                                android:textSize="30sp" />
-
-                        </LinearLayout>
-
-                        <TextView
-                            android:layout_width="match_parent"
-                            android:layout_height="0px"
-                            android:layout_weight="0.03" />
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="0px"
-                            android:layout_weight="0.276"
-                            android:orientation="horizontal"
-                            android:weightSum="1">
-
-                            <TextView
-                                android:layout_width="0px"
-                                android:layout_height="match_parent"
-                                android:layout_weight="0.35" />
-
-                            <TextView
-                                android:id="@+id/timestamp"
-                                android:layout_width="0px"
-                                android:layout_height="match_parent"
-                                android:layout_gravity="center"
-                                android:layout_weight="0.65"
-                                android:text="--'"
-                                android:gravity="center"
-                                android:textAlignment="center"
-                                android:textColor="@color/primary_text_dark"
-                                android:textSize="14sp"
-                                android:textStyle="bold" />
-
-                        </LinearLayout>
-
-                    </LinearLayout>
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="0px"
-                    android:layout_height="match_parent"
-                    android:layout_weight="0.0225"
-                    android:baselineAligned="false"
-                    android:orientation="horizontal">
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/panel2"
-                    android:layout_width="0px"
-                    android:layout_height="match_parent"
-                    android:layout_weight="0.245"
-                    android:orientation="horizontal">
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
+                    <TextView
+                        android:id="@+id/timestamp"
+                        android:layout_width="0px"
                         android:layout_height="match_parent"
-                        android:orientation="vertical"
-                        android:weightSum="1.01">
-
-                        <TextView
-                            android:layout_width="match_parent"
-                            android:layout_height="0px"
-                            android:layout_weight="0.020" />
-
-                        <TextView
-                            android:id="@+id/watch_time"
-                            android:layout_width="wrap_content"
-                            android:layout_height="0px"
-                            android:layout_gravity="center"
-                            android:layout_weight="0.19"
-                            android:gravity="center"
-                            android:text="12:00"
-                            android:textAlignment="center"
-                            android:textColor="@color/primary_text_dark"
-                            android:textSize="16sp"
-                            android:textStyle="bold" />
-
-                        <TextView
-                            android:id="@+id/tmpBasal"
-                            android:layout_width="wrap_content"
-                            android:layout_height="0px"
-                            android:layout_gravity="bottom|center_horizontal"
-                            android:layout_weight="0.19"
-                            android:gravity="bottom|center_horizontal"
-                            android:text="-.--U/h"
-                            android:textAlignment="center"
-                            android:textColor="@color/primary_text_dark"
-                            android:textSize="12sp"
-                            android:textStyle="bold" />
-
-                        <TextView
-                            android:id="@+id/iobView"
-                            android:layout_width="wrap_content"
-                            android:layout_height="0px"
-                            android:layout_gravity="bottom|center_horizontal"
-                            android:layout_weight="0.18"
-                            android:gravity="bottom|center_horizontal"
-                            android:text="--U"
-                            android:textAlignment="center"
-                            android:textColor="@color/primary_text_dark"
-                            android:textSize="12sp"
-                            android:textStyle="bold" />
-
-                        <TextView
-                            android:id="@+id/cobView"
-                            android:layout_width="wrap_content"
-                            android:layout_height="0px"
-                            android:layout_gravity="bottom|center_horizontal"
-                            android:layout_weight="0.185"
-                            android:gravity="bottom|center_horizontal"
-                            android:text="--g"
-                            android:textAlignment="center"
-                            android:textColor="#FFFFFF"
-                            android:textSize="12sp"
-                            android:textStyle="bold" />
-
-                        <LinearLayout
-                            android:layout_width="wrap_content"
-                            android:layout_height="0px"
-                            android:layout_gravity="center"
-                            android:layout_weight="0.185"
-                            android:gravity="center"
-                            android:orientation="horizontal"
-                            android:textAlignment="center">
-
-                            <TextView
-                                android:id="@+id/uploader_battery"
-                                android:layout_width="wrap_content"
-                                android:layout_height="match_parent"
-                                android:layout_gravity="bottom|center_horizontal"
-                                android:gravity="bottom|center_horizontal"
-                                android:text="--%"
-                                android:textAlignment="center"
-                                android:textColor="@color/primary_text_dark"
-                                android:textSize="12sp"
-                                android:textStyle="bold" />
-
-                            <TextView
-                                android:id="@+id/rig_battery"
-                                android:layout_width="wrap_content"
-                                android:layout_height="match_parent"
-                                android:layout_gravity="bottom|center_horizontal"
-                                android:gravity="bottom|center_horizontal"
-                                android:paddingStart="4dp"
-                                android:text="--%"
-                                android:textAlignment="center"
-                                android:textColor="@color/primary_text_dark"
-                                android:textSize="12sp"
-                                android:textStyle="bold"
-                                android:visibility="gone" />
-
-                        </LinearLayout>
-
-                        <TextView
-                            android:layout_width="match_parent"
-                            android:layout_height="0px"
-                            android:layout_weight="0.06" />
-
-                    </LinearLayout>
+                        android:layout_gravity="center"
+                        android:layout_weight="0.65"
+                        android:gravity="center"
+                        android:text="--'"
+                        android:textAlignment="center"
+                        android:textColor="@color/primary_text_dark"
+                        android:textSize="14sp"
+                        android:textStyle="bold"
+                        tools:ignore="HardcodedText" />
 
                 </LinearLayout>
 
-                <LinearLayout
-                    android:layout_width="0px"
-                    android:layout_height="match_parent"
-                    android:layout_weight="0.0225"
-                    android:baselineAligned="false"
-                    android:orientation="horizontal">
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/panel3"
-                    android:layout_width="0px"
-                    android:layout_height="match_parent"
-                    android:layout_weight="0.275"
-                    android:baselineAligned="false"
-                    android:orientation="horizontal"
-                    android:textAlignment="center">
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:orientation="vertical"
-                        android:weightSum="1">
-
-                        <TextView
-                            android:layout_width="match_parent"
-                            android:layout_height="0px"
-                            android:layout_weight="0.07" />
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="0px"
-                            android:layout_gravity="center"
-                            android:layout_weight="0.5"
-                            android:gravity="center"
-                            android:orientation="vertical"
-                            android:weightSum="0.5">
-
-                            <TextView
-                                android:id="@+id/direction"
-                                android:layout_width="match_parent"
-                                android:layout_height="0px"
-                                android:layout_gravity="center"
-                                android:layout_weight="0.333"
-                                android:gravity="center"
-                                android:text="--"
-                                android:textAlignment="center"
-                                android:textColor="@color/primary_text_dark"
-                                android:textSize="28sp"
-                                android:textStyle="bold" />
-
-                            <LinearLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="0px"
-                                android:layout_weight="0.167"
-                                android:gravity="center"
-                                android:layout_gravity="center"
-                                android:weightSum="2">
-
-                                <TextView
-                                    android:id="@+id/delta"
-                                    android:layout_width="0px"
-                                    android:layout_height="wrap_content"
-                                    android:layout_gravity="center"
-                                    android:layout_weight="1"
-                                    android:gravity="center"
-                                    android:text="+/-"
-                                    android:textAlignment="center"
-                                    android:textColor="@color/primary_text_dark"
-                                    android:textSize="13sp"
-                                    android:textStyle="bold" />
-
-                                <TextView
-                                    android:id="@+id/avgdelta"
-                                    android:layout_width="0px"
-                                    android:layout_height="wrap_content"
-                                    android:layout_gravity="center"
-                                    android:layout_weight="1"
-                                    android:gravity="center"
-                                    android:text="avg"
-                                    android:textAlignment="center"
-                                    android:textColor="@color/primary_text_dark"
-                                    android:textSize="13sp"
-                                    android:textStyle="bold" />
-
-                            </LinearLayout>
-
-                        </LinearLayout>
-
-                        <TextView
-                            android:layout_width="match_parent"
-                            android:layout_height="0px"
-                            android:layout_weight="0.03" />
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="0px"
-                            android:layout_weight="0.250"
-                            android:orientation="horizontal"
-                            android:weightSum="1">
-
-                            <TextView
-                                android:layout_width="0px"
-                                android:layout_height="match_parent"
-                                android:layout_weight="0.1" />
-
-                            <TextView
-                                android:id="@+id/loop"
-                                android:layout_width="0px"
-                                android:layout_height="match_parent"
-                                android:layout_gravity="start"
-                                android:layout_weight="0.5"
-                                android:background="@drawable/loop_grey_25"
-                                android:text="--'"
-                                android:gravity="center"
-                                android:textAlignment="center"
-                                android:textColor="@color/primary_text_dark"
-                                android:textSize="14sp"
-                                android:textStyle="bold" />
-
-                            <TextView
-                                android:id="@+id/AAPSv2"
-                                android:layout_width="0px"
-                                android:layout_height="match_parent"
-                                android:layout_weight="0.4"
-                                android:visibility="invisible"/>
-
-                        </LinearLayout>
-
-                    </LinearLayout>
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="0px"
-                    android:layout_height="match_parent"
-                    android:layout_weight="0.08"
-                    android:baselineAligned="false"
-                    android:orientation="horizontal">
-
-                </LinearLayout>
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="0px"
+                    android:layout_weight="0.07" />
 
             </LinearLayout>
 
+            <View
+                android:layout_width="0px"
+                android:layout_height="match_parent"
+                android:layout_weight="0.0225" />
+
+            <LinearLayout
+                android:id="@+id/panel2"
+                android:layout_width="0px"
+                android:layout_height="match_parent"
+                android:layout_weight="0.245"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="0px"
+                    android:layout_weight="0.020" />
+
+                <TextView
+                    android:id="@+id/watch_time"
+                    android:layout_width="wrap_content"
+                    android:layout_height="0px"
+                    android:layout_gravity="center"
+                    android:layout_weight="0.19"
+                    android:gravity="center"
+                    android:textAlignment="center"
+                    android:textColor="@color/primary_text_dark"
+                    android:textSize="16sp"
+                    android:textStyle="bold"
+                    tools:text="12:00" />
+
+                <TextView
+                    android:id="@+id/tmpBasal"
+                    android:layout_width="wrap_content"
+                    android:layout_height="0px"
+                    android:layout_gravity="bottom|center_horizontal"
+                    android:layout_weight="0.19"
+                    android:gravity="bottom|center_horizontal"
+                    android:text="@string/no_tmp_basal_u_h"
+                    android:textAlignment="center"
+                    android:textColor="@color/primary_text_dark"
+                    android:textSize="12sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/iobView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="0px"
+                    android:layout_gravity="bottom|center_horizontal"
+                    android:layout_weight="0.18"
+                    android:gravity="bottom|center_horizontal"
+                    android:text="@string/no_iob_u"
+                    android:textAlignment="center"
+                    android:textColor="@color/primary_text_dark"
+                    android:textSize="12sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/cobView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="0px"
+                    android:layout_gravity="bottom|center_horizontal"
+                    android:layout_weight="0.185"
+                    android:gravity="bottom|center_horizontal"
+                    android:text="@string/no_cob_g"
+                    android:textAlignment="center"
+                    android:textColor="@color/white"
+                    android:textSize="12sp"
+                    android:textStyle="bold" />
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="0px"
+                    android:layout_gravity="center"
+                    android:layout_weight="0.185"
+                    android:gravity="center"
+                    android:orientation="horizontal"
+                    android:textAlignment="center">
+
+                    <TextView
+                        android:id="@+id/uploader_battery"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:layout_gravity="bottom|center_horizontal"
+                        android:gravity="bottom|center_horizontal"
+                        android:text="--%"
+                        android:textAlignment="center"
+                        android:textColor="@color/primary_text_dark"
+                        android:textSize="12sp"
+                        android:textStyle="bold"
+                        tools:ignore="HardcodedText" />
+
+                    <TextView
+                        android:id="@+id/rig_battery"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:layout_gravity="bottom|center_horizontal"
+                        android:gravity="bottom|center_horizontal"
+                        android:paddingStart="4dp"
+                        android:paddingEnd="0dp"
+                        android:text="--%"
+                        android:textAlignment="center"
+                        android:textColor="@color/primary_text_dark"
+                        android:textSize="12sp"
+                        android:textStyle="bold"
+                        android:visibility="gone"
+                        tools:ignore="HardcodedText" />
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="0px"
+                    android:layout_weight="0.06" />
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="0px"
+                android:layout_height="match_parent"
+                android:layout_weight="0.0225" />
+
+            <LinearLayout
+                android:id="@+id/panel3"
+                android:layout_width="0px"
+                android:layout_height="match_parent"
+                android:layout_weight="0.275"
+                android:orientation="vertical">
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="0px"
+                    android:layout_weight="0.07" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="0px"
+                    android:layout_gravity="center"
+                    android:layout_weight="0.5"
+                    android:gravity="center"
+                    android:orientation="vertical"
+                    android:weightSum="0.5">
+
+                    <TextView
+                        android:id="@+id/direction"
+                        android:layout_width="match_parent"
+                        android:layout_height="0px"
+                        android:layout_gravity="center"
+                        android:layout_weight="0.333"
+                        android:gravity="center"
+                        android:text="--"
+                        android:textAlignment="center"
+                        android:textColor="@color/primary_text_dark"
+                        android:textSize="28sp"
+                        android:textStyle="bold"
+                        tools:ignore="HardcodedText" />
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="0px"
+                        android:layout_gravity="center"
+                        android:layout_weight="0.167"
+                        android:gravity="center"
+                        android:weightSum="2">
+
+                        <TextView
+                            android:id="@+id/delta"
+                            android:layout_width="0px"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center"
+                            android:layout_weight="1"
+                            android:gravity="center"
+                            android:text="+/-"
+                            android:textAlignment="center"
+                            android:textColor="@color/primary_text_dark"
+                            android:textSize="13sp"
+                            android:textStyle="bold"
+                            tools:ignore="HardcodedText" />
+
+                        <TextView
+                            android:id="@+id/avgdelta"
+                            android:layout_width="0px"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center"
+                            android:layout_weight="1"
+                            android:gravity="center"
+                            android:text="@string/abbreviation_average"
+                            android:textAlignment="center"
+                            android:textColor="@color/primary_text_dark"
+                            android:textSize="13sp"
+                            android:textStyle="bold" />
+
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="0px"
+                    android:layout_weight="0.06" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="0px"
+                    android:layout_weight="0.250"
+                    android:orientation="horizontal"
+                    android:weightSum="1">
+
+                    <View
+                        android:layout_width="0px"
+                        android:layout_height="match_parent"
+                        android:layout_weight="0.1" />
+
+                    <TextView
+                        android:id="@+id/loop"
+                        android:layout_width="0px"
+                        android:layout_height="match_parent"
+                        android:layout_gravity="start"
+                        android:layout_weight="0.5"
+                        android:background="@drawable/loop_grey_25"
+                        android:gravity="center"
+                        android:text="--'"
+                        android:textAlignment="center"
+                        android:textColor="@color/primary_text_dark"
+                        android:textSize="14sp"
+                        android:textStyle="bold"
+                        tools:ignore="HardcodedText" />
+
+                    <View
+                        android:id="@+id/AAPSv2"
+                        android:layout_width="0px"
+                        android:layout_height="match_parent"
+                        android:layout_weight="0.4"
+                        android:visibility="invisible" />
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="0px"
+                    android:layout_weight="0.16" />
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="0px"
+                android:layout_height="match_parent"
+                android:layout_weight="0.08" />
+
         </LinearLayout>
 
     </LinearLayout>
diff --git a/wear/src/main/res/layout-notround/activity_digitalstyle.xml b/wear/src/main/res/layout-notround/activity_digitalstyle.xml
index 87352b783a..1967a03571 100644
--- a/wear/src/main/res/layout-notround/activity_digitalstyle.xml
+++ b/wear/src/main/res/layout-notround/activity_digitalstyle.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/main_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/black"
-    tools:deviceIds="wear_square">
+    tools:deviceIds="wear_square"
+    tools:ignore="MissingDefaultResource">
 
     <!-- background-image with shapes elements-->
     <LinearLayout
@@ -22,6 +22,7 @@
         android:id="@+id/watchface_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:baselineAligned="false"
         android:orientation="horizontal"
         android:weightSum="8">
 
@@ -34,7 +35,7 @@
             android:orientation="vertical"
             android:weightSum="100">
 
-            <Space
+            <View
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:layout_weight="13.95" />
@@ -47,7 +48,7 @@
                 android:orientation="horizontal"
                 android:weightSum="13">
 
-                <Space
+                <View
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_weight="4.9" />
@@ -69,7 +70,8 @@
                         android:gravity="bottom|center_horizontal"
                         android:text="@string/activity_carb"
                         android:textColor="@color/light_grey"
-                        android:textSize="10sp" />
+                        android:textSize="10sp"
+                        tools:ignore="SmallSp" />
 
                     <TextView
                         android:id="@+id/cobView"
@@ -80,19 +82,20 @@
                         android:gravity="top|center_horizontal"
                         android:letterSpacing="-0.075"
                         android:lines="1"
-                        android:text="000g"
+                        android:text="@string/cob_000g"
                         android:textColor="@color/white"
                         android:textSize="14sp" />
+
                 </LinearLayout>
 
-                <Space
+                <View
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_weight="1.1" />
 
             </LinearLayout>
 
-            <Space
+            <View
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:layout_weight="2.87" />
@@ -105,7 +108,7 @@
                 android:orientation="horizontal"
                 android:weightSum="13">
 
-                <Space
+                <View
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_weight="3.2" />
@@ -120,6 +123,7 @@
 
                     <!-- 1st line with direction and timestamp-->
                     <LinearLayout
+                        android:id="@+id/directionLayout"
                         android:layout_width="match_parent"
                         android:layout_height="0dp"
                         android:layout_gravity="center_horizontal"
@@ -129,7 +133,7 @@
                         android:orientation="horizontal"
                         android:weightSum="10">
 
-                        <Space
+                        <View
                             android:layout_width="0dp"
                             android:layout_height="match_parent"
                             android:layout_weight="2" />
@@ -146,7 +150,8 @@
                             android:textAlignment="center"
                             android:textColor="@color/white"
                             android:textSize="16sp"
-                            android:textStyle="bold" />
+                            android:textStyle="bold"
+                            tools:ignore="HardcodedText" />
 
                         <TextView
                             android:id="@+id/timestamp"
@@ -159,12 +164,14 @@
                             android:fontFamily="sans-serif-condensed-light"
                             android:text="--'"
                             android:textColor="@color/light_grey"
-                            android:textSize="10sp" />
+                            android:textSize="10sp"
+                            tools:ignore="HardcodedText,SmallSp" />
 
-                        <Space
+                        <View
                             android:layout_width="0dp"
                             android:layout_height="match_parent"
                             android:layout_weight="2" />
+
                     </LinearLayout>
 
                     <!-- 2nd line with sgv-->
@@ -186,21 +193,23 @@
                             android:gravity="top|center_horizontal"
                             android:letterSpacing="-0.05"
                             android:lines="1"
-                            android:text="00,0"
+                            android:text="@string/svg_00_0"
                             android:textColor="@color/white"
                             android:textSize="20sp"
                             android:textStyle="bold" />
+
                     </LinearLayout>
+
                 </LinearLayout>
 
-                <Space
+                <View
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_weight="1.1" />
 
             </LinearLayout>
 
-            <Space
+            <View
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:layout_weight="2.87" />
@@ -213,7 +222,7 @@
                 android:orientation="horizontal"
                 android:weightSum="13">
 
-                <Space
+                <View
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_weight="4.9" />
@@ -235,7 +244,8 @@
                         android:gravity="bottom|center_horizontal"
                         android:text="@string/activity_IOB"
                         android:textColor="@color/light_grey"
-                        android:textSize="10sp" />
+                        android:textSize="10sp"
+                        tools:ignore="SmallSp" />
 
                     <TextView
                         android:id="@+id/iobView"
@@ -246,22 +256,24 @@
                         android:gravity="top|center_horizontal"
                         android:letterSpacing="-0.075"
                         android:lines="1"
-                        android:text="0,00U"
+                        android:text="@string/iob_0_00u"
                         android:textColor="@color/white"
                         android:textSize="14sp" />
+
                 </LinearLayout>
 
-                <Space
+                <View
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_weight="1.1" />
 
             </LinearLayout>
 
-            <Space
+            <View
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:layout_weight="13.95" />
+
         </LinearLayout>
 
         <!-- right side 5/8 width  -->
@@ -278,12 +290,13 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
-                android:layout_marginLeft="9dp"
+                android:layout_marginStart="9dp"
+                android:layout_marginEnd="0dp"
                 android:layout_weight="1"
                 android:orientation="vertical">
 
                 <!--  right side top - spacer    2/10 -->
-                <Space
+                <View
                     android:layout_width="match_parent"
                     android:layout_height="0dp"
                     android:layout_weight="2" />
@@ -311,11 +324,11 @@
                             android:layout_height="match_parent"
                             android:layout_weight="5"
                             android:fontFamily="@font/roboto_condensed_regular"
-                            android:text="DDD"
                             android:textAllCaps="true"
                             android:textColor="@color/white"
                             android:textFontWeight="400"
-                            android:textSize="18sp" />
+                            android:textSize="18sp"
+                            tools:text="DDD" />
 
                         <TextView
                             android:id="@+id/weeknumber"
@@ -324,17 +337,18 @@
                             android:layout_weight="4"
                             android:fontFamily="@font/roboto_condensed_light"
                             android:letterSpacing="-0.1"
-                            android:text="ww"
                             android:textAllCaps="true"
                             android:textColor="@color/light_grey"
                             android:textFontWeight="400"
                             android:textSize="18sp"
-                            android:visibility="gone" />
+                            android:visibility="gone"
+                            tools:text="ww" />
 
-                        <Space
+                        <View
                             android:layout_width="0dp"
                             android:layout_height="match_parent"
                             android:layout_weight="3" />
+
                     </LinearLayout>
 
                     <!-- day number + month (short)-->
@@ -354,10 +368,12 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:fontFamily="@font/roboto_condensed_regular"
+                                android:paddingStart="0dp"
                                 android:paddingEnd="4dp"
-                                android:text="DD"
                                 android:textColor="@color/light_grey"
-                                android:textSize="18sp" />
+                                android:textSize="18sp"
+                                tools:text="DD" />
+
                         </LinearLayout>
                         <!-- month short-->
                         <LinearLayout
@@ -368,14 +384,17 @@
                                 android:id="@+id/month"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_marginLeft="5dp"
+                                android:layout_marginStart="5dp"
                                 android:fontFamily="@font/roboto_condensed_regular"
-                                android:text="MMM"
                                 android:textAllCaps="true"
                                 android:textColor="@color/light_grey"
-                                android:textSize="18sp" />
+                                android:textSize="18sp"
+                                tools:text="MMM" />
+
                         </LinearLayout>
+
                     </LinearLayout>
+
                 </LinearLayout>
 
                 <!--  right side top - hour minute    4/10 -->
@@ -383,7 +402,8 @@
                     android:layout_width="match_parent"
                     android:layout_height="0dp"
                     android:layout_weight="4"
-                    android:gravity="left|center_vertical"
+                    android:baselineAligned="false"
+                    android:gravity="start|center_vertical"
                     android:orientation="horizontal">
 
                     <LinearLayout
@@ -396,17 +416,18 @@
                             android:id="@+id/hour"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_gravity="left"
+                            android:layout_gravity="start"
                             android:fontFamily="@font/roboto_condensed_bold"
-                            android:text="HH"
                             android:textAllCaps="true"
                             android:textColor="@color/white"
                             android:textSize="40sp"
-                            android:textStyle="bold" />
+                            android:textStyle="bold"
+                            tools:text="HH" />
+
                     </LinearLayout>
 
                     <LinearLayout
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="match_parent"
                         android:layout_weight="1"
                         android:orientation="vertical">
@@ -416,29 +437,33 @@
                             android:id="@+id/minute"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_gravity="left"
-                            android:layout_marginLeft="6sp"
+                            android:layout_gravity="start"
+                            android:layout_marginStart="6sp"
                             android:layout_marginBottom="-8sp"
                             android:fontFamily="@font/roboto_condensed_bold"
-                            android:text="MI"
                             android:textColor="@color/light_grey"
                             android:textSize="26sp"
-                            android:textStyle="bold" />
+                            android:textStyle="bold"
+                            tools:text="MI" />
 
-                        <!-- 12h period AM / PM-->
+                        <!-- 12h period AM / PM -->
                         <TextView
                             android:id="@+id/timePeriod"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="bottom"
-                            android:layout_marginLeft="8sp"
+                            android:layout_marginStart="8sp"
                             android:fontFamily="@font/roboto_condensed_bold"
-                            android:text="AM"
                             android:textColor="@color/light_grey"
                             android:textSize="10sp"
-                            android:textStyle="bold" />
+                            android:textStyle="bold"
+                            tools:ignore="SmallSp"
+                            tools:text="AM" />
+
                     </LinearLayout>
+
                 </LinearLayout>
+
             </LinearLayout>
 
             <!-- right side 1/2 height - bottom halft -->
@@ -449,7 +474,7 @@
                 android:layout_marginRight="7dp"
                 android:layout_weight="1"
                 android:baselineAligned="false"
-                android:gravity="left|top"
+                android:gravity="start|top"
                 android:orientation="vertical"
                 android:weightSum="10">
 
@@ -472,7 +497,8 @@
                         android:text="+/-"
                         android:textColor="@color/light_grey"
                         android:textSize="10sp"
-                        android:textStyle="bold" />
+                        android:textStyle="bold"
+                        tools:ignore="HardcodedText,SmallSp" />
 
                     <TextView
                         android:id="@+id/avgdelta"
@@ -480,10 +506,11 @@
                         android:layout_height="match_parent"
                         android:layout_weight="1"
                         android:gravity="center_horizontal|center_vertical"
-                        android:text="avg"
+                        android:text="@string/abbreviation_average"
                         android:textColor="@color/light_grey"
                         android:textSize="10sp"
-                        android:textStyle="bold" />
+                        android:textStyle="bold"
+                        tools:ignore="SmallSp" />
 
                     <TextView
                         android:id="@+id/uploader_battery"
@@ -494,7 +521,8 @@
                         android:text="--%"
                         android:textColor="@color/light_grey"
                         android:textSize="10sp"
-                        android:textStyle="bold" />
+                        android:textStyle="bold"
+                        tools:ignore="HardcodedText,SmallSp" />
 
                     <TextView
                         android:id="@+id/rig_battery"
@@ -506,7 +534,8 @@
                         android:textColor="@color/light_grey"
                         android:textSize="10sp"
                         android:textStyle="bold"
-                        android:visibility="gone" />
+                        android:visibility="gone"
+                        tools:ignore="HardcodedText,SmallSp" />
 
                     <TextView
                         android:id="@+id/tmpBasal"
@@ -514,10 +543,11 @@
                         android:layout_height="match_parent"
                         android:layout_weight="1.7"
                         android:gravity="center_horizontal|center_vertical"
-                        android:text="-.--U/h"
+                        android:text="@string/no_tmp_basal_u_h"
                         android:textColor="@color/light_grey"
                         android:textSize="10sp"
-                        android:textStyle="bold" />
+                        android:textStyle="bold"
+                        tools:ignore="SmallSp" />
 
                     <TextView
                         android:id="@+id/bgiView"
@@ -525,11 +555,13 @@
                         android:layout_height="match_parent"
                         android:layout_weight="1"
                         android:gravity="center_horizontal|center_vertical"
-                        android:text="bgi"
                         android:textColor="@color/light_grey"
                         android:textSize="10sp"
                         android:textStyle="bold"
-                        android:visibility="gone" />
+                        android:visibility="gone"
+                        tools:ignore="SmallSp"
+                        tools:text="bgi" />
+
                 </LinearLayout>
 
                 <!--  right side bottom - diagram 6/10 -->
@@ -552,21 +584,22 @@
                 </LinearLayout>
 
                 <!--  right side bottom - spacer    2/10 -->
-                <Space
+                <View
                     android:layout_width="match_parent"
                     android:layout_height="0dp"
                     android:layout_weight="2" />
+
             </LinearLayout>
+
         </LinearLayout>
+
     </LinearLayout>
 
     <!--   FLAGs   -->
-    <TextView
+    <View
         android:id="@+id/AAPSv2"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_weight="0"
-        android:text=""
         android:visibility="gone" />
 
 </RelativeLayout>
diff --git a/wear/src/main/res/layout-notround/activity_home.xml b/wear/src/main/res/layout-notround/activity_home.xml
index dd700fcf5c..b20301ae4a 100644
--- a/wear/src/main/res/layout-notround/activity_home.xml
+++ b/wear/src/main/res/layout-notround/activity_home.xml
@@ -1,156 +1,158 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout 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" tools:context=".watchfaces.AapsWatchface" tools:deviceIds="wear_square"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/main_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:background="@color/black"
-    android:id="@+id/main_layout">
+    android:gravity="center_horizontal"
+    android:orientation="vertical"
+    android:textAlignment="center"
+    android:weightSum="1"
+    tools:context=".watchfaces.AapsWatchface"
+    tools:deviceIds="wear_square"
+    tools:ignore="MissingDefaultResource">
 
     <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:textAlignment="center"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="-5dp"
         android:gravity="center_horizontal"
+        android:orientation="horizontal"
+        android:paddingTop="5dp"
+        android:textAlignment="center"
         android:weightSum="1">
 
-        <LinearLayout
-            android:orientation="horizontal"
+        <TextView
+            android:id="@+id/sgv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textAlignment="center"
-            android:paddingTop="5dp"
-            android:weightSum="1"
+            android:layout_gravity="bottom"
+            android:layout_marginEnd="5dp"
+            android:layout_marginBottom="-2dp"
+            android:gravity="bottom"
+            android:paddingTop="-2dp"
+            android:text="---"
+            android:textColor="@color/white"
+            android:textSize="41sp"
+            tools:ignore="HardcodedText" />
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
             android:layout_gravity="center_horizontal"
-            android:layout_marginTop="-5dp"
-            android:gravity="center_horizontal">
+            android:baselineAligned="false"
+            android:gravity="center_horizontal"
+            android:orientation="vertical"
+            android:textAlignment="center"
+            android:weightSum="1">
 
             <TextView
-                android:id="@+id/sgv"
-                android:textSize="41sp"
-                android:text="---"
+                android:id="@+id/direction"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal|bottom"
+                android:layout_marginTop="-2dp"
+                android:layout_marginBottom="-5dp"
+                android:gravity="center_horizontal|bottom"
+                android:paddingTop="1dp"
+                android:text="--"
+                android:textAlignment="center"
+                android:textColor="@color/white"
+                android:textSize="30sp"
+                android:textStyle="bold"
+                tools:ignore="HardcodedText" />
+
+            <TextView
+                android:id="@+id/delta"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textColor="#FFFFFF"
                 android:layout_gravity="bottom"
-                android:gravity="bottom|right"
-                android:layout_marginBottom="-2dp"
-                android:paddingTop="-2dp"
-                android:layout_marginEnd="5dp" />
-
-            <LinearLayout
-                android:orientation="vertical"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
-                android:weightSum="1"
-                android:textAlignment="center"
-                android:baselineAligned="false"
-                android:layout_gravity="center_horizontal"
-                android:gravity="center_horizontal">
-
-                <TextView
-                    android:id="@+id/direction"
-                    android:textSize="30sp"
-                    android:textStyle="bold"
-                    android:text="--"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textColor="#FFFFFF"
-                    android:textAlignment="center"
-                    android:layout_gravity="center_horizontal|bottom"
-                    android:gravity="center_horizontal|bottom"
-                    android:layout_marginBottom="-5dp"
-                    android:layout_marginTop="-2dp"
-                    android:paddingTop="1dp" />
-
-                <TextView
-                    android:id="@+id/delta"
-                    android:textSize="10sp"
-                    android:text="--- mg/dl"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textColor="#FFFFFF"
-                    android:layout_gravity="bottom"
-                    android:gravity="center_horizontal|bottom"
-                    android:textStyle="bold" />
-
-            </LinearLayout>
+                android:gravity="center_horizontal|bottom"
+                android:text="@string/delta_na"
+                android:textColor="@color/white"
+                android:textSize="10sp"
+                android:textStyle="bold"
+                tools:ignore="SmallSp" />
 
         </LinearLayout>
 
-        <LinearLayout
-            android:orientation="vertical"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/light_grey"
-            android:id="@+id/secondary_layout"
-            android:padding="1dp">
-
-            <LinearLayout
-                android:orientation="horizontal"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textAlignment="center"
-                android:layout_gravity="center_horizontal">
-
-                <TextView
-                    android:id="@+id/timestamp"
-                    android:textSize="10sp"
-                    android:text="-- Minutes ago"
-                    android:layout_width="wrap_content"
-                    android:textAlignment="center"
-                    android:textColor="#000000"
-                    android:layout_height="wrap_content" />
-                <TextView
-                    android:id="@+id/uploader_battery"
-                    android:textSize="10sp"
-                    android:text="Uploader: ---%"
-                    android:layout_width="wrap_content"
-                    android:textAlignment="center"
-                    android:textColor="#000000"
-                    android:paddingStart="10sp"
-                    android:layout_height="wrap_content" />
-                <TextView
-                    android:id="@+id/raw"
-                    android:textSize="10sp"
-                    android:text=""
-                    android:layout_width="wrap_content"
-                    android:textAlignment="center"
-                    android:textColor="#000000"
-                    android:paddingStart="10sp"
-                    android:layout_height="wrap_content" />
-                <TextView
-                    android:id="@+id/externaltstatus"
-                    android:textSize="10sp"
-                    android:text="S: no status"
-                    android:layout_width="wrap_content"
-                    android:textAlignment="center"
-                    android:textColor="#000000"
-                    android:paddingStart="10sp"
-                    android:layout_height="wrap_content" />
-
-            </LinearLayout>
-
-        </LinearLayout>
-
-        <TextView
-            android:id="@+id/watch_time"
-            android:textSize="35sp"
-            android:text="12:00"
-            android:layout_centerHorizontal="true"
-            android:layout_centerVertical="true"
-            android:textColor="#FFFFFF"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAlignment="center"
-            android:layout_gravity="center_horizontal|top" />
-
-        <lecho.lib.hellocharts.view.LineChartView
-            android:id="@+id/chart"
-            android:layout_width="match_parent"
-            android:layout_height="77dp"
-            android:layout_gravity="bottom"
-            android:gravity="center_horizontal|top" />
-
     </LinearLayout>
 
-</RelativeLayout>
+    <LinearLayout
+        android:id="@+id/secondary_layout"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:background="@color/light_grey"
+        android:orientation="horizontal"
+        android:padding="1dp"
+        android:textAlignment="center">
+
+        <TextView
+            android:id="@+id/timestamp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/time_stamp_na_min_ago"
+            android:textAlignment="center"
+            android:textColor="@color/black"
+            android:textSize="10sp"
+            tools:ignore="SmallSp" />
+
+        <TextView
+            android:id="@+id/uploader_battery"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingStart="10sp"
+            android:paddingEnd="0sp"
+            android:text="@string/uploader_na"
+            android:textAlignment="center"
+            android:textColor="@color/black"
+            android:textSize="10sp"
+            tools:ignore="SmallSp" />
+
+        <TextView
+            android:id="@+id/raw"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingStart="10sp"
+            android:paddingEnd="0sp"
+            android:text=""
+            android:textAlignment="center"
+            android:textColor="@color/black"
+            android:textSize="10sp"
+            tools:ignore="SmallSp" />
+
+        <TextView
+            android:id="@+id/externaltstatus"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingStart="10sp"
+            android:paddingEnd="0sp"
+            android:text="@string/no_status"
+            android:textAlignment="center"
+            android:textColor="@color/black"
+            android:textSize="10sp"
+            tools:ignore="SmallSp" />
+
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/watch_time"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal|top"
+        android:textAlignment="center"
+        android:textColor="@color/white"
+        android:textSize="35sp"
+        tools:text="12:00" />
+
+    <lecho.lib.hellocharts.view.LineChartView
+        android:id="@+id/chart"
+        android:layout_width="match_parent"
+        android:layout_height="77dp"
+        android:layout_gravity="bottom"
+        android:gravity="center_horizontal|top" />
+
+</LinearLayout>
diff --git a/wear/src/main/res/layout-notround/activity_home_2.xml b/wear/src/main/res/layout-notround/activity_home_2.xml
index 60ae6c3cf6..faaaca080e 100644
--- a/wear/src/main/res/layout-notround/activity_home_2.xml
+++ b/wear/src/main/res/layout-notround/activity_home_2.xml
@@ -1,372 +1,351 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/main_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/black"
+    android:orientation="vertical"
+    android:textAlignment="center"
+    android:weightSum="1"
     tools:context=".watchfaces.AapsV2Watchface"
-    tools:deviceIds="wear_square">
+    tools:deviceIds="wear_square"
+    tools:ignore="MissingDefaultResource">
 
     <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:textAlignment="center"
-        android:weightSum="1">
+        android:id="@+id/primary_layout"
+        android:layout_width="fill_parent"
+        android:layout_height="0px"
+        android:layout_gravity="center_horizontal"
+        android:layout_weight="0.27"
+        android:gravity="center_horizontal"
+        android:orientation="horizontal"
+        android:textAlignment="center">
+
+        <TextView
+            android:id="@+id/loop"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom|center"
+            android:background="@drawable/loop_grey_25"
+            android:gravity="center"
+            android:text="--'"
+            android:textAlignment="center"
+            android:textColor="@color/white"
+            android:textSize="14sp"
+            android:textStyle="bold"
+            tools:ignore="HardcodedText" />
+
+        <TextView
+            android:id="@+id/sgv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal|bottom"
+            android:layout_marginBottom="-2dp"
+            android:gravity="bottom|end"
+            android:paddingStart="5dp"
+            android:paddingTop="-2dp"
+            android:paddingEnd="5dp"
+            android:text="---"
+            android:textColor="@color/white"
+            android:textSize="38sp"
+            tools:ignore="HardcodedText" />
 
         <LinearLayout
-            android:id="@+id/primary_layout"
-            android:layout_width="fill_parent"
-            android:layout_height="0px"
+            android:layout_width="wrap_content"
+            android:layout_height="fill_parent"
             android:layout_gravity="center_horizontal"
-            android:layout_weight="0.27"
-            android:gravity="center_horizontal"
-            android:orientation="horizontal"
-            android:textAlignment="center">
+            android:orientation="vertical">
 
             <TextView
-                android:id="@+id/loop"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom|center"
-                android:background="@drawable/loop_grey_25"
-                android:gravity="center"
-                android:text="--'"
-                android:textAlignment="center"
-                android:textColor="#FFFFFF"
-                android:textSize="14sp"
-                android:textStyle="bold" />
-
-            <TextView
-                android:id="@+id/sgv"
-                android:layout_width="wrap_content"
+                android:id="@+id/direction"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal|bottom"
-                android:layout_marginBottom="-2dp"
-                android:gravity="bottom|right"
-                android:paddingStart="5dp"
-                android:paddingTop="-2dp"
-                android:paddingEnd="5dp"
-                android:text="---"
-                android:textColor="#FFFFFF"
-                android:textSize="38sp" />
+                android:gravity="center_horizontal|bottom"
+                android:text="--"
+                android:textAlignment="center"
+                android:textColor="@color/white"
+                android:textSize="22sp"
+                android:textStyle="bold"
+                tools:ignore="HardcodedText" />
 
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="fill_parent"
-                android:layout_gravity="center_horizontal"
-                android:baselineAligned="false"
-                android:gravity="center_vertical"
-                android:orientation="vertical"
-                android:textAlignment="center">
-
-                <TextView
-                    android:id="@+id/direction"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal|bottom"
-                    android:gravity="center_horizontal|bottom"
-                    android:text="--"
-                    android:textAlignment="center"
-                    android:textColor="#FFFFFF"
-                    android:textSize="22sp"
-                    android:textStyle="bold" />
-
-                <TextView
-                    android:id="@+id/timestamp"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="2dp"
-                    android:gravity="center"
-                    android:text="--'"
-                    android:textColor="#FFFFFF"
-                    android:textSize="14sp"
-                    android:textStyle="bold" />
-
-            </LinearLayout>
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/secondary_layout"
-            android:layout_width="fill_parent"
-            android:layout_height="0px"
-            android:layout_gravity="center"
-            android:layout_weight="0.10"
-            android:background="@color/light_grey"
-            android:gravity="center"
-            android:orientation="vertical"
-            android:padding="1dp">
-
-            <LinearLayout
-                android:layout_width="match_parent"
+            <TextView
+                android:id="@+id/timestamp"
+                android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
+                android:layout_marginBottom="2dp"
                 android:gravity="center"
-                android:orientation="horizontal"
-                android:paddingStart="2dp"
-                android:paddingEnd="2dp"
-                android:textAlignment="center">
-
-                <TextView
-                    android:id="@+id/delta"
-                    android:layout_width="0px"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:layout_weight="1"
-                    android:gravity="center"
-                    android:text="+/-"
-                    android:textAlignment="center"
-                    android:textColor="#000000"
-                    android:textSize="12sp"
-                    android:textStyle="bold" />
-
-                <TextView
-                    android:id="@+id/avgdelta"
-                    android:layout_width="0px"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:layout_weight="1"
-                    android:gravity="center"
-                    android:text="avg"
-                    android:textAlignment="center"
-                    android:textColor="#000000"
-                    android:textSize="12sp"
-                    android:textStyle="bold" />
-
-                <TextView
-                    android:id="@+id/uploader_battery"
-                    android:layout_width="0px"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:layout_weight="1"
-                    android:gravity="center"
-                    android:text="--%"
-                    android:textAlignment="center"
-                    android:textColor="#000000"
-                    android:textSize="12sp"
-                    android:textStyle="bold" />
-
-                <TextView
-                    android:id="@+id/rig_battery"
-                    android:layout_width="0px"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:layout_weight="1"
-                    android:gravity="center"
-                    android:text="--%"
-                    android:textAlignment="center"
-                    android:textColor="#000000"
-                    android:textSize="12sp"
-                    android:textStyle="bold"
-                    android:visibility="gone" />
-
-                <TextView
-                    android:id="@+id/tmpBasal"
-                    android:layout_width="0px"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:layout_weight="1.7"
-                    android:gravity="center"
-                    android:text="-.--U/h"
-                    android:textAlignment="center"
-                    android:textColor="#000000"
-                    android:textSize="12sp"
-                    android:textStyle="bold" />
-
-                <TextView
-                    android:id="@+id/bgiView"
-                    android:layout_width="0px"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:layout_weight="1"
-                    android:gravity="center"
-                    android:text="bgi"
-                    android:textAlignment="center"
-                    android:textColor="#000000"
-                    android:textSize="12sp"
-                    android:textStyle="bold"
-                    android:visibility="gone" />
-
-                <TextView
-                    android:id="@+id/AAPSv2"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0"
-                    android:text=""
-                    android:visibility="gone" />
-
-            </LinearLayout>
+                android:text="--'"
+                android:textColor="@color/white"
+                android:textSize="14sp"
+                android:textStyle="bold"
+                tools:ignore="HardcodedText" />
 
         </LinearLayout>
 
-        <LinearLayout
-            android:id="@+id/tertiary_layout"
-            android:layout_width="match_parent"
-            android:layout_height="0px"
-            android:layout_weight="0.22"
-            android:background="@color/black"
-            android:gravity="center"
-            android:orientation="vertical"
-            android:padding="1dp">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_gravity="center"
-                android:baselineAligned="false"
-                android:gravity="center"
-                android:orientation="horizontal"
-                android:weightSum="7">
-
-                <LinearLayout
-                    android:layout_width="0px"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:orientation="horizontal" />
-
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="center"
-                    android:baselineAligned="false"
-                    android:gravity="center"
-                    android:orientation="vertical"
-                    android:textAlignment="center">
-
-                    <TextView
-                        android:id="@+id/cob_text"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:gravity="center"
-                        android:text="@string/activity_carb"
-                        android:textColor="#FFFFFF"
-                        android:textSize="10sp"
-                        android:textStyle="bold" />
-
-                    <TextView
-                        android:id="@+id/cobView"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:gravity="center"
-                        android:text="--g"
-                        android:textAlignment="center"
-                        android:textColor="#FFFFFF"
-                        android:textSize="14sp"
-                        android:textStyle="bold" />
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="0px"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:orientation="horizontal" />
-
-                <TextView
-                    android:id="@+id/watch_time"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:gravity="center"
-                    android:text="12:00"
-                    android:textAlignment="center"
-                    android:textColor="#FFFFFF"
-                    android:textSize="30sp" />
-
-                <LinearLayout
-                    android:id="@+id/date_time"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="center"
-                    android:gravity="center"
-                    android:orientation="vertical"
-                    android:textAlignment="center"
-                    android:visibility="gone">
-
-                    <TextView
-                        android:id="@+id/day"
-                        android:layout_width="23dp"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:gravity="center"
-                        android:text="day"
-                        android:textAlignment="center"
-                        android:textColor="#FFFFFF"
-                        android:textSize="10sp" />
-
-                    <TextView
-                        android:id="@+id/month"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:gravity="center"
-                        android:text="mth"
-                        android:textColor="#FFFFFF"
-                        android:textSize="10sp" />
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="0px"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:orientation="horizontal" />
-
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="center"
-                    android:gravity="center"
-                    android:orientation="vertical"
-                    android:textAlignment="center">
-
-                    <TextView
-                        android:id="@+id/iob_text"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:gravity="center"
-                        android:text="@string/activity_IOB"
-                        android:textAlignment="center"
-                        android:textColor="#FFFFFF"
-                        android:textSize="10sp"
-                        android:textStyle="bold" />
-
-                    <TextView
-                        android:id="@+id/iobView"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:gravity="center"
-                        android:text="--U"
-                        android:textColor="#FFFFFF"
-                        android:textSize="14sp"
-                        android:textStyle="bold" />
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="0px"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:orientation="horizontal" />
-
-            </LinearLayout>
-
-        </LinearLayout>
-
-        <lecho.lib.hellocharts.view.LineChartView
-            android:id="@+id/chart"
-            android:layout_width="match_parent"
-            android:layout_height="0px"
-            android:layout_gravity="bottom"
-            android:layout_weight="0.41"
-            android:gravity="center_horizontal|top" />
-
     </LinearLayout>
 
-</RelativeLayout>
+    <LinearLayout
+        android:id="@+id/secondary_layout"
+        android:layout_width="fill_parent"
+        android:layout_height="0px"
+        android:layout_gravity="center"
+        android:layout_weight="0.10"
+        android:background="@color/light_grey"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:padding="1dp">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:orientation="horizontal"
+            android:paddingStart="2dp"
+            android:paddingEnd="2dp"
+            android:textAlignment="center">
+
+            <TextView
+                android:id="@+id/delta"
+                android:layout_width="0px"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="+/-"
+                android:textAlignment="center"
+                android:textColor="@color/black"
+                android:textSize="12sp"
+                android:textStyle="bold"
+                tools:ignore="HardcodedText" />
+
+            <TextView
+                android:id="@+id/avgdelta"
+                android:layout_width="0px"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="@string/abbreviation_average"
+                android:textAlignment="center"
+                android:textColor="@color/black"
+                android:textSize="12sp"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/uploader_battery"
+                android:layout_width="0px"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="--%"
+                android:textAlignment="center"
+                android:textColor="@color/black"
+                android:textSize="12sp"
+                android:textStyle="bold"
+                tools:ignore="HardcodedText" />
+
+            <TextView
+                android:id="@+id/rig_battery"
+                android:layout_width="0px"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="--%"
+                android:textAlignment="center"
+                android:textColor="@color/black"
+                android:textSize="12sp"
+                android:textStyle="bold"
+                android:visibility="gone"
+                tools:ignore="HardcodedText" />
+
+            <TextView
+                android:id="@+id/tmpBasal"
+                android:layout_width="0px"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_weight="1.7"
+                android:gravity="center"
+                android:text="@string/no_tmp_basal_u_h"
+                android:textAlignment="center"
+                android:textColor="@color/black"
+                android:textSize="12sp"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/bgiView"
+                android:layout_width="0px"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:textAlignment="center"
+                android:textColor="@color/black"
+                android:textSize="12sp"
+                android:textStyle="bold"
+                android:visibility="gone"
+                tools:text="bgi" />
+
+            <View
+                android:id="@+id/AAPSv2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:visibility="gone" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/tertiary_layout"
+        android:layout_width="match_parent"
+        android:layout_height="0px"
+        android:layout_gravity="center"
+        android:layout_weight="0.22"
+        android:background="@color/black"
+        android:baselineAligned="false"
+        android:gravity="center"
+        android:orientation="horizontal"
+        android:padding="1dp"
+        android:weightSum="7">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"
+            android:baselineAligned="false"
+            android:gravity="center"
+            android:orientation="vertical"
+            android:textAlignment="center">
+
+            <TextView
+                android:id="@+id/cob_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="center"
+                android:text="@string/activity_carb"
+                android:textColor="@color/white"
+                android:textSize="10sp"
+                android:textStyle="bold"
+                tools:ignore="SmallSp" />
+
+            <TextView
+                android:id="@+id/cobView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="center"
+                android:text="@string/no_cob_g"
+                android:textAlignment="center"
+                android:textColor="@color/white"
+                android:textSize="14sp"
+                android:textStyle="bold" />
+
+        </LinearLayout>
+
+        <View
+            android:layout_width="0px"
+            android:layout_height="match_parent"
+            android:layout_weight="1" />
+
+        <TextView
+            android:id="@+id/watch_time"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:textAlignment="center"
+            android:textColor="@color/white"
+            android:textSize="30sp"
+            tools:text="12:00" />
+
+        <LinearLayout
+            android:id="@+id/date_time"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:orientation="vertical"
+            android:textAlignment="center"
+            android:visibility="gone">
+
+            <TextView
+                android:id="@+id/day"
+                android:layout_width="23dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="center"
+                android:textAlignment="center"
+                android:textColor="@color/white"
+                android:textSize="10sp"
+                tools:ignore="SmallSp"
+                tools:text="day" />
+
+            <TextView
+                android:id="@+id/month"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="center"
+                android:textColor="@color/white"
+                android:textSize="10sp"
+                tools:ignore="SmallSp"
+                tools:text="mth" />
+
+        </LinearLayout>
+
+        <View
+            android:layout_width="0px"
+            android:layout_height="match_parent"
+            android:layout_weight="1" />
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:orientation="vertical"
+            android:textAlignment="center">
+
+            <TextView
+                android:id="@+id/iob_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="center"
+                android:text="@string/activity_IOB"
+                android:textAlignment="center"
+                android:textColor="@color/white"
+                android:textSize="10sp"
+                android:textStyle="bold"
+                tools:ignore="SmallSp" />
+
+            <TextView
+                android:id="@+id/iobView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="center"
+                android:text="@string/no_iob_u"
+                android:textColor="@color/white"
+                android:textSize="14sp"
+                android:textStyle="bold" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <lecho.lib.hellocharts.view.LineChartView
+        android:id="@+id/chart"
+        android:layout_width="match_parent"
+        android:layout_height="0px"
+        android:layout_gravity="bottom"
+        android:layout_weight="0.41"
+        android:gravity="center_horizontal|top" />
+
+</LinearLayout>
diff --git a/wear/src/main/res/layout-notround/activity_home_large.xml b/wear/src/main/res/layout-notround/activity_home_large.xml
index a3ffe072f3..9595976def 100644
--- a/wear/src/main/res/layout-notround/activity_home_large.xml
+++ b/wear/src/main/res/layout-notround/activity_home_large.xml
@@ -1,138 +1,136 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout 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" tools:context=".watchfaces.AapsWatchface" tools:deviceIds="wear_square"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/main_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:background="@color/black"
-    android:id="@+id/main_layout">
+    android:orientation="vertical"
+    android:textAlignment="center"
+    tools:context=".watchfaces.AapsWatchface"
+    tools:deviceIds="wear_square"
+    tools:ignore="MissingDefaultResource">
 
     <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:textAlignment="center">
-
-        <LinearLayout
-            android:orientation="horizontal"
-            android:layout_width="147dp"
-            android:layout_height="wrap_content"
-            android:textAlignment="center"
-            android:paddingTop="15dp"
-            android:weightSum="1"
-            android:layout_gravity="center_horizontal">
-
-            <TextView
-                android:id="@+id/sgv"
-                android:textSize="50sp"
-                android:text="---"
-                android:layout_width="wrap_content"
-                android:layout_height="55dp"
-                android:textColor="#FFFFFF"
-                android:layout_gravity="bottom"
-                android:gravity="bottom|right" />
-
-            <LinearLayout
-                android:orientation="vertical"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
-                android:weightSum="1"
-                android:textAlignment="center"
-                android:baselineAligned="false"
-                android:layout_gravity="center_horizontal">
-
-                <TextView
-                    android:id="@+id/direction"
-                    android:textSize="27sp"
-                    android:textStyle="bold"
-                    android:text="--"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:textColor="#FFFFFF"
-                    android:textAlignment="center"
-                    android:layout_gravity="center_horizontal|bottom"
-                    android:gravity="center_horizontal|bottom"
-                    android:paddingTop="1dp" />
-
-                <TextView
-                    android:id="@+id/delta"
-                    android:textSize="10sp"
-                    android:text="--- mg/dl"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:textColor="#FFFFFF"
-                    android:layout_gravity="bottom"
-                    android:gravity="center_horizontal" />
-
-            </LinearLayout>
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:orientation="vertical"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/light_grey"
-            android:id="@+id/secondary_layout"
-            android:padding="2dp">
-
-            <LinearLayout
-                android:orientation="horizontal"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textAlignment="center"
-                android:layout_gravity="center_horizontal">
-
-                <TextView
-                    android:id="@+id/timestamp"
-                    android:textSize="12sp"
-                    android:text="-- Minutes ago"
-                    android:layout_width="wrap_content"
-                    android:textAlignment="center"
-                    android:textColor="#000000"
-                    android:layout_height="wrap_content" />
-                <TextView
-                    android:id="@+id/uploader_battery"
-                    android:textSize="12sp"
-                    android:text="Uploader: ---%"
-                    android:layout_width="wrap_content"
-                    android:textAlignment="center"
-                    android:textColor="#000000"
-                    android:paddingStart="10sp"
-                    android:layout_height="wrap_content" />
-                <TextView
-                    android:id="@+id/raw"
-                    android:textSize="12sp"
-                    android:text=""
-                    android:layout_width="wrap_content"
-                    android:textAlignment="center"
-                    android:textColor="#000000"
-                    android:paddingStart="10sp"
-                    android:layout_height="wrap_content" />
-                <TextView
-                    android:id="@+id/externaltstatus"
-                    android:textSize="12sp"
-                    android:text="S: no status"
-                    android:layout_width="wrap_content"
-                    android:textAlignment="center"
-                    android:textColor="#000000"
-                    android:paddingStart="10sp"
-                    android:layout_height="wrap_content" />
-
-            </LinearLayout>
-
-        </LinearLayout>
+        android:layout_width="147dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:orientation="horizontal"
+        android:paddingTop="15dp"
+        android:textAlignment="center"
+        android:weightSum="1">
 
         <TextView
-            android:id="@+id/watch_time"
-            android:textSize="55sp"
-            android:text="12:00"
-            android:layout_centerHorizontal="true"
-            android:layout_centerVertical="true"
-            android:textColor="#FFFFFF"
+            android:id="@+id/sgv"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="55dp"
+            android:layout_gravity="bottom"
+            android:gravity="bottom"
+            android:text="---"
+            android:textColor="@color/white"
+            android:textSize="50sp"
+            tools:ignore="HardcodedText" />
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:layout_gravity="center_horizontal"
+            android:baselineAligned="false"
+            android:orientation="vertical"
             android:textAlignment="center"
-            android:layout_gravity="center_horizontal|top" />
+            android:weightSum="1">
+
+            <TextView
+                android:id="@+id/direction"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal|bottom"
+                android:gravity="center_horizontal|bottom"
+                android:paddingTop="1dp"
+                android:text="--"
+                android:textAlignment="center"
+                android:textColor="@color/white"
+                android:textSize="27sp"
+                android:textStyle="bold"
+                tools:ignore="HardcodedText" />
+
+            <TextView
+                android:id="@+id/delta"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom"
+                android:gravity="center_horizontal"
+                android:text="@string/delta_na"
+                android:textColor="@color/white"
+                android:textSize="10sp"
+                tools:ignore="SmallSp" />
+
+        </LinearLayout>
 
     </LinearLayout>
 
-</RelativeLayout>
+    <LinearLayout
+        android:id="@+id/secondary_layout"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:background="@color/light_grey"
+        android:orientation="horizontal"
+        android:padding="2dp"
+        android:textAlignment="center">
+
+        <TextView
+            android:id="@+id/timestamp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/time_stamp_na_min_ago"
+            android:textAlignment="center"
+            android:textColor="@color/black"
+            android:textSize="12sp" />
+
+        <TextView
+            android:id="@+id/uploader_battery"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingStart="10sp"
+            android:paddingEnd="0sp"
+            android:text="@string/uploader_na"
+            android:textAlignment="center"
+            android:textColor="@color/black"
+            android:textSize="12sp" />
+
+        <TextView
+            android:id="@+id/raw"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingStart="10sp"
+            android:paddingEnd="0sp"
+            android:text=""
+            android:textAlignment="center"
+            android:textColor="@color/black"
+            android:textSize="12sp" />
+
+        <TextView
+            android:id="@+id/externaltstatus"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingStart="10sp"
+            android:paddingEnd="0sp"
+            android:text="@string/no_status"
+            android:textAlignment="center"
+            android:textColor="@color/black"
+            android:textSize="12sp" />
+
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/watch_time"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal|top"
+        android:textAlignment="center"
+        android:textColor="@color/white"
+        android:textSize="55sp"
+        tools:text="12:00" />
+
+</LinearLayout>
diff --git a/wear/src/main/res/layout-notround/activity_nochart.xml b/wear/src/main/res/layout-notround/activity_nochart.xml
index 41f44e4404..6f4da2c1b5 100644
--- a/wear/src/main/res/layout-notround/activity_nochart.xml
+++ b/wear/src/main/res/layout-notround/activity_nochart.xml
@@ -1,100 +1,103 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout 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" tools:context=".watchfaces.AapsWatchface" tools:deviceIds="wear_square"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/main_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:background="@color/black"
-    android:id="@+id/main_layout">
+    android:gravity="center_horizontal"
+    android:orientation="vertical"
+    android:textAlignment="center"
+    tools:context=".watchfaces.AapsWatchface"
+    tools:deviceIds="wear_square"
+    tools:ignore="MissingDefaultResource">
 
     <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:textAlignment="center"
-        android:gravity="center_horizontal">
-
-        <LinearLayout
-            android:orientation="horizontal"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAlignment="center"
-            android:paddingTop="5dp"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="-5dp"
-            android:gravity="center_horizontal">
-
-            <TextView
-                android:id="@+id/delta"
-                android:textSize="40sp"
-                android:text="---"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textColor="#FFFFFF"
-                android:layout_gravity="bottom"
-                android:gravity="center_horizontal|bottom"
-                android:layout_marginEnd="5dp" />
-
-            <TextView
-                android:id="@+id/sgv"
-                android:textSize="55sp"
-                android:text="---"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textColor="#FFFFFF"
-                android:layout_gravity="center_horizontal"
-                android:gravity="center_horizontal" />
-
-            <TextView
-                android:id="@+id/avgdelta"
-                android:textSize="40sp"
-                android:text="---"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textColor="#FFFFFF"
-                android:layout_gravity="bottom"
-                android:gravity="center_horizontal|bottom"
-                android:layout_marginStart="5dp" />
-
-        </LinearLayout>
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="-5dp"
+        android:gravity="center_horizontal"
+        android:orientation="horizontal"
+        android:paddingTop="5dp"
+        android:textAlignment="center">
 
         <TextView
-            android:id="@+id/externaltstatus"
-            android:textSize="24sp"
-            android:text="E xU/h  IOB: x (x+x)"
-            android:layout_width="wrap_content"
-            android:textAlignment="center"
-            android:textColor="#FFFFFF"
-            android:layout_gravity="center_horizontal"
-            android:layout_height="wrap_content"/>
-
-        <LinearLayout
-            android:orientation="horizontal"
+            android:id="@+id/delta"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textAlignment="center"
-            android:gravity="center_horizontal|bottom">
+            android:layout_gravity="bottom"
+            android:layout_marginEnd="5dp"
+            android:gravity="center_horizontal|bottom"
+            android:text="---"
+            android:textColor="@color/white"
+            android:textSize="40sp"
+            tools:ignore="HardcodedText" />
 
-            <TextView
-                android:id="@+id/watch_time"
-                android:textSize="47sp"
-                android:text="12:00"
-                android:textColor="#FFFFFF"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textAlignment="center"
-                android:layout_marginEnd="6dp"
-                android:layout_gravity="center_horizontal" />
+        <TextView
+            android:id="@+id/sgv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:gravity="center_horizontal"
+            android:text="---"
+            android:textColor="@color/white"
+            android:textSize="55sp"
+            tools:ignore="HardcodedText" />
 
-            <TextView
-                android:id="@+id/timestamp"
-                android:textSize="35sp"
-                android:text="-- '"
-                android:layout_width="wrap_content"
-                android:textAlignment="center"
-                android:textColor="#FFFFFF"
-                android:layout_gravity="center_horizontal"
-                android:layout_height="wrap_content" />
-        </LinearLayout>
+        <TextView
+            android:id="@+id/avgdelta"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom"
+            android:layout_marginStart="5dp"
+            android:gravity="center_horizontal|bottom"
+            android:text="---"
+            android:textColor="@color/white"
+            android:textSize="40sp"
+            tools:ignore="HardcodedText" />
 
     </LinearLayout>
 
-</RelativeLayout>
+    <TextView
+        android:id="@+id/externaltstatus"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        tools:text="E xU/h  IOB: x (x+x)"
+        android:textAlignment="center"
+        android:textColor="@color/white"
+        android:textSize="24sp" />
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal|bottom"
+        android:orientation="horizontal"
+        android:textAlignment="center">
+
+        <TextView
+            android:id="@+id/watch_time"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginEnd="6dp"
+            tools:text="12:00"
+            android:textAlignment="center"
+            android:textColor="@color/white"
+            android:textSize="47sp" />
+
+        <TextView
+            android:id="@+id/timestamp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:text="-- '"
+            android:textAlignment="center"
+            android:textColor="@color/white"
+            android:textSize="35sp"
+            tools:ignore="HardcodedText" />
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/wear/src/main/res/layout-notround/activity_nochart_small.xml b/wear/src/main/res/layout-notround/activity_nochart_small.xml
index c8f82fad03..a02a672216 100644
--- a/wear/src/main/res/layout-notround/activity_nochart_small.xml
+++ b/wear/src/main/res/layout-notround/activity_nochart_small.xml
@@ -1,116 +1,112 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout 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" tools:context=".watchfaces.AapsWatchface" tools:deviceIds="wear_square"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/main_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:background="@color/black"
-    android:id="@+id/main_layout">
+    android:gravity="center_vertical|center_horizontal"
+    android:orientation="vertical"
+    android:textAlignment="center"
+    tools:context=".watchfaces.NoChartWatchface"
+    tools:deviceIds="wear_square"
+    tools:ignore="MissingDefaultResource">
 
     <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center_vertical|center_horizontal"
-        android:orientation="vertical"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="-5dp"
+        android:gravity="center_horizontal"
+        android:orientation="horizontal"
+        android:paddingTop="5dp"
         android:textAlignment="center">
 
-        <LinearLayout
+        <TextView
+            android:id="@+id/delta"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="bottom"
+            android:layout_marginEnd="5dp"
+            android:gravity="center_vertical|center_horizontal|center"
+            android:text="---"
+            android:textColor="@color/white"
+            android:textSize="24sp"
+            tools:ignore="HardcodedText" />
+
+        <TextView
+            android:id="@+id/sgv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:layout_marginTop="-5dp"
             android:gravity="center_horizontal"
-            android:orientation="horizontal"
-            android:paddingTop="5dp"
-            android:textAlignment="center">
-
-            <TextView
-                android:id="@+id/delta"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_gravity="bottom"
-                android:layout_marginEnd="5dp"
-                android:gravity="center_vertical|center_horizontal|center"
-                android:text="---"
-                android:textColor="#FFFFFF"
-                android:textSize="24sp" />
-
-            <TextView
-                android:id="@+id/sgv"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:gravity="center_horizontal"
-                android:text="---"
-                android:textColor="#FFFFFF"
-                android:textSize="45sp" />
-
-            <TextView
-                android:id="@+id/avgdelta"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginStart="5dp"
-                android:gravity="center_vertical|center_horizontal|center"
-                android:text=" ---"
-                android:textColor="#FFFFFF"
-                android:textSize="26sp" />
-
-        </LinearLayout>
-
-        <View
-            android:id="@+id/dummy1"
-            android:layout_width="match_parent"
-            android:layout_height="2dp"
-            android:layout_gravity="bottom"
-            android:gravity="center_horizontal" />
+            android:text="---"
+            android:textColor="@color/white"
+            android:textSize="45sp"
+            tools:ignore="HardcodedText" />
 
         <TextView
-            android:id="@+id/externaltstatus"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:gravity="center"
-            android:text="No Loop Status"
-            android:textAlignment="center"
-            android:textColor="#FFFFFF"
-            android:textSize="21sp" />
-
-        <View
-            android:id="@+id/dummy2"
-            android:layout_width="match_parent"
-            android:layout_height="2dp"
-            android:layout_gravity="bottom"
-            android:layout_weight="0"
-            android:gravity="center_horizontal" />
-
-        <LinearLayout
+            android:id="@+id/avgdelta"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center_horizontal|bottom"
-            android:orientation="horizontal"
-            android:textAlignment="center">
-
-            <TextView
-                android:id="@+id/watch_time"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginEnd="6dp"
-                android:text="23:24"
-                android:textAlignment="center"
-                android:textColor="#FFFFFF"
-                android:textSize="45sp" />
-
-            <TextView
-                android:id="@+id/timestamp"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical|center_horizontal"
-                android:text="--'"
-                android:textAlignment="center"
-                android:textColor="#FFFFFF"
-                android:textSize="24sp" />
-        </LinearLayout>
+            android:layout_height="match_parent"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginStart="5dp"
+            android:gravity="center_vertical|center_horizontal|center"
+            android:text=" ---"
+            android:textColor="@color/white"
+            android:textSize="26sp"
+            tools:ignore="HardcodedText" />
 
     </LinearLayout>
 
-</RelativeLayout>
\ No newline at end of file
+    <View
+        android:id="@+id/dummy1"
+        android:layout_width="match_parent"
+        android:layout_height="2dp"
+        android:layout_gravity="bottom"
+        android:gravity="center_horizontal" />
+
+    <TextView
+        android:id="@+id/externaltstatus"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:paddingBottom="2dp"
+        android:text="@string/no_loop_status"
+        android:textAlignment="center"
+        android:textColor="@color/white"
+        android:textSize="21sp" />
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal|bottom"
+        android:orientation="horizontal"
+        android:textAlignment="center">
+
+        <TextView
+            android:id="@+id/watch_time"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginEnd="6dp"
+            android:textAlignment="center"
+            android:textColor="@color/white"
+            android:textSize="45sp"
+            tools:text="23:24" />
+
+        <TextView
+            android:id="@+id/timestamp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical|center_horizontal"
+            android:text="--'"
+            android:textAlignment="center"
+            android:textColor="@color/white"
+            android:textSize="24sp"
+            tools:ignore="HardcodedText" />
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/wear/src/main/res/layout-notround/activity_steampunk.xml b/wear/src/main/res/layout-notround/activity_steampunk.xml
index e56d515d1b..531bf99513 100644
--- a/wear/src/main/res/layout-notround/activity_steampunk.xml
+++ b/wear/src/main/res/layout-notround/activity_steampunk.xml
@@ -5,7 +5,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".watchfaces.SteampunkWatchface"
-    tools:deviceIds="wear_square">
+    tools:deviceIds="wear_round"
+    tools:ignore="MissingDefaultResource">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -18,6 +19,7 @@
             android:layout_height="match_parent"
             android:layout_gravity="center"
             android:gravity="center"
+            android:importantForAccessibility="no"
             android:src="@drawable/steampunk_dial_mgdl" />
 
     </LinearLayout>
@@ -57,13 +59,10 @@
             android:orientation="vertical"
             android:weightSum="1">
 
-            <LinearLayout
+            <View
                 android:layout_width="match_parent"
                 android:layout_height="0px"
-                android:layout_gravity="center"
-                android:layout_weight="0.05"
-                android:gravity="center"
-                android:orientation="horizontal" />
+                android:layout_weight="0.05" />
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -86,7 +85,7 @@
                 <LinearLayout
                     android:layout_width="0px"
                     android:layout_height="match_parent"
-                    android:layout_weight="0.16"
+                    android:layout_weight="0.165"
                     android:orientation="horizontal">
 
                     <TextView
@@ -97,10 +96,10 @@
                         android:gravity="center"
                         android:paddingTop="7dp"
                         android:rotation="-28"
-                        android:text="--g"
+                        android:text="@string/no_cob_g"
                         android:textAlignment="center"
                         android:textColor="@color/black_86p"
-                        android:textSize="11sp"
+                        android:textSize="13sp"
                         android:textStyle="bold" />
 
                 </LinearLayout>
@@ -108,7 +107,7 @@
                 <LinearLayout
                     android:layout_width="0px"
                     android:layout_height="match_parent"
-                    android:layout_weight="0.24"
+                    android:layout_weight="0.27"
                     android:orientation="horizontal">
 
                     <TextView
@@ -117,12 +116,12 @@
                         android:layout_height="match_parent"
                         android:layout_gravity="center"
                         android:gravity="center"
-                        android:paddingBottom="12dp"
-                        android:rotation="-1"
-                        android:text="-.--U/h"
+                        android:paddingBottom="14dp"
+                        android:rotation="0"
+                        android:text="@string/no_tmp_basal_u_h"
                         android:textAlignment="center"
                         android:textColor="@color/black_86p"
-                        android:textSize="11sp"
+                        android:textSize="13sp"
                         android:textStyle="bold" />
 
                 </LinearLayout>
@@ -130,7 +129,7 @@
                 <LinearLayout
                     android:layout_width="0px"
                     android:layout_height="match_parent"
-                    android:layout_weight="0.2"
+                    android:layout_weight="0.165"
                     android:orientation="horizontal">
 
                     <TextView
@@ -141,10 +140,10 @@
                         android:gravity="center"
                         android:paddingTop="6dp"
                         android:rotation="28"
-                        android:text="0.00U"
+                        android:text="@string/no_iob_u"
                         android:textAlignment="center"
                         android:textColor="@color/black_86p"
-                        android:textSize="11sp"
+                        android:textSize="13sp"
                         android:textStyle="bold" />
 
                 </LinearLayout>
@@ -170,11 +169,10 @@
             android:orientation="horizontal"
             android:weightSum="1">
 
-            <LinearLayout
+            <View
                 android:layout_width="0px"
                 android:layout_height="match_parent"
-                android:layout_weight="0.25"
-                android:orientation="horizontal" />
+                android:layout_weight="0.25" />
 
             <lecho.lib.hellocharts.view.LineChartView
                 android:id="@+id/chart"
@@ -182,7 +180,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="0.5" />
 
-            <LinearLayout
+            <View
                 android:layout_width="0px"
                 android:layout_height="match_parent"
                 android:layout_weight="0.25"
@@ -190,11 +188,10 @@
 
         </LinearLayout>
 
-        <LinearLayout
+        <View
             android:layout_width="match_parent"
             android:layout_height="0px"
-            android:layout_weight="0.03"
-            android:orientation="vertical" />
+            android:layout_weight="0.03" />
 
     </LinearLayout>
 
@@ -207,26 +204,25 @@
         android:orientation="vertical"
         android:weightSum="1">
 
-        <LinearLayout
+        <View
             android:layout_width="match_parent"
             android:layout_height="0px"
-            android:layout_weight="0.15"
-            android:orientation="horizontal" />
+            android:layout_weight="0.15" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="0px"
             android:layout_gravity="center"
             android:layout_weight="0.21"
+            android:baselineAligned="false"
             android:gravity="center"
             android:orientation="horizontal"
             android:weightSum="1">
 
-            <LinearLayout
+            <View
                 android:layout_width="0px"
                 android:layout_height="match_parent"
-                android:layout_weight="0.32"
-                android:orientation="horizontal" />
+                android:layout_weight="0.32" />
 
             <LinearLayout
                 android:layout_width="0px"
@@ -240,14 +236,16 @@
                     android:layout_height="match_parent"
                     android:layout_gravity="center"
                     android:gravity="center"
-                    android:paddingEnd="8dp"
+                    android:paddingStart="0dp"
                     android:paddingTop="8dp"
+                    android:paddingEnd="8dp"
                     android:rotation="-24"
                     android:text="-'"
                     android:textAlignment="center"
                     android:textColor="@color/black_86p"
-                    android:textSize="10sp"
-                    android:textStyle="bold" />
+                    android:textSize="12sp"
+                    android:textStyle="bold"
+                    tools:ignore="HardcodedText" />
 
             </LinearLayout>
 
@@ -268,9 +266,10 @@
                     android:text="--%"
                     android:textAlignment="center"
                     android:textColor="@color/black_86p"
-                    android:textSize="10sp"
+                    android:textSize="12sp"
                     android:textStyle="bold"
-                    android:visibility="gone" />
+                    android:visibility="gone"
+                    tools:ignore="HardcodedText" />
 
                 <TextView
                     android:id="@+id/uploader_battery"
@@ -281,8 +280,9 @@
                     android:text="--%"
                     android:textAlignment="center"
                     android:textColor="@color/black_86p"
-                    android:textSize="10sp"
-                    android:textStyle="bold" />
+                    android:textSize="12sp"
+                    android:textStyle="bold"
+                    tools:ignore="HardcodedText" />
 
             </LinearLayout>
 
@@ -300,28 +300,28 @@
                     android:gravity="center"
                     android:paddingStart="10dp"
                     android:paddingTop="8dp"
+                    android:paddingEnd="0dp"
                     android:rotation="24"
                     android:text="-'"
                     android:textAlignment="center"
                     android:textColor="@color/black_86p"
-                    android:textSize="10sp"
-                    android:textStyle="bold" />
+                    android:textSize="12sp"
+                    android:textStyle="bold"
+                    tools:ignore="HardcodedText" />
 
             </LinearLayout>
 
-            <LinearLayout
+            <View
                 android:layout_width="0px"
                 android:layout_height="match_parent"
-                android:layout_weight="0.32"
-                android:orientation="horizontal" />
+                android:layout_weight="0.32" />
 
         </LinearLayout>
 
-        <LinearLayout
+        <View
             android:layout_width="match_parent"
             android:layout_height="0px"
-            android:layout_weight="0.64"
-            android:orientation="horizontal" />
+            android:layout_weight="0.64" />
 
     </LinearLayout>
 
@@ -330,8 +330,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@drawable/steampunk_cover_plate"
-        android:orientation="vertical">
-    </LinearLayout>
+        android:orientation="vertical" />
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -370,10 +369,10 @@
 
     </LinearLayout>
 
-    <TextView
+    <View
         android:id="@+id/AAPSv2"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:visibility="gone"/>
+        android:visibility="gone" />
 
 </RelativeLayout>
diff --git a/wear/src/main/res/layout-round/activity_bigchart.xml b/wear/src/main/res/layout-round/activity_bigchart.xml
index d610c6f38b..58c7a609a7 100644
--- a/wear/src/main/res/layout-round/activity_bigchart.xml
+++ b/wear/src/main/res/layout-round/activity_bigchart.xml
@@ -1,108 +1,107 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout 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" tools:context=".watchfaces.AapsWatchface" tools:deviceIds="wear_square"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/main_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:background="@color/black"
-    android:id="@+id/main_layout">
+    android:orientation="vertical"
+    android:textAlignment="center"
+    tools:context=".watchfaces.AapsWatchface"
+    tools:deviceIds="wear_square"
+    tools:ignore="MissingDefaultResource">
 
     <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:textAlignment="center"
-        android:gravity="center_horizontal">
-
-        <LinearLayout
-            android:orientation="horizontal"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAlignment="center"
-            android:paddingTop="5dp"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="-5dp"
-            android:gravity="center_horizontal">
-
-            <TextView
-                android:id="@+id/delta"
-                android:textSize="30sp"
-                android:text="---"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textColor="#FFFFFF"
-                android:layout_gravity="bottom"
-                android:gravity="center_horizontal|bottom"
-                android:layout_marginEnd="5dp" />
-
-            <TextView
-                android:id="@+id/sgv"
-                android:textSize="41sp"
-                android:text="---"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textColor="#FFFFFF"
-                android:layout_gravity="center_horizontal"
-                android:gravity="center_horizontal" />
-
-            <TextView
-                android:id="@+id/avgdelta"
-                android:textSize="30sp"
-                android:text="---"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textColor="#FFFFFF"
-                android:layout_gravity="bottom"
-                android:gravity="center_horizontal|bottom"
-                android:layout_marginStart="5dp" />
-
-        </LinearLayout>
-
-        <lecho.lib.hellocharts.view.LineChartView
-            android:id="@+id/chart"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_gravity="bottom"
-            android:layout_weight="1"
-            android:gravity="center_horizontal" />
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="-2dp"
+        android:gravity="center_horizontal"
+        android:orientation="horizontal"
+        android:paddingTop="5dp"
+        android:textAlignment="center">
 
         <TextView
-            android:id="@+id/externaltstatus"
-            android:textSize="18sp"
-            android:text="E xU/h  IOB: x (x+x)"
-            android:layout_width="wrap_content"
-            android:textAlignment="center"
-            android:textColor="#FFFFFF"
-            android:layout_gravity="center_horizontal"
-            android:layout_height="wrap_content"/>
-
-        <LinearLayout
-            android:orientation="horizontal"
+            android:id="@+id/delta"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textAlignment="center"
-            android:gravity="center_horizontal">
+            android:layout_gravity="bottom"
+            android:layout_marginEnd="5dp"
+            android:gravity="center_horizontal|bottom"
+            android:text="---"
+            android:textColor="@color/white"
+            android:textSize="30sp"
+            tools:ignore="HardcodedText" />
 
-            <TextView
-                android:id="@+id/watch_time"
-                android:textSize="35sp"
-                android:text="12:00"
-                android:textColor="#FFFFFF"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textAlignment="center"
-                android:layout_marginEnd="6dp"
-                android:layout_gravity="center_horizontal" />
+        <TextView
+            android:id="@+id/sgv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:gravity="center_horizontal"
+            android:text="---"
+            android:textColor="@color/white"
+            android:textSize="41sp"
+            tools:ignore="HardcodedText" />
 
-            <TextView
-                android:id="@+id/timestamp"
-                android:textSize="26sp"
-                android:text="-- '"
-                android:layout_width="wrap_content"
-                android:textAlignment="center"
-                android:textColor="#FFFFFF"
-                android:layout_gravity="center_horizontal"
-                android:layout_height="wrap_content" />
-        </LinearLayout>
+        <TextView
+            android:id="@+id/avgdelta"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom"
+            android:layout_marginStart="5dp"
+            android:gravity="center_horizontal|bottom"
+            android:text="---"
+            android:textColor="@color/white"
+            android:textSize="30sp"
+            tools:ignore="HardcodedText" />
 
     </LinearLayout>
 
-</RelativeLayout>
+    <lecho.lib.hellocharts.view.LineChartView
+        android:id="@+id/chart"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_gravity="bottom"
+        android:layout_weight="1"
+        android:gravity="center_horizontal" />
+
+    <TextView
+        android:id="@+id/externaltstatus"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:textAlignment="center"
+        android:textColor="@color/white"
+        android:textSize="18sp"
+        tools:text="E xU/h  IOB: x (x+x)" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/watch_time"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginEnd="6dp"
+            android:textColor="@color/white"
+            android:textSize="35sp"
+            tools:text="12:00" />
+
+        <TextView
+            android:id="@+id/timestamp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:text="-- '"
+            android:textColor="@color/white"
+            android:textSize="26sp"
+            tools:ignore="HardcodedText" />
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/wear/src/main/res/layout-round/activity_bigchart_small.xml b/wear/src/main/res/layout-round/activity_bigchart_small.xml
index 3a271e9ea0..c705f913dd 100644
--- a/wear/src/main/res/layout-round/activity_bigchart_small.xml
+++ b/wear/src/main/res/layout-round/activity_bigchart_small.xml
@@ -1,111 +1,113 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout 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" tools:context=".watchfaces.AapsWatchface" tools:deviceIds="wear_square"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/main_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:background="@color/black"
-    android:id="@+id/main_layout">
+    android:orientation="vertical"
+    android:textAlignment="center"
+    tools:context=".watchfaces.AapsWatchface"
+    tools:deviceIds="wear_square"
+    tools:ignore="MissingDefaultResource">
 
     <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:textAlignment="center"
-        android:gravity="center_horizontal">
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="-5dp"
-            android:gravity="center_horizontal"
-            android:orientation="horizontal"
-            android:paddingTop="5dp"
-            android:textAlignment="center">
-
-            <TextView
-                android:id="@+id/delta"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical|center_horizontal|center"
-                android:layout_marginEnd="5dp"
-                android:gravity="center_horizontal|bottom"
-                android:text="---"
-                android:textColor="#FFFFFF"
-                android:textSize="24sp" />
-
-            <TextView
-                android:id="@+id/sgv"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:gravity="center_horizontal"
-                android:text="---"
-                android:textColor="#FFFFFF"
-                android:textSize="34sp" />
-
-            <TextView
-                android:id="@+id/avgdelta"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical|center_horizontal|center"
-                android:layout_marginStart="5dp"
-                android:gravity="center_horizontal|bottom"
-                android:text="---"
-                android:textColor="#FFFFFF"
-                android:textSize="24sp" />
-
-        </LinearLayout>
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="-5dp"
+        android:gravity="center_horizontal"
+        android:orientation="horizontal"
+        android:paddingTop="5dp"
+        android:textAlignment="center">
 
         <TextView
-            android:id="@+id/externaltstatus"
+            android:id="@+id/delta"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical|center_horizontal|center"
+            android:layout_marginEnd="5dp"
+            android:gravity="center_horizontal|bottom"
+            android:text="---"
+            android:textColor="@color/white"
+            android:textSize="24sp"
+            tools:ignore="HardcodedText" />
+
+        <TextView
+            android:id="@+id/sgv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:layout_marginTop="-5sp"
-            android:text="E xU/h  IOB: x (x+x)"
-            android:textAlignment="center"
-            android:textColor="#FFFFFF"
-            android:textSize="18sp" />
+            android:gravity="center_horizontal"
+            android:text="---"
+            android:textColor="@color/white"
+            android:textSize="34sp"
+            tools:ignore="HardcodedText" />
 
-        <lecho.lib.hellocharts.view.LineChartView
-            android:id="@+id/chart"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_gravity="bottom"
-            android:layout_weight="1"
-            android:gravity="center_horizontal" />
-
-        <LinearLayout
+        <TextView
+            android:id="@+id/avgdelta"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="-5sp"
-            android:gravity="center_horizontal"
-            android:orientation="horizontal"
-            android:textAlignment="center">
-
-            <TextView
-                android:id="@+id/watch_time"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginEnd="6dp"
-                android:paddingTop="-5sp"
-                android:text="12:00"
-                android:textAlignment="center"
-                android:textColor="#FFFFFF"
-                android:textSize="34sp" />
-
-            <TextView
-                android:id="@+id/timestamp"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical|center_horizontal|center"
-                android:text="--'"
-                android:textAlignment="center"
-                android:textColor="#FFFFFF"
-                android:textSize="24sp" />
-        </LinearLayout>
+            android:layout_gravity="center_vertical|center_horizontal|center"
+            android:layout_marginStart="5dp"
+            android:gravity="center_horizontal|bottom"
+            android:text="---"
+            android:textColor="@color/white"
+            android:textSize="24sp"
+            tools:ignore="HardcodedText" />
 
     </LinearLayout>
 
-</RelativeLayout>
+    <TextView
+        android:id="@+id/externaltstatus"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="-5sp"
+        android:textAlignment="center"
+        android:textColor="@color/white"
+        android:textSize="18sp"
+        tools:text="E xU/h  IOB: x (x+x)" />
+
+    <lecho.lib.hellocharts.view.LineChartView
+        android:id="@+id/chart"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_gravity="bottom"
+        android:layout_weight="1"
+        android:gravity="center_horizontal" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="-5sp"
+        android:gravity="center_horizontal"
+        android:orientation="horizontal"
+        android:textAlignment="center">
+
+        <TextView
+            android:id="@+id/watch_time"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginEnd="6dp"
+            android:paddingTop="-5sp"
+            android:textAlignment="center"
+            android:textColor="@color/white"
+            android:textSize="34sp"
+            tools:text="12:00" />
+
+        <TextView
+            android:id="@+id/timestamp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical|center_horizontal|center"
+            android:text="--'"
+            android:textAlignment="center"
+            android:textColor="@color/white"
+            android:textSize="24sp"
+            tools:ignore="HardcodedText" />
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/wear/src/main/res/layout-round/activity_cockpit.xml b/wear/src/main/res/layout-round/activity_cockpit.xml
index 8486b4d211..8c93675cc1 100644
--- a/wear/src/main/res/layout-round/activity_cockpit.xml
+++ b/wear/src/main/res/layout-round/activity_cockpit.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout 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" tools:context=".watchfaces.CockpitWatchface" tools:deviceIds="wear_round"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/main_layout"
-    android:background="@drawable/airplane_cockpit_outside_clouds">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/airplane_cockpit_outside_clouds"
+    tools:context=".watchfaces.CockpitWatchface"
+    tools:deviceIds="wear_round"
+    tools:ignore="MissingDefaultResource">
 
     <LinearLayout
         android:id="@+id/inside"
@@ -13,105 +17,91 @@
         android:orientation="vertical"
         android:weightSum="1">
 
-        <LinearLayout
+        <View
             android:layout_width="fill_parent"
             android:layout_height="0px"
-            android:orientation="vertical"
-            android:layout_weight="0.095">
-
-        </LinearLayout>
+            android:layout_weight="0.095" />
 
         <LinearLayout
             android:id="@+id/windows"
             android:layout_width="fill_parent"
             android:layout_height="0px"
-            android:orientation="vertical"
-            android:layout_weight="0.2575">
+            android:layout_weight="0.2575"
+            android:orientation="horizontal">
+
+            <View
+                android:layout_width="0px"
+                android:layout_height="match_parent"
+                android:layout_weight="0.47" />
 
             <LinearLayout
-                android:layout_width="match_parent"
+                android:id="@+id/warnings"
+                android:layout_width="0px"
                 android:layout_height="match_parent"
-                android:orientation="horizontal"
-                android:weightSum="1">
+                android:layout_weight="0.06"
+                android:baselineAligned="false"
+                android:orientation="vertical">
+
+                <View
+                    android:layout_width="fill_parent"
+                    android:layout_height="0px"
+                    android:layout_weight="0.2" />
 
                 <TextView
-                    android:layout_width="0px"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="bottom"
-                    android:layout_weight="0.47" />
+                    android:id="@+id/highLight"
+                    android:layout_width="fill_parent"
+                    android:layout_height="0px"
+                    android:layout_gravity="center"
+                    android:layout_weight="1"
+                    android:background="@drawable/airplane_led_grey_unlit"
+                    android:gravity="center"
+                    android:text="@string/first_char_high"
+                    android:textAlignment="center"
+                    android:textColor="@color/primary_text_dark"
+                    android:textSize="8sp"
+                    android:textStyle="bold"
+                    tools:ignore="SmallSp" />
 
-                <LinearLayout
-                    android:id="@+id/warnings"
-                    android:layout_width="0px"
-                    android:layout_height="match_parent"
-                    android:layout_weight="0.06"
-                    android:baselineAligned="false"
-                    android:orientation="vertical">
-
-                    <TextView
-                        android:layout_width="fill_parent"
-                        android:layout_height="0px"
-                        android:layout_gravity="bottom"
-                        android:layout_weight="0.2" />
-
-                    <TextView
-                        android:id="@+id/highLight"
-                        android:layout_width="fill_parent"
-                        android:layout_height="0px"
-                        android:layout_gravity="center"
-                        android:layout_weight="1"
-                        android:background="@drawable/airplane_led_grey_unlit"
-                        android:gravity="center"
-                        android:text="H"
-                        android:textAlignment="center"
-                        android:textColor="@color/primary_text_dark"
-                        android:textSize="8sp"
-                        android:textStyle="bold" />
-
-                    <TextView
-                        android:layout_width="fill_parent"
-                        android:layout_height="0px"
-                        android:layout_gravity="bottom"
-                        android:layout_weight="2" />
-
-                    <TextView
-                        android:id="@+id/lowLight"
-                        android:layout_width="fill_parent"
-                        android:layout_height="0px"
-                        android:layout_gravity="center"
-                        android:layout_weight="1"
-                        android:background="@drawable/airplane_led_grey_unlit"
-                        android:gravity="center"
-                        android:text="L"
-                        android:textAlignment="center"
-                        android:textColor="@color/primary_text_dark"
-                        android:textSize="8sp"
-                        android:textStyle="bold" />
-
-                    <TextView
-                        android:layout_width="fill_parent"
-                        android:layout_height="0px"
-                        android:layout_gravity="bottom"
-                        android:layout_weight="0.2" />
-
-                </LinearLayout>
+                <View
+                    android:layout_width="fill_parent"
+                    android:layout_height="0px"
+                    android:layout_weight="2" />
 
                 <TextView
-                    android:layout_width="0px"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="bottom"
-                    android:layout_weight="0.47" />
+                    android:id="@+id/lowLight"
+                    android:layout_width="fill_parent"
+                    android:layout_height="0px"
+                    android:layout_gravity="center"
+                    android:layout_weight="1"
+                    android:background="@drawable/airplane_led_grey_unlit"
+                    android:gravity="center"
+                    android:text="@string/first_char_low"
+                    android:textAlignment="center"
+                    android:textColor="@color/primary_text_dark"
+                    android:textSize="8sp"
+                    android:textStyle="bold"
+                    tools:ignore="SmallSp" />
+
+                <View
+                    android:layout_width="fill_parent"
+                    android:layout_height="0px"
+                    android:layout_weight="0.2" />
 
             </LinearLayout>
 
+            <View
+                android:layout_width="0px"
+                android:layout_height="match_parent"
+                android:layout_weight="0.47" />
+
         </LinearLayout>
 
         <LinearLayout
             android:id="@+id/dashboard"
             android:layout_width="fill_parent"
             android:layout_height="0px"
-            android:orientation="vertical"
-            android:layout_weight="0.0775">
+            android:layout_weight="0.0775"
+            android:orientation="vertical">
 
         </LinearLayout>
 
@@ -120,369 +110,331 @@
             android:layout_width="match_parent"
             android:layout_height="0px"
             android:layout_weight="0.57"
-            android:orientation="vertical">
+            android:orientation="horizontal">
+
+            <View
+                android:layout_width="0px"
+                android:layout_height="match_parent"
+                android:layout_weight="0.08" />
 
             <LinearLayout
-                android:layout_width="match_parent"
+                android:id="@+id/panel1"
+                android:layout_width="0px"
                 android:layout_height="match_parent"
-                android:orientation="horizontal"
-                android:weightSum="1">
+                android:layout_weight="0.275"
+                android:orientation="vertical">
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="0px"
+                    android:layout_weight="0.07" />
 
                 <LinearLayout
-                    android:layout_width="0px"
-                    android:layout_height="match_parent"
-                    android:layout_weight="0.08"
-                    android:baselineAligned="false"
-                    android:orientation="horizontal">
+                    android:layout_width="match_parent"
+                    android:layout_height="0px"
+                    android:layout_weight="0.5"
+                    android:orientation="vertical"
+                    android:weightSum="1">
+
+                    <TextView
+                        android:id="@+id/sgv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:layout_gravity="center"
+                        android:text="---"
+                        android:textColor="@color/primary_text_dark"
+                        android:textSize="30sp"
+                        tools:ignore="HardcodedText" />
 
                 </LinearLayout>
 
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="0px"
+                    android:layout_weight="0.03" />
+
                 <LinearLayout
-                    android:id="@+id/panel1"
-                    android:layout_width="0px"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="center"
-                    android:layout_weight="0.275"
-                    android:baselineAligned="false"
+                    android:layout_width="match_parent"
+                    android:layout_height="0px"
+                    android:layout_weight="0.276"
                     android:orientation="horizontal"
-                    android:gravity="center"
-                    android:textAlignment="center">
+                    android:weightSum="1">
 
-                    <LinearLayout
-                        android:layout_width="match_parent"
+                    <TextView
+                        android:layout_width="0px"
                         android:layout_height="match_parent"
-                        android:orientation="vertical"
-                        android:weightSum="1">
+                        android:layout_weight="0.35" />
 
-                        <TextView
-                            android:layout_width="match_parent"
-                            android:layout_height="0px"
-                            android:layout_weight="0.07" />
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="0px"
-                            android:layout_weight="0.5"
-                            android:orientation="vertical"
-                            android:weightSum="1">
-
-                            <TextView
-                                android:id="@+id/sgv"
-                                android:layout_width="wrap_content"
-                                android:layout_height="0px"
-                                android:layout_gravity="center"
-                                android:layout_weight="1"
-                                android:text="---"
-                                android:textColor="@color/primary_text_dark"
-                                android:textSize="30sp" />
-
-                        </LinearLayout>
-
-                        <TextView
-                            android:layout_width="match_parent"
-                            android:layout_height="0px"
-                            android:layout_weight="0.03" />
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="0px"
-                            android:layout_weight="0.276"
-                            android:orientation="horizontal"
-                            android:weightSum="1">
-
-                            <TextView
-                                android:layout_width="0px"
-                                android:layout_height="match_parent"
-                                android:layout_weight="0.35" />
-
-                            <TextView
-                                android:id="@+id/timestamp"
-                                android:layout_width="0px"
-                                android:layout_height="match_parent"
-                                android:layout_gravity="center"
-                                android:layout_weight="0.65"
-                                android:text="--'"
-                                android:gravity="center"
-                                android:textAlignment="center"
-                                android:textColor="@color/primary_text_dark"
-                                android:textSize="14sp"
-                                android:textStyle="bold" />
-
-                        </LinearLayout>
-
-                    </LinearLayout>
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="0px"
-                    android:layout_height="match_parent"
-                    android:layout_weight="0.0225"
-                    android:baselineAligned="false"
-                    android:orientation="horizontal">
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/panel2"
-                    android:layout_width="0px"
-                    android:layout_height="match_parent"
-                    android:layout_weight="0.245"
-                    android:orientation="horizontal">
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
+                    <TextView
+                        android:id="@+id/timestamp"
+                        android:layout_width="0px"
                         android:layout_height="match_parent"
-                        android:orientation="vertical"
-                        android:weightSum="1.01">
-
-                        <TextView
-                            android:layout_width="match_parent"
-                            android:layout_height="0px"
-                            android:layout_weight="0.020" />
-
-                        <TextView
-                            android:id="@+id/watch_time"
-                            android:layout_width="wrap_content"
-                            android:layout_height="0px"
-                            android:layout_gravity="center"
-                            android:layout_weight="0.19"
-                            android:gravity="center"
-                            android:text="12:00"
-                            android:textAlignment="center"
-                            android:textColor="@color/primary_text_dark"
-                            android:textSize="18sp"
-                            android:textStyle="bold" />
-
-                        <TextView
-                            android:id="@+id/tmpBasal"
-                            android:layout_width="wrap_content"
-                            android:layout_height="0px"
-                            android:layout_gravity="bottom|center_horizontal"
-                            android:layout_weight="0.19"
-                            android:gravity="bottom|center_horizontal"
-                            android:text="-.--U/h"
-                            android:textAlignment="center"
-                            android:textColor="@color/primary_text_dark"
-                            android:textSize="13sp"
-                            android:textStyle="bold" />
-
-                        <TextView
-                            android:id="@+id/iobView"
-                            android:layout_width="wrap_content"
-                            android:layout_height="0px"
-                            android:layout_gravity="bottom|center_horizontal"
-                            android:layout_weight="0.18"
-                            android:gravity="bottom|center_horizontal"
-                            android:text="--U"
-                            android:textAlignment="center"
-                            android:textColor="@color/primary_text_dark"
-                            android:textSize="13sp"
-                            android:textStyle="bold" />
-
-                        <TextView
-                            android:id="@+id/cobView"
-                            android:layout_width="wrap_content"
-                            android:layout_height="0px"
-                            android:layout_gravity="bottom|center_horizontal"
-                            android:layout_weight="0.185"
-                            android:gravity="bottom|center_horizontal"
-                            android:text="--g"
-                            android:textAlignment="center"
-                            android:textColor="#FFFFFF"
-                            android:textSize="13sp"
-                            android:textStyle="bold" />
-
-                        <LinearLayout
-                            android:layout_width="wrap_content"
-                            android:layout_height="0px"
-                            android:layout_gravity="center"
-                            android:layout_weight="0.185"
-                            android:gravity="center"
-                            android:orientation="horizontal"
-                            android:textAlignment="center">
-
-                            <TextView
-                                android:id="@+id/uploader_battery"
-                                android:layout_width="wrap_content"
-                                android:layout_height="match_parent"
-                                android:layout_gravity="bottom|center_horizontal"
-                                android:gravity="bottom|center_horizontal"
-                                android:text="--%"
-                                android:textAlignment="center"
-                                android:textColor="@color/primary_text_dark"
-                                android:textSize="13sp"
-                                android:textStyle="bold" />
-
-                            <TextView
-                                android:id="@+id/rig_battery"
-                                android:layout_width="wrap_content"
-                                android:layout_height="match_parent"
-                                android:layout_gravity="bottom|center_horizontal"
-                                android:gravity="bottom|center_horizontal"
-                                android:paddingStart="4dp"
-                                android:text="--%"
-                                android:textAlignment="center"
-                                android:textColor="@color/primary_text_dark"
-                                android:textSize="13sp"
-                                android:textStyle="bold"
-                                android:visibility="gone" />
-
-                        </LinearLayout>
-
-                        <TextView
-                            android:layout_width="match_parent"
-                            android:layout_height="0px"
-                            android:layout_weight="0.06" />
-
-                    </LinearLayout>
+                        android:layout_gravity="center"
+                        android:layout_weight="0.65"
+                        android:gravity="center"
+                        android:text="--'"
+                        android:textAlignment="center"
+                        android:textColor="@color/primary_text_dark"
+                        android:textSize="14sp"
+                        android:textStyle="bold"
+                        tools:ignore="HardcodedText" />
 
                 </LinearLayout>
 
-                <LinearLayout
-                    android:layout_width="0px"
-                    android:layout_height="match_parent"
-                    android:layout_weight="0.0225"
-                    android:baselineAligned="false"
-                    android:orientation="horizontal">
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/panel3"
-                    android:layout_width="0px"
-                    android:layout_height="match_parent"
-                    android:layout_weight="0.275"
-                    android:baselineAligned="false"
-                    android:orientation="horizontal"
-                    android:textAlignment="center">
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:orientation="vertical"
-                        android:weightSum="1">
-
-                        <TextView
-                            android:layout_width="match_parent"
-                            android:layout_height="0px"
-                            android:layout_weight="0.07" />
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="0px"
-                            android:layout_gravity="center"
-                            android:layout_weight="0.5"
-                            android:gravity="center"
-                            android:orientation="vertical"
-                            android:weightSum="0.5">
-
-                            <TextView
-                                android:id="@+id/direction"
-                                android:layout_width="match_parent"
-                                android:layout_height="0px"
-                                android:layout_gravity="center"
-                                android:layout_weight="0.333"
-                                android:gravity="center"
-                                android:text="--"
-                                android:textAlignment="center"
-                                android:textColor="@color/primary_text_dark"
-                                android:textSize="28sp"
-                                android:textStyle="bold" />
-
-                            <LinearLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="0px"
-                                android:layout_weight="0.167"
-                                android:gravity="center"
-                                android:layout_gravity="center"
-                                android:weightSum="2">
-
-                                <TextView
-                                    android:id="@+id/delta"
-                                    android:layout_width="0px"
-                                    android:layout_height="wrap_content"
-                                    android:layout_gravity="center"
-                                    android:layout_weight="1"
-                                    android:gravity="center"
-                                    android:text="+/-"
-                                    android:textAlignment="center"
-                                    android:textColor="@color/primary_text_dark"
-                                    android:textSize="13sp"
-                                    android:textStyle="bold" />
-
-                                <TextView
-                                    android:id="@+id/avgdelta"
-                                    android:layout_width="0px"
-                                    android:layout_height="wrap_content"
-                                    android:layout_gravity="center"
-                                    android:layout_weight="1"
-                                    android:gravity="center"
-                                    android:text="avg"
-                                    android:textAlignment="center"
-                                    android:textColor="@color/primary_text_dark"
-                                    android:textSize="13sp"
-                                    android:textStyle="bold" />
-
-                            </LinearLayout>
-
-                        </LinearLayout>
-
-                        <TextView
-                            android:layout_width="match_parent"
-                            android:layout_height="0px"
-                            android:layout_weight="0.03" />
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="0px"
-                            android:layout_weight="0.250"
-                            android:orientation="horizontal"
-                            android:weightSum="1">
-
-                            <TextView
-                                android:layout_width="0px"
-                                android:layout_height="match_parent"
-                                android:layout_weight="0.1" />
-
-                            <TextView
-                                android:id="@+id/loop"
-                                android:layout_width="0px"
-                                android:layout_height="match_parent"
-                                android:layout_gravity="start"
-                                android:layout_weight="0.5"
-                                android:background="@drawable/loop_grey_25"
-                                android:gravity="center"
-                                android:text="--'"
-                                android:textAlignment="center"
-                                android:textColor="@color/primary_text_dark"
-                                android:textSize="14sp"
-                                android:textStyle="bold" />
-
-                            <TextView
-                                android:id="@+id/AAPSv2"
-                                android:layout_width="0px"
-                                android:layout_height="match_parent"
-                                android:layout_weight="0.4"
-                                android:visibility="invisible"/>
-
-                        </LinearLayout>
-
-                    </LinearLayout>
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="0px"
-                    android:layout_height="match_parent"
-                    android:layout_weight="0.08"
-                    android:baselineAligned="false"
-                    android:orientation="horizontal">
-
-                </LinearLayout>
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="0px"
+                    android:layout_weight="0.10" />
 
             </LinearLayout>
 
+            <View
+                android:layout_width="0px"
+                android:layout_height="match_parent"
+                android:layout_weight="0.0225" />
+
+            <LinearLayout
+                android:id="@+id/panel2"
+                android:layout_width="0px"
+                android:layout_height="match_parent"
+                android:layout_weight="0.245"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="0px"
+                    android:layout_weight="0.020" />
+
+                <TextView
+                    android:id="@+id/watch_time"
+                    android:layout_width="wrap_content"
+                    android:layout_height="0px"
+                    android:layout_gravity="center"
+                    android:layout_weight="0.19"
+                    android:gravity="center"
+                    android:textAlignment="center"
+                    android:textColor="@color/primary_text_dark"
+                    android:textSize="18sp"
+                    android:textStyle="bold"
+                    tools:text="12:00" />
+
+                <TextView
+                    android:id="@+id/tmpBasal"
+                    android:layout_width="wrap_content"
+                    android:layout_height="0px"
+                    android:layout_gravity="bottom|center_horizontal"
+                    android:layout_weight="0.19"
+                    android:gravity="bottom|center_horizontal"
+                    android:text="@string/no_tmp_basal_u_h"
+                    android:textAlignment="center"
+                    android:textColor="@color/primary_text_dark"
+                    android:textSize="13sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/iobView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="0px"
+                    android:layout_gravity="bottom|center_horizontal"
+                    android:layout_weight="0.18"
+                    android:gravity="bottom|center_horizontal"
+                    android:text="@string/no_iob_u"
+                    android:textAlignment="center"
+                    android:textColor="@color/primary_text_dark"
+                    android:textSize="13sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/cobView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="0px"
+                    android:layout_gravity="bottom|center_horizontal"
+                    android:layout_weight="0.185"
+                    android:gravity="bottom|center_horizontal"
+                    android:text="@string/no_cob_g"
+                    android:textAlignment="center"
+                    android:textColor="@color/white"
+                    android:textSize="13sp"
+                    android:textStyle="bold" />
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="0px"
+                    android:layout_gravity="center"
+                    android:layout_weight="0.185"
+                    android:gravity="center"
+                    android:orientation="horizontal"
+                    android:textAlignment="center">
+
+                    <TextView
+                        android:id="@+id/uploader_battery"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:layout_gravity="bottom|center_horizontal"
+                        android:gravity="bottom|center_horizontal"
+                        android:text="--%"
+                        android:textAlignment="center"
+                        android:textColor="@color/primary_text_dark"
+                        android:textSize="13sp"
+                        android:textStyle="bold"
+                        tools:ignore="HardcodedText" />
+
+                    <TextView
+                        android:id="@+id/rig_battery"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:layout_gravity="bottom|center_horizontal"
+                        android:gravity="bottom|center_horizontal"
+                        android:paddingStart="4dp"
+                        android:paddingEnd="0dp"
+                        android:text="--%"
+                        android:textAlignment="center"
+                        android:textColor="@color/primary_text_dark"
+                        android:textSize="13sp"
+                        android:textStyle="bold"
+                        android:visibility="gone"
+                        tools:ignore="HardcodedText" />
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="0px"
+                    android:layout_weight="0.06" />
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="0px"
+                android:layout_height="match_parent"
+                android:layout_weight="0.0225" />
+
+            <LinearLayout
+                android:id="@+id/panel3"
+                android:layout_width="0px"
+                android:layout_height="match_parent"
+                android:layout_weight="0.275"
+                android:orientation="vertical">
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="0px"
+                    android:layout_weight="0.07" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="0px"
+                    android:layout_gravity="center"
+                    android:layout_weight="0.5"
+                    android:gravity="center"
+                    android:orientation="vertical"
+                    android:weightSum="0.5">
+
+                    <TextView
+                        android:id="@+id/direction"
+                        android:layout_width="match_parent"
+                        android:layout_height="0px"
+                        android:layout_gravity="center"
+                        android:layout_weight="0.333"
+                        android:gravity="center"
+                        android:text="--"
+                        android:textAlignment="center"
+                        android:textColor="@color/primary_text_dark"
+                        android:textSize="28sp"
+                        android:textStyle="bold"
+                        tools:ignore="HardcodedText" />
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="0px"
+                        android:layout_gravity="center"
+                        android:layout_weight="0.167"
+                        android:gravity="center"
+                        android:weightSum="2">
+
+                        <TextView
+                            android:id="@+id/delta"
+                            android:layout_width="0px"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center"
+                            android:layout_weight="1"
+                            android:gravity="center"
+                            android:text="+/-"
+                            android:textAlignment="center"
+                            android:textColor="@color/primary_text_dark"
+                            android:textSize="13sp"
+                            android:textStyle="bold"
+                            tools:ignore="HardcodedText" />
+
+                        <TextView
+                            android:id="@+id/avgdelta"
+                            android:layout_width="0px"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center"
+                            android:layout_weight="1"
+                            android:gravity="center"
+                            android:text="@string/abbreviation_average"
+                            android:textAlignment="center"
+                            android:textColor="@color/primary_text_dark"
+                            android:textSize="13sp"
+                            android:textStyle="bold" />
+
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="0px"
+                    android:layout_weight="0.06" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="0px"
+                    android:layout_weight="0.250"
+                    android:orientation="horizontal"
+                    android:weightSum="1">
+
+                    <View
+                        android:layout_width="0px"
+                        android:layout_height="match_parent"
+                        android:layout_weight="0.1" />
+
+                    <TextView
+                        android:id="@+id/loop"
+                        android:layout_width="0px"
+                        android:layout_height="match_parent"
+                        android:layout_gravity="start"
+                        android:layout_weight="0.5"
+                        android:background="@drawable/loop_grey_25"
+                        android:gravity="center"
+                        android:text="--'"
+                        android:textAlignment="center"
+                        android:textColor="@color/primary_text_dark"
+                        android:textSize="14sp"
+                        android:textStyle="bold"
+                        tools:ignore="HardcodedText" />
+
+                    <View
+                        android:id="@+id/AAPSv2"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:visibility="gone" />
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="0px"
+                    android:layout_weight="0.16" />
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="0px"
+                android:layout_height="match_parent"
+                android:layout_weight="0.08" />
+
         </LinearLayout>
 
     </LinearLayout>
diff --git a/wear/src/main/res/layout-round/activity_digitalstyle.xml b/wear/src/main/res/layout-round/activity_digitalstyle.xml
index bc21b8d326..cb696ccc84 100644
--- a/wear/src/main/res/layout-round/activity_digitalstyle.xml
+++ b/wear/src/main/res/layout-round/activity_digitalstyle.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/main_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/black"
-    tools:deviceIds="wear_round">
+    tools:deviceIds="wear_round"
+    tools:ignore="MissingDefaultResource">
 
     <!-- background-image with shapes elements-->
     <LinearLayout
@@ -22,6 +22,7 @@
         android:id="@+id/watchface_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:baselineAligned="false"
         android:orientation="horizontal"
         android:weightSum="8">
 
@@ -34,7 +35,7 @@
             android:orientation="vertical"
             android:weightSum="100">
 
-            <Space
+            <View
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:layout_weight="13.95" />
@@ -47,7 +48,7 @@
                 android:orientation="horizontal"
                 android:weightSum="13">
 
-                <Space
+                <View
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_weight="4.9" />
@@ -69,7 +70,8 @@
                         android:gravity="bottom|center_horizontal"
                         android:text="@string/activity_carb"
                         android:textColor="@color/light_grey"
-                        android:textSize="10sp" />
+                        android:textSize="10sp"
+                        tools:ignore="SmallSp" />
 
                     <TextView
                         android:id="@+id/cobView"
@@ -80,19 +82,20 @@
                         android:gravity="top|center_horizontal"
                         android:letterSpacing="-0.075"
                         android:lines="1"
-                        android:text="000g"
+                        android:text="@string/cob_000g"
                         android:textColor="@color/white"
                         android:textSize="14sp" />
+
                 </LinearLayout>
 
-                <Space
+                <View
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_weight="1.1" />
 
             </LinearLayout>
 
-            <Space
+            <View
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:layout_weight="2.87" />
@@ -105,7 +108,7 @@
                 android:orientation="horizontal"
                 android:weightSum="13">
 
-                <Space
+                <View
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_weight="3.2" />
@@ -130,7 +133,7 @@
                         android:orientation="horizontal"
                         android:weightSum="10">
 
-                        <Space
+                        <View
                             android:layout_width="0dp"
                             android:layout_height="match_parent"
                             android:layout_weight="2" />
@@ -147,7 +150,8 @@
                             android:textAlignment="center"
                             android:textColor="@color/white"
                             android:textSize="16sp"
-                            android:textStyle="bold" />
+                            android:textStyle="bold"
+                            tools:ignore="HardcodedText" />
 
                         <TextView
                             android:id="@+id/timestamp"
@@ -160,12 +164,14 @@
                             android:fontFamily="sans-serif-condensed-light"
                             android:text="--'"
                             android:textColor="@color/light_grey"
-                            android:textSize="10sp" />
+                            android:textSize="10sp"
+                            tools:ignore="HardcodedText,SmallSp" />
 
-                        <Space
+                        <View
                             android:layout_width="0dp"
                             android:layout_height="match_parent"
                             android:layout_weight="2" />
+
                     </LinearLayout>
 
                     <!-- 2nd line with sgv-->
@@ -187,21 +193,23 @@
                             android:gravity="top|center_horizontal"
                             android:letterSpacing="-0.05"
                             android:lines="1"
-                            android:text="00,0"
+                            android:text="@string/svg_00_0"
                             android:textColor="@color/white"
                             android:textSize="20sp"
                             android:textStyle="bold" />
+
                     </LinearLayout>
+
                 </LinearLayout>
 
-                <Space
+                <View
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_weight="1.1" />
 
             </LinearLayout>
 
-            <Space
+            <View
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:layout_weight="2.87" />
@@ -214,7 +222,7 @@
                 android:orientation="horizontal"
                 android:weightSum="13">
 
-                <Space
+                <View
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_weight="4.9" />
@@ -236,7 +244,8 @@
                         android:gravity="bottom|center_horizontal"
                         android:text="@string/activity_IOB"
                         android:textColor="@color/light_grey"
-                        android:textSize="10sp" />
+                        android:textSize="10sp"
+                        tools:ignore="SmallSp" />
 
                     <TextView
                         android:id="@+id/iobView"
@@ -247,22 +256,24 @@
                         android:gravity="top|center_horizontal"
                         android:letterSpacing="-0.075"
                         android:lines="1"
-                        android:text="0,00U"
+                        android:text="@string/iob_0_00u"
                         android:textColor="@color/white"
                         android:textSize="14sp" />
+
                 </LinearLayout>
 
-                <Space
+                <View
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_weight="1.1" />
 
             </LinearLayout>
 
-            <Space
+            <View
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:layout_weight="13.95" />
+
         </LinearLayout>
 
         <!-- right side 5/8 width  -->
@@ -279,12 +290,13 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
-                android:layout_marginLeft="9dp"
+                android:layout_marginStart="9dp"
+                android:layout_marginEnd="0dp"
                 android:layout_weight="1"
                 android:orientation="vertical">
 
                 <!--  right side top - spacer    2/10 -->
-                <Space
+                <View
                     android:layout_width="match_parent"
                     android:layout_height="0dp"
                     android:layout_weight="2" />
@@ -312,11 +324,11 @@
                             android:layout_height="match_parent"
                             android:layout_weight="5"
                             android:fontFamily="@font/roboto_condensed_regular"
-                            android:text="DDD"
                             android:textAllCaps="true"
                             android:textColor="@color/white"
                             android:textFontWeight="400"
-                            android:textSize="18sp" />
+                            android:textSize="18sp"
+                            tools:text="DDD" />
 
                         <TextView
                             android:id="@+id/weeknumber"
@@ -325,17 +337,18 @@
                             android:layout_weight="4"
                             android:fontFamily="@font/roboto_condensed_light"
                             android:letterSpacing="-0.1"
-                            android:text="ww"
                             android:textAllCaps="true"
                             android:textColor="@color/light_grey"
                             android:textFontWeight="400"
                             android:textSize="18sp"
-                            android:visibility="gone" />
+                            android:visibility="gone"
+                            tools:text="ww" />
 
-                        <Space
+                        <View
                             android:layout_width="0dp"
                             android:layout_height="match_parent"
                             android:layout_weight="3" />
+
                     </LinearLayout>
 
                     <!-- day number + month (short)-->
@@ -355,10 +368,12 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:fontFamily="@font/roboto_condensed_regular"
+                                android:paddingStart="0dp"
                                 android:paddingEnd="4dp"
-                                android:text="DD"
                                 android:textColor="@color/light_grey"
-                                android:textSize="18sp" />
+                                android:textSize="18sp"
+                                tools:text="DD" />
+
                         </LinearLayout>
                         <!-- month short-->
                         <LinearLayout
@@ -369,14 +384,17 @@
                                 android:id="@+id/month"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_marginLeft="5dp"
+                                android:layout_marginStart="5dp"
                                 android:fontFamily="@font/roboto_condensed_regular"
-                                android:text="MMM"
                                 android:textAllCaps="true"
                                 android:textColor="@color/light_grey"
-                                android:textSize="18sp" />
+                                android:textSize="18sp"
+                                tools:text="MMM" />
+
                         </LinearLayout>
+
                     </LinearLayout>
+
                 </LinearLayout>
 
                 <!--  right side top - hour minute    4/10 -->
@@ -384,29 +402,32 @@
                     android:layout_width="match_parent"
                     android:layout_height="0dp"
                     android:layout_weight="4"
-                    android:gravity="left|center_vertical"
+                    android:baselineAligned="false"
+                    android:gravity="start|center_vertical"
                     android:orientation="horizontal">
 
                     <LinearLayout
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
                         android:layout_marginTop="-5dp">
+
                         <!-- hour -->
                         <TextView
                             android:id="@+id/hour"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_gravity="left"
+                            android:layout_gravity="start"
                             android:fontFamily="@font/roboto_condensed_bold"
-                            android:text="HH"
                             android:textAllCaps="true"
                             android:textColor="@color/white"
                             android:textSize="40sp"
-                            android:textStyle="bold" />
+                            android:textStyle="bold"
+                            tools:text="HH" />
+
                     </LinearLayout>
 
                     <LinearLayout
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="match_parent"
                         android:layout_weight="1"
                         android:orientation="vertical">
@@ -416,29 +437,33 @@
                             android:id="@+id/minute"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_gravity="left"
-                            android:layout_marginLeft="6sp"
+                            android:layout_gravity="start"
+                            android:layout_marginStart="6sp"
                             android:layout_marginBottom="-8sp"
                             android:fontFamily="@font/roboto_condensed_bold"
-                            android:text="MI"
                             android:textColor="@color/light_grey"
                             android:textSize="26sp"
-                            android:textStyle="bold" />
+                            android:textStyle="bold"
+                            tools:text="MI" />
 
                         <!-- 12h period AM / PM -->
                         <TextView
                             android:id="@+id/timePeriod"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginLeft="8sp"
+                            android:layout_marginStart="8sp"
                             android:fontFamily="@font/roboto_condensed_bold"
                             android:gravity="top"
-                            android:text="AM"
                             android:textColor="@color/light_grey"
                             android:textSize="10sp"
-                            android:textStyle="bold" />
+                            android:textStyle="bold"
+                            tools:ignore="SmallSp"
+                            tools:text="AM" />
+
                     </LinearLayout>
+
                 </LinearLayout>
+
             </LinearLayout>
 
             <!-- right side 1/2 height - bottom halft -->
@@ -449,7 +474,7 @@
                 android:layout_marginRight="7dp"
                 android:layout_weight="1"
                 android:baselineAligned="false"
-                android:gravity="left|top"
+                android:gravity="start|top"
                 android:orientation="vertical"
                 android:weightSum="10">
 
@@ -472,7 +497,8 @@
                         android:text="+/-"
                         android:textColor="@color/light_grey"
                         android:textSize="10sp"
-                        android:textStyle="bold" />
+                        android:textStyle="bold"
+                        tools:ignore="HardcodedText,SmallSp" />
 
                     <TextView
                         android:id="@+id/avgdelta"
@@ -480,10 +506,11 @@
                         android:layout_height="match_parent"
                         android:layout_weight="1"
                         android:gravity="center_horizontal|center_vertical"
-                        android:text="avg"
+                        android:text="@string/abbreviation_average"
                         android:textColor="@color/light_grey"
                         android:textSize="10sp"
-                        android:textStyle="bold" />
+                        android:textStyle="bold"
+                        tools:ignore="SmallSp" />
 
                     <TextView
                         android:id="@+id/uploader_battery"
@@ -494,7 +521,8 @@
                         android:text="--%"
                         android:textColor="@color/light_grey"
                         android:textSize="10sp"
-                        android:textStyle="bold" />
+                        android:textStyle="bold"
+                        tools:ignore="HardcodedText,SmallSp" />
 
                     <TextView
                         android:id="@+id/rig_battery"
@@ -506,7 +534,8 @@
                         android:textColor="@color/light_grey"
                         android:textSize="10sp"
                         android:textStyle="bold"
-                        android:visibility="gone" />
+                        android:visibility="gone"
+                        tools:ignore="HardcodedText,SmallSp" />
 
                     <TextView
                         android:id="@+id/tmpBasal"
@@ -514,10 +543,11 @@
                         android:layout_height="match_parent"
                         android:layout_weight="1.7"
                         android:gravity="center_horizontal|center_vertical"
-                        android:text="-.--U/h"
+                        android:text="@string/no_tmp_basal_u_h"
                         android:textColor="@color/light_grey"
                         android:textSize="10sp"
-                        android:textStyle="bold" />
+                        android:textStyle="bold"
+                        tools:ignore="SmallSp" />
 
                     <TextView
                         android:id="@+id/bgiView"
@@ -525,11 +555,13 @@
                         android:layout_height="match_parent"
                         android:layout_weight="1"
                         android:gravity="center_horizontal|center_vertical"
-                        android:text="bgi"
                         android:textColor="@color/light_grey"
                         android:textSize="10sp"
                         android:textStyle="bold"
-                        android:visibility="gone" />
+                        android:visibility="gone"
+                        tools:ignore="SmallSp"
+                        tools:text="bgi" />
+
                 </LinearLayout>
 
                 <!--  right side bottom - diagram 6/10 -->
@@ -552,22 +584,22 @@
                 </LinearLayout>
 
                 <!--  right side bottom - spacer    2/10 -->
-                <Space
+                <View
                     android:layout_width="match_parent"
                     android:layout_height="0dp"
                     android:layout_weight="2" />
 
             </LinearLayout>
+
         </LinearLayout>
+
     </LinearLayout>
 
     <!--   FLAGs   -->
-    <TextView
+    <View
         android:id="@+id/AAPSv2"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_weight="0"
-        android:text=""
         android:visibility="gone" />
 
 </RelativeLayout>
diff --git a/wear/src/main/res/layout-round/activity_home.xml b/wear/src/main/res/layout-round/activity_home.xml
index 008ed7d129..e886eada50 100644
--- a/wear/src/main/res/layout-round/activity_home.xml
+++ b/wear/src/main/res/layout-round/activity_home.xml
@@ -1,155 +1,164 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout 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" tools:context=".watchfaces.AapsWatchface" tools:deviceIds="wear_round"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/main_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:background="@color/black"
-    android:id="@+id/main_layout">
+    android:orientation="vertical"
+    android:textAlignment="center"
+    android:weightSum="1"
+    tools:context=".watchfaces.AapsWatchface"
+    tools:deviceIds="wear_round"
+    tools:ignore="MissingDefaultResource">
 
     <LinearLayout
-        android:orientation="vertical"
         android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="-5dp"
+        android:gravity="center_horizontal"
+        android:orientation="horizontal"
+        android:paddingTop="15dp"
         android:textAlignment="center"
         android:weightSum="1">
 
-        <LinearLayout
-            android:orientation="horizontal"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:textAlignment="center"
-            android:paddingTop="15dp"
-            android:weightSum="1"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center_horizontal"
-            android:layout_marginTop="-5dp">
-
-            <TextView
-                android:id="@+id/sgv"
-                android:textSize="41sp"
-                android:text="---"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textColor="#FFFFFF"
-                android:layout_gravity="center_horizontal|bottom"
-                android:gravity="bottom|right"
-                android:paddingEnd="5dp"
-                android:layout_marginBottom="-2dp"
-                android:paddingTop="-2dp" />
-
-            <LinearLayout
-                android:orientation="vertical"
-                android:layout_width="wrap_content"
-                android:layout_height="fill_parent"
-                android:weightSum="1"
-                android:textAlignment="center"
-                android:baselineAligned="false"
-                android:layout_gravity="center_horizontal">
-
-                <TextView
-                    android:id="@+id/direction"
-                    android:textSize="30sp"
-                    android:text="--"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:textColor="#FFFFFF"
-                    android:textAlignment="center"
-                    android:layout_gravity="center_horizontal|bottom"
-                    android:gravity="center_horizontal|bottom"
-                    android:layout_marginBottom="-5dp"
-                    android:layout_marginTop="-2dp"
-                    android:textStyle="bold" />
-
-                <TextView
-                    android:id="@+id/delta"
-                    android:textSize="10sp"
-                    android:text="--- mg/dl"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:textColor="#FFFFFF"
-                    android:layout_gravity="bottom"
-                    android:gravity="center_horizontal|bottom"
-                    android:textStyle="bold" />
-
-            </LinearLayout>
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:orientation="vertical"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/light_grey"
-            android:id="@+id/secondary_layout"
-            android:padding="1dp">
-
-            <LinearLayout
-                android:orientation="horizontal"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textAlignment="center"
-                android:layout_gravity="center_horizontal">
-
-                <TextView
-                    android:id="@+id/timestamp"
-                    android:textSize="8sp"
-                    android:text="-- Minutes ago"
-                    android:layout_width="wrap_content"
-                    android:textAlignment="center"
-                    android:textColor="#000000"
-                    android:layout_height="wrap_content" />
-                <TextView
-                    android:id="@+id/uploader_battery"
-                    android:textSize="8sp"
-                    android:text="Uploader: ---%"
-                    android:layout_width="wrap_content"
-                    android:textAlignment="center"
-                    android:textColor="#000000"
-                    android:paddingStart="10sp"
-                    android:layout_height="wrap_content" />
-                <TextView
-                    android:id="@+id/raw"
-                    android:textSize="8sp"
-                    android:text=""
-                    android:layout_width="wrap_content"
-                    android:textAlignment="center"
-                    android:textColor="#000000"
-                    android:paddingStart="10sp"
-                    android:layout_height="wrap_content" />
-                <TextView
-                    android:id="@+id/externaltstatus"
-                    android:textSize="8sp"
-                    android:text="S: no status"
-                    android:layout_width="wrap_content"
-                    android:textAlignment="center"
-                    android:textColor="#000000"
-                    android:paddingStart="10sp"
-                    android:layout_height="wrap_content" />
-
-            </LinearLayout>
-
-        </LinearLayout>
-
         <TextView
-            android:id="@+id/watch_time"
-            android:textSize="30sp"
-            android:text="12:00"
-            android:layout_centerHorizontal="true"
-            android:layout_centerVertical="true"
-            android:textColor="#FFFFFF"
+            android:id="@+id/sgv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textAlignment="center"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="-2dp"
-            android:layout_marginBottom="-3dp" />
+            android:layout_gravity="center_horizontal|bottom"
+            android:layout_marginBottom="-2dp"
+            android:gravity="bottom|end"
+            android:paddingStart="0dp"
+            android:paddingTop="-2dp"
+            android:paddingEnd="5dp"
+            android:text="---"
+            android:textColor="@color/white"
+            android:textSize="41sp"
+            tools:ignore="HardcodedText" />
 
-        <lecho.lib.hellocharts.view.LineChartView
-            android:id="@+id/chart"
-            android:layout_width="match_parent"
-            android:layout_height="77dp"
-            android:layout_gravity="bottom"
-            android:gravity="center_horizontal|top" />
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="fill_parent"
+            android:layout_gravity="center_horizontal"
+            android:baselineAligned="false"
+            android:orientation="vertical"
+            android:textAlignment="center"
+            android:weightSum="1">
+
+            <TextView
+                android:id="@+id/direction"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal|bottom"
+                android:layout_marginTop="-2dp"
+                android:layout_marginBottom="-5dp"
+                android:gravity="center_horizontal|bottom"
+                android:text="--"
+                android:textAlignment="center"
+                android:textColor="@color/white"
+                android:textSize="30sp"
+                android:textStyle="bold"
+                tools:ignore="HardcodedText" />
+
+            <TextView
+                android:id="@+id/delta"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom"
+                android:gravity="center_horizontal|bottom"
+                android:text="@string/delta_na"
+                android:textColor="@color/white"
+                android:textSize="10sp"
+                android:textStyle="bold"
+                tools:ignore="SmallSp" />
+
+        </LinearLayout>
 
     </LinearLayout>
 
-</RelativeLayout>
+    <LinearLayout
+        android:id="@+id/secondary_layout"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/light_grey"
+        android:orientation="vertical"
+        android:padding="1dp">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/timestamp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/time_stamp_na_min_ago"
+                android:textAlignment="center"
+                android:textColor="@color/black"
+                android:textSize="8sp"
+                tools:ignore="SmallSp" />
+
+            <TextView
+                android:id="@+id/uploader_battery"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingStart="10sp"
+                android:paddingEnd="0sp"
+                android:text="@string/uploader_na"
+                android:textAlignment="center"
+                android:textColor="@color/black"
+                android:textSize="8sp"
+                tools:ignore="SmallSp" />
+
+            <TextView
+                android:id="@+id/raw"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingStart="10sp"
+                android:paddingEnd="0sp"
+                android:text=""
+                android:textAlignment="center"
+                android:textColor="@color/black"
+                android:textSize="8sp"
+                tools:ignore="SmallSp" />
+
+            <TextView
+                android:id="@+id/externaltstatus"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingStart="10sp"
+                android:paddingEnd="0sp"
+                android:text="@string/no_status"
+                android:textAlignment="center"
+                android:textColor="@color/black"
+                android:textSize="8sp"
+                tools:ignore="SmallSp" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/watch_time"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="-2dp"
+        android:layout_marginBottom="-3dp"
+        android:textAlignment="center"
+        android:textColor="@color/white"
+        android:textSize="30sp"
+        tools:text="12:00" />
+
+    <lecho.lib.hellocharts.view.LineChartView
+        android:id="@+id/chart"
+        android:layout_width="match_parent"
+        android:layout_height="77dp"
+        android:layout_gravity="bottom"
+        android:gravity="center_horizontal|top" />
+
+</LinearLayout>
diff --git a/wear/src/main/res/layout-round/activity_home_2.xml b/wear/src/main/res/layout-round/activity_home_2.xml
index 64e6a411f0..2972ac5430 100644
--- a/wear/src/main/res/layout-round/activity_home_2.xml
+++ b/wear/src/main/res/layout-round/activity_home_2.xml
@@ -1,385 +1,366 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/main_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/black"
+    android:orientation="vertical"
+    android:textAlignment="center"
+    android:weightSum="1.1"
     tools:context=".watchfaces.AapsV2Watchface"
-    tools:deviceIds="wear_round">
+    tools:deviceIds="wear_round"
+    tools:ignore="MissingDefaultResource">
+
+    <View
+        android:layout_width="wrap_content"
+        android:layout_height="0px"
+        android:layout_weight="0.05"
+        android:orientation="vertical" />
 
     <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:textAlignment="center"
-        android:weightSum="1.1">
+        android:id="@+id/primary_layout"
+        android:layout_width="fill_parent"
+        android:layout_height="0px"
+        android:layout_gravity="center_horizontal"
+        android:layout_weight="0.27"
+        android:gravity="center_horizontal"
+        android:orientation="horizontal"
+        android:textAlignment="center">
+
+        <TextView
+            android:id="@+id/loop"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom|center"
+            android:background="@drawable/loop_grey_25"
+            android:gravity="center"
+            android:text="--'"
+            android:textAlignment="center"
+            android:textColor="@color/white"
+            android:textSize="14sp"
+            android:textStyle="bold"
+            tools:ignore="HardcodedText" />
+
+        <TextView
+            android:id="@+id/sgv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal|bottom"
+            android:layout_marginBottom="-2dp"
+            android:gravity="bottom|end"
+            android:paddingStart="5dp"
+            android:paddingTop="-2dp"
+            android:paddingEnd="5dp"
+            android:text="---"
+            android:textColor="@color/white"
+            android:textSize="38sp"
+            tools:ignore="HardcodedText" />
 
         <LinearLayout
             android:layout_width="wrap_content"
-            android:layout_height="0px"
-            android:layout_weight="0.05"
-            android:orientation="vertical" />
-
-        <LinearLayout
-            android:id="@+id/primary_layout"
-            android:layout_width="fill_parent"
-            android:layout_height="0px"
+            android:layout_height="fill_parent"
             android:layout_gravity="center_horizontal"
-            android:layout_weight="0.27"
-            android:gravity="center_horizontal"
-            android:orientation="horizontal"
-            android:textAlignment="center">
+            android:baselineAligned="false"
+            android:gravity="center_vertical"
+            android:orientation="vertical"
+            android:paddingStart="0dp"
+            android:paddingEnd="4dp">
 
             <TextView
-                android:id="@+id/loop"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom|center"
-                android:background="@drawable/loop_grey_25"
-                android:gravity="center"
-                android:text="--'"
-                android:textAlignment="center"
-                android:textColor="#FFFFFF"
-                android:textSize="14sp"
-                android:textStyle="bold" />
-
-            <TextView
-                android:id="@+id/sgv"
-                android:layout_width="wrap_content"
+                android:id="@+id/direction"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal|bottom"
-                android:layout_marginBottom="-2dp"
-                android:gravity="bottom|right"
-                android:paddingStart="5dp"
-                android:paddingTop="-2dp"
-                android:paddingEnd="5dp"
-                android:text="---"
-                android:textColor="#FFFFFF"
-                android:textSize="38sp" />
+                android:gravity="center_horizontal|bottom"
+                android:text="--"
+                android:textAlignment="center"
+                android:textColor="@color/white"
+                android:textSize="22sp"
+                android:textStyle="bold"
+                tools:ignore="HardcodedText" />
 
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="fill_parent"
-                android:layout_gravity="center_horizontal"
-                android:baselineAligned="false"
-                android:gravity="center_vertical"
-                android:orientation="vertical"
-                android:paddingEnd="4dp"
-                android:textAlignment="center">
-
-                <TextView
-                    android:id="@+id/direction"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal|bottom"
-                    android:gravity="center_horizontal|bottom"
-                    android:text="--"
-                    android:textAlignment="center"
-                    android:textColor="#FFFFFF"
-                    android:textSize="22sp"
-                    android:textStyle="bold" />
-
-                <TextView
-                    android:id="@+id/timestamp"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="2dp"
-                    android:gravity="center"
-                    android:text="--'"
-                    android:textColor="#FFFFFF"
-                    android:textSize="14sp"
-                    android:textStyle="bold" />
-
-            </LinearLayout>
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/secondary_layout"
-            android:layout_width="fill_parent"
-            android:layout_height="0px"
-            android:layout_gravity="center"
-            android:layout_weight="0.10"
-            android:background="@color/light_grey"
-            android:gravity="center"
-            android:orientation="vertical"
-            android:padding="1dp">
-
-            <LinearLayout
-                android:layout_width="match_parent"
+            <TextView
+                android:id="@+id/timestamp"
+                android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
+                android:layout_marginBottom="2dp"
                 android:gravity="center"
-                android:orientation="horizontal"
-                android:paddingStart="5dp"
-                android:paddingEnd="5dp"
-                android:textAlignment="center">
-
-                <TextView
-                    android:id="@+id/delta"
-                    android:layout_width="0px"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:layout_weight="1"
-                    android:gravity="center"
-                    android:text="+/-"
-                    android:textAlignment="center"
-                    android:textColor="#000000"
-                    android:textSize="13sp"
-                    android:textStyle="bold" />
-
-                <TextView
-                    android:id="@+id/avgdelta"
-                    android:layout_width="0px"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:layout_weight="1"
-                    android:gravity="center"
-                    android:text="avg"
-                    android:textAlignment="center"
-                    android:textColor="#000000"
-                    android:textSize="13sp"
-                    android:textStyle="bold" />
-
-                <TextView
-                    android:id="@+id/uploader_battery"
-                    android:layout_width="0px"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:layout_weight="1"
-                    android:gravity="center"
-                    android:text="--%"
-                    android:textAlignment="center"
-                    android:textColor="#000000"
-                    android:textSize="13sp"
-                    android:textStyle="bold" />
-
-                <TextView
-                    android:id="@+id/rig_battery"
-                    android:layout_width="0px"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:layout_weight="1"
-                    android:gravity="center"
-                    android:text="--%"
-                    android:textAlignment="center"
-                    android:textColor="#000000"
-                    android:textSize="13sp"
-                    android:textStyle="bold"
-                    android:visibility="gone" />
-
-                <TextView
-                    android:id="@+id/tmpBasal"
-                    android:layout_width="0px"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:layout_weight="1.7"
-                    android:gravity="center"
-                    android:text="-.--U/h"
-                    android:textAlignment="center"
-                    android:textColor="#000000"
-                    android:textSize="13sp"
-                    android:textStyle="bold" />
-
-                <TextView
-                    android:id="@+id/bgiView"
-                    android:layout_width="0px"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:layout_weight="1"
-                    android:gravity="center"
-                    android:text="bgi"
-                    android:textAlignment="center"
-                    android:textColor="#000000"
-                    android:textSize="13sp"
-                    android:textStyle="bold"
-                    android:visibility="gone" />
-
-                <TextView
-                    android:id="@+id/AAPSv2"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0"
-                    android:text=""
-                    android:visibility="gone" />
-
-            </LinearLayout>
+                android:text="--'"
+                android:textColor="@color/white"
+                android:textSize="14sp"
+                android:textStyle="bold"
+                tools:ignore="HardcodedText" />
 
         </LinearLayout>
 
-        <LinearLayout
-            android:id="@+id/tertiary_layout"
-            android:layout_width="match_parent"
-            android:layout_height="0px"
-            android:layout_weight="0.22"
-            android:background="@color/black"
-            android:gravity="center"
-            android:orientation="vertical"
-            android:padding="1dp">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_gravity="center"
-                android:baselineAligned="false"
-                android:gravity="center"
-                android:orientation="horizontal"
-                android:weightSum="7">
-
-                <LinearLayout
-                    android:layout_width="0px"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:orientation="horizontal" />
-
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="center"
-                    android:baselineAligned="false"
-                    android:gravity="center"
-                    android:orientation="vertical"
-                    android:textAlignment="center">
-
-                    <TextView
-                        android:id="@+id/cob_text"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:gravity="center"
-                        android:text="@string/activity_carb"
-                        android:textColor="#FFFFFF"
-                        android:textSize="10sp"
-                        android:textStyle="bold" />
-
-                    <TextView
-                        android:id="@+id/cobView"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:gravity="center"
-                        android:text="--g"
-                        android:textAlignment="center"
-                        android:textColor="#FFFFFF"
-                        android:textSize="14sp"
-                        android:textStyle="bold" />
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="0px"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:orientation="horizontal" />
-
-                <TextView
-                    android:id="@+id/watch_time"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:gravity="center"
-                    android:text="12:00"
-                    android:textAlignment="center"
-                    android:textColor="#FFFFFF"
-                    android:textSize="30sp" />
-
-                <LinearLayout
-                    android:id="@+id/date_time"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="center"
-                    android:gravity="center"
-                    android:orientation="vertical"
-                    android:textAlignment="center"
-                    android:visibility="gone">
-
-                    <TextView
-                        android:id="@+id/day"
-                        android:layout_width="23dp"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:gravity="center"
-                        android:text="day"
-                        android:textAlignment="center"
-                        android:textColor="#FFFFFF"
-                        android:textSize="12sp" />
-
-                    <TextView
-                        android:id="@+id/month"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:gravity="center"
-                        android:text="mth"
-                        android:textColor="#FFFFFF"
-                        android:textSize="12sp" />
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="0px"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:orientation="horizontal" />
-
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="center"
-                    android:gravity="center"
-                    android:orientation="vertical"
-                    android:textAlignment="center">
-
-                    <TextView
-                        android:id="@+id/iob_text"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:gravity="center"
-                        android:text="@string/activity_IOB"
-                        android:textAlignment="center"
-                        android:textColor="#FFFFFF"
-                        android:textSize="10sp"
-                        android:textStyle="bold" />
-
-                    <TextView
-                        android:id="@+id/iobView"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:gravity="center"
-                        android:text="--U"
-                        android:textColor="#FFFFFF"
-                        android:textSize="14sp"
-                        android:textStyle="bold" />
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="0px"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:orientation="horizontal" />
-
-            </LinearLayout>
-
-        </LinearLayout>
-
-        <lecho.lib.hellocharts.view.LineChartView
-            android:id="@+id/chart"
-            android:layout_width="match_parent"
-            android:layout_height="0px"
-            android:layout_gravity="bottom"
-            android:layout_weight="0.41"
-            android:gravity="center_horizontal|top" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="0px"
-            android:layout_weight="0.05"
-            android:orientation="vertical" />
-
     </LinearLayout>
 
-</RelativeLayout>
+    <LinearLayout
+        android:id="@+id/secondary_layout"
+        android:layout_width="fill_parent"
+        android:layout_height="0px"
+        android:layout_gravity="center"
+        android:layout_weight="0.10"
+        android:background="@color/light_grey"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:padding="1dp">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:orientation="horizontal"
+            android:paddingStart="5dp"
+            android:paddingEnd="5dp"
+            android:textAlignment="center">
+
+            <TextView
+                android:id="@+id/delta"
+                android:layout_width="0px"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="+/-"
+                android:textAlignment="center"
+                android:textColor="@color/black"
+                android:textSize="13sp"
+                android:textStyle="bold"
+                tools:ignore="HardcodedText" />
+
+            <TextView
+                android:id="@+id/avgdelta"
+                android:layout_width="0px"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="@string/abbreviation_average"
+                android:textAlignment="center"
+                android:textColor="@color/black"
+                android:textSize="13sp"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/uploader_battery"
+                android:layout_width="0px"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="--%"
+                android:textAlignment="center"
+                android:textColor="@color/black"
+                android:textSize="13sp"
+                android:textStyle="bold"
+                tools:ignore="HardcodedText" />
+
+            <TextView
+                android:id="@+id/rig_battery"
+                android:layout_width="0px"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="--%"
+                android:textAlignment="center"
+                android:textColor="@color/black"
+                android:textSize="13sp"
+                android:textStyle="bold"
+                android:visibility="gone"
+                tools:ignore="HardcodedText" />
+
+            <TextView
+                android:id="@+id/tmpBasal"
+                android:layout_width="0px"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_weight="1.7"
+                android:gravity="center"
+                android:text="@string/no_tmp_basal_u_h"
+                android:textAlignment="center"
+                android:textColor="@color/black"
+                android:textSize="13sp"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/bgiView"
+                android:layout_width="0px"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:textAlignment="center"
+                android:textColor="@color/black"
+                android:textSize="13sp"
+                android:textStyle="bold"
+                android:visibility="gone"
+                tools:text="bgi" />
+
+            <View
+                android:id="@+id/AAPSv2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:visibility="gone" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/tertiary_layout"
+        android:layout_width="match_parent"
+        android:layout_height="0px"
+        android:layout_gravity="center"
+        android:layout_weight="0.22"
+        android:background="@color/black"
+        android:baselineAligned="false"
+        android:gravity="center"
+        android:orientation="horizontal"
+        android:padding="1dp"
+        android:weightSum="7">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"
+            android:baselineAligned="false"
+            android:gravity="center"
+            android:orientation="vertical"
+            android:textAlignment="center">
+
+            <TextView
+                android:id="@+id/cob_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="center"
+                android:text="@string/activity_carb"
+                android:textColor="@color/white"
+                android:textSize="10sp"
+                android:textStyle="bold"
+                tools:ignore="SmallSp" />
+
+            <TextView
+                android:id="@+id/cobView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="center"
+                android:text="@string/no_cob_g"
+                android:textAlignment="center"
+                android:textColor="@color/white"
+                android:textSize="14sp"
+                android:textStyle="bold" />
+
+        </LinearLayout>
+
+        <View
+            android:layout_width="0px"
+            android:layout_height="match_parent"
+            android:layout_weight="1" />
+
+        <TextView
+            android:id="@+id/watch_time"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:textAlignment="center"
+            android:textColor="@color/white"
+            android:textSize="30sp"
+            tools:text="12:00" />
+
+        <LinearLayout
+            android:id="@+id/date_time"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:orientation="vertical"
+            android:textAlignment="center"
+            android:visibility="gone">
+
+            <TextView
+                android:id="@+id/day"
+                android:layout_width="23dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="center"
+                android:textAlignment="center"
+                android:textColor="@color/white"
+                android:textSize="12sp"
+                tools:text="day" />
+
+            <TextView
+                android:id="@+id/month"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="center"
+                android:textColor="@color/white"
+                android:textSize="12sp"
+                tools:text="mth" />
+
+        </LinearLayout>
+
+        <View
+            android:layout_width="0px"
+            android:layout_height="match_parent"
+            android:layout_weight="1" />
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:orientation="vertical"
+            android:textAlignment="center">
+
+            <TextView
+                android:id="@+id/iob_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="center"
+                android:text="@string/activity_IOB"
+                android:textAlignment="center"
+                android:textColor="@color/white"
+                android:textSize="10sp"
+                android:textStyle="bold"
+                tools:ignore="SmallSp" />
+
+            <TextView
+                android:id="@+id/iobView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="center"
+                android:text="@string/no_iob_u"
+                android:textColor="@color/white"
+                android:textSize="14sp"
+                android:textStyle="bold" />
+
+        </LinearLayout>
+
+
+    </LinearLayout>
+
+    <lecho.lib.hellocharts.view.LineChartView
+        android:id="@+id/chart"
+        android:layout_width="match_parent"
+        android:layout_height="0px"
+        android:layout_gravity="bottom"
+        android:layout_weight="0.41"
+        android:gravity="center_horizontal|top" />
+
+    <View
+        android:layout_width="wrap_content"
+        android:layout_height="0px"
+        android:layout_weight="0.05"
+        android:orientation="vertical" />
+
+</LinearLayout>
diff --git a/wear/src/main/res/layout-round/activity_home_large.xml b/wear/src/main/res/layout-round/activity_home_large.xml
index 40f26dc17c..35bb86cdf1 100644
--- a/wear/src/main/res/layout-round/activity_home_large.xml
+++ b/wear/src/main/res/layout-round/activity_home_large.xml
@@ -1,138 +1,138 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout 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" tools:context=".watchfaces.AapsWatchface" tools:deviceIds="wear_round"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/main_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:background="@color/black"
-    android:id="@+id/main_layout">
+    android:orientation="vertical"
+    android:textAlignment="center"
+    tools:context=".watchfaces.AapsWatchface"
+    tools:deviceIds="wear_round"
+    tools:ignore="MissingDefaultResource">
 
     <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
+        android:layout_width="147dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:gravity="center_vertical|center_horizontal"
+        android:orientation="horizontal"
+        android:paddingTop="30dp"
         android:textAlignment="center">
 
-        <LinearLayout
-            android:orientation="horizontal"
-            android:layout_width="147dp"
-            android:layout_height="wrap_content"
-            android:textAlignment="center"
-            android:paddingTop="29dp"
-            android:weightSum="1"
-            android:layout_gravity="center_horizontal">
-
-            <TextView
-                android:id="@+id/sgv"
-                android:textSize="50sp"
-                android:text="---"
-                android:layout_width="wrap_content"
-                android:layout_height="55dp"
-                android:textColor="#FFFFFF"
-                android:layout_gravity="bottom"
-                android:gravity="bottom|right" />
-
-            <LinearLayout
-                android:orientation="vertical"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
-                android:weightSum="1"
-                android:textAlignment="center"
-                android:baselineAligned="false"
-                android:layout_gravity="center_horizontal">
-
-                <TextView
-                    android:id="@+id/direction"
-                    android:textSize="27sp"
-                    android:textStyle="bold"
-                    android:text="--"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:textColor="#FFFFFF"
-                    android:textAlignment="center"
-                    android:layout_gravity="center_horizontal|bottom"
-                    android:gravity="center_horizontal|bottom"
-                    android:paddingTop="1dp" />
-
-                <TextView
-                    android:id="@+id/delta"
-                    android:textSize="10sp"
-                    android:text="--- mg/dl"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:textColor="#FFFFFF"
-                    android:layout_gravity="bottom"
-                    android:gravity="center_horizontal" />
-
-                </LinearLayout>
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:orientation="vertical"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/light_grey"
-            android:id="@+id/secondary_layout"
-            android:padding="2dp">
-
-            <LinearLayout
-                android:orientation="horizontal"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textAlignment="center"
-                android:layout_gravity="center_horizontal">
-
-                <TextView
-                    android:id="@+id/timestamp"
-                    android:textSize="12sp"
-                    android:text="-- Minutes ago"
-                    android:layout_width="wrap_content"
-                    android:textAlignment="center"
-                    android:textColor="#000000"
-                    android:layout_height="wrap_content" />
-                <TextView
-                    android:id="@+id/uploader_battery"
-                    android:textSize="12sp"
-                    android:text="Uploader: ---%"
-                    android:layout_width="wrap_content"
-                    android:textAlignment="center"
-                    android:textColor="#000000"
-                    android:paddingStart="10sp"
-                    android:layout_height="wrap_content" />
-                <TextView
-                    android:id="@+id/raw"
-                    android:textSize="12sp"
-                    android:text=""
-                    android:layout_width="wrap_content"
-                    android:textAlignment="center"
-                    android:textColor="#000000"
-                    android:paddingStart="10sp"
-                    android:layout_height="wrap_content" />
-                <TextView
-                    android:id="@+id/externaltstatus"
-                    android:textSize="12sp"
-                    android:text="S: no status"
-                    android:layout_width="wrap_content"
-                    android:textAlignment="center"
-                    android:textColor="#000000"
-                    android:paddingStart="10sp"
-                    android:layout_height="wrap_content" />
-
-            </LinearLayout>
-
-        </LinearLayout>
-
         <TextView
-            android:id="@+id/watch_time"
-            android:textSize="55sp"
-            android:text="12:00"
-            android:layout_centerHorizontal="true"
-            android:layout_centerVertical="true"
-            android:textColor="#FFFFFF"
+            android:id="@+id/sgv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:paddingStart="0dp"
+            android:paddingEnd="10dp"
+            android:paddingBottom="3dp"
+            android:text="8.8"
+            android:textColor="@color/white"
+            android:textSize="50sp"
+            tools:ignore="HardcodedText" />
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="fill_parent"
+            android:layout_gravity="center_horizontal"
+            android:baselineAligned="false"
+            android:orientation="vertical"
             android:textAlignment="center"
-            android:layout_gravity="center_horizontal|top" />
+            android:weightSum="1">
+
+            <TextView
+                android:id="@+id/direction"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal|bottom"
+                android:gravity="center_horizontal|bottom"
+                android:paddingTop="1dp"
+                android:text="--"
+                android:textAlignment="center"
+                android:textColor="@color/white"
+                android:textSize="27sp"
+                android:textStyle="bold"
+                tools:ignore="HardcodedText" />
+
+            <TextView
+                android:id="@+id/delta"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom"
+                android:gravity="center_horizontal"
+                android:text="@string/delta_na"
+                android:textColor="@color/white"
+                android:textSize="10sp"
+                tools:ignore="SmallSp" />
+
+        </LinearLayout>
 
     </LinearLayout>
 
-</RelativeLayout>
+    <LinearLayout
+        android:id="@+id/secondary_layout"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:background="@color/light_grey"
+        android:gravity="center_horizontal"
+        android:orientation="horizontal"
+        android:padding="2dp">
+
+        <TextView
+            android:id="@+id/timestamp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="--'"
+            android:textAlignment="center"
+            android:textColor="@color/black"
+            android:textSize="14sp"
+            tools:ignore="HardcodedText" />
+
+        <TextView
+            android:id="@+id/uploader_battery"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingStart="10sp"
+            android:paddingEnd="0sp"
+            android:text="@string/uploader_na"
+            android:textAlignment="center"
+            android:textColor="@color/black"
+            android:textSize="14sp" />
+
+        <TextView
+            android:id="@+id/raw"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingStart="10sp"
+            android:paddingEnd="0sp"
+            android:text=""
+            android:textAlignment="center"
+            android:textColor="@color/black"
+            android:textSize="14sp" />
+
+        <TextView
+            android:id="@+id/externaltstatus"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingStart="10sp"
+            android:paddingEnd="0sp"
+            android:text="@string/no_status"
+            android:textAlignment="center"
+            android:textColor="@color/black"
+            android:textSize="14sp" />
+
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/watch_time"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal|top"
+        android:textAlignment="center"
+        android:textColor="@color/white"
+        android:textSize="55sp"
+        tools:text="12:00" />
+
+</LinearLayout>
diff --git a/wear/src/main/res/layout-round/activity_nochart.xml b/wear/src/main/res/layout-round/activity_nochart.xml
index 41f44e4404..0ae2e794e0 100644
--- a/wear/src/main/res/layout-round/activity_nochart.xml
+++ b/wear/src/main/res/layout-round/activity_nochart.xml
@@ -1,100 +1,101 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout 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" tools:context=".watchfaces.AapsWatchface" tools:deviceIds="wear_square"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/main_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:background="@color/black"
-    android:id="@+id/main_layout">
+    android:gravity="center_vertical|center_horizontal"
+    android:orientation="vertical"
+    android:textAlignment="center"
+    tools:context=".watchfaces.NoChartWatchface"
+    tools:deviceIds="wear_square"
+    tools:ignore="MissingDefaultResource">
 
     <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:textAlignment="center"
-        android:gravity="center_horizontal">
-
-        <LinearLayout
-            android:orientation="horizontal"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAlignment="center"
-            android:paddingTop="5dp"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="-5dp"
-            android:gravity="center_horizontal">
-
-            <TextView
-                android:id="@+id/delta"
-                android:textSize="40sp"
-                android:text="---"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textColor="#FFFFFF"
-                android:layout_gravity="bottom"
-                android:gravity="center_horizontal|bottom"
-                android:layout_marginEnd="5dp" />
-
-            <TextView
-                android:id="@+id/sgv"
-                android:textSize="55sp"
-                android:text="---"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textColor="#FFFFFF"
-                android:layout_gravity="center_horizontal"
-                android:gravity="center_horizontal" />
-
-            <TextView
-                android:id="@+id/avgdelta"
-                android:textSize="40sp"
-                android:text="---"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textColor="#FFFFFF"
-                android:layout_gravity="bottom"
-                android:gravity="center_horizontal|bottom"
-                android:layout_marginStart="5dp" />
-
-        </LinearLayout>
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="-15dp"
+        android:gravity="center_horizontal"
+        android:orientation="horizontal"
+        android:textAlignment="center">
 
         <TextView
-            android:id="@+id/externaltstatus"
-            android:textSize="24sp"
-            android:text="E xU/h  IOB: x (x+x)"
-            android:layout_width="wrap_content"
-            android:textAlignment="center"
-            android:textColor="#FFFFFF"
-            android:layout_gravity="center_horizontal"
-            android:layout_height="wrap_content"/>
-
-        <LinearLayout
-            android:orientation="horizontal"
+            android:id="@+id/delta"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textAlignment="center"
-            android:gravity="center_horizontal|bottom">
+            android:layout_gravity="bottom"
+            android:layout_marginEnd="5dp"
+            android:gravity="center_horizontal|bottom"
+            android:text="---"
+            android:textColor="@color/white"
+            android:textSize="40sp"
+            tools:ignore="HardcodedText" />
 
-            <TextView
-                android:id="@+id/watch_time"
-                android:textSize="47sp"
-                android:text="12:00"
-                android:textColor="#FFFFFF"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textAlignment="center"
-                android:layout_marginEnd="6dp"
-                android:layout_gravity="center_horizontal" />
+        <TextView
+            android:id="@+id/sgv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:gravity="center_horizontal"
+            android:text="---"
+            android:textColor="@color/white"
+            android:textSize="55sp"
+            tools:ignore="HardcodedText" />
 
-            <TextView
-                android:id="@+id/timestamp"
-                android:textSize="35sp"
-                android:text="-- '"
-                android:layout_width="wrap_content"
-                android:textAlignment="center"
-                android:textColor="#FFFFFF"
-                android:layout_gravity="center_horizontal"
-                android:layout_height="wrap_content" />
-        </LinearLayout>
+        <TextView
+            android:id="@+id/avgdelta"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom"
+            android:layout_marginStart="5dp"
+            android:gravity="center_horizontal|bottom"
+            android:text="---"
+            android:textColor="@color/white"
+            android:textSize="40sp"
+            tools:ignore="HardcodedText" />
 
     </LinearLayout>
 
-</RelativeLayout>
+    <TextView
+        android:id="@+id/externaltstatus"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:textAlignment="center"
+        android:textColor="@color/white"
+        android:textSize="24sp"
+        tools:text="E xU/h  IOB: x (x+x)" />
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal|bottom"
+        android:orientation="horizontal"
+        android:textAlignment="center">
+
+        <TextView
+            android:id="@+id/watch_time"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginEnd="6dp"
+            android:textAlignment="center"
+            android:textColor="@color/white"
+            android:textSize="47sp"
+            tools:text="12:00" />
+
+        <TextView
+            android:id="@+id/timestamp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:text="-- '"
+            android:textAlignment="center"
+            android:textColor="@color/white"
+            android:textSize="35sp"
+            tools:ignore="HardcodedText" />
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/wear/src/main/res/layout-round/activity_nochart_small.xml b/wear/src/main/res/layout-round/activity_nochart_small.xml
index c8f82fad03..070d9baf38 100644
--- a/wear/src/main/res/layout-round/activity_nochart_small.xml
+++ b/wear/src/main/res/layout-round/activity_nochart_small.xml
@@ -1,116 +1,114 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout 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" tools:context=".watchfaces.AapsWatchface" tools:deviceIds="wear_square"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/main_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:background="@color/black"
-    android:id="@+id/main_layout">
+    android:gravity="center_vertical|center_horizontal"
+    android:orientation="vertical"
+    tools:context=".watchfaces.AapsWatchface"
+    tools:deviceIds="wear_square"
+    tools:ignore="MissingDefaultResource">
 
     <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center_vertical|center_horizontal"
-        android:orientation="vertical"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="-15dp"
+        android:layout_marginBottom="5dp"
+        android:gravity="center_horizontal"
+        android:orientation="horizontal"
+        android:paddingTop="5dp"
         android:textAlignment="center">
 
-        <LinearLayout
+        <TextView
+            android:id="@+id/delta"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="bottom"
+            android:layout_marginEnd="5dp"
+            android:layout_marginBottom="-15dp"
+            android:gravity="center_vertical|center_horizontal|center"
+            android:text="---"
+            android:textColor="@color/white"
+            android:textSize="22sp"
+            tools:ignore="HardcodedText" />
+
+        <TextView
+            android:id="@+id/sgv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:layout_marginTop="-5dp"
             android:gravity="center_horizontal"
-            android:orientation="horizontal"
-            android:paddingTop="5dp"
-            android:textAlignment="center">
-
-            <TextView
-                android:id="@+id/delta"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_gravity="bottom"
-                android:layout_marginEnd="5dp"
-                android:gravity="center_vertical|center_horizontal|center"
-                android:text="---"
-                android:textColor="#FFFFFF"
-                android:textSize="24sp" />
-
-            <TextView
-                android:id="@+id/sgv"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:gravity="center_horizontal"
-                android:text="---"
-                android:textColor="#FFFFFF"
-                android:textSize="45sp" />
-
-            <TextView
-                android:id="@+id/avgdelta"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginStart="5dp"
-                android:gravity="center_vertical|center_horizontal|center"
-                android:text=" ---"
-                android:textColor="#FFFFFF"
-                android:textSize="26sp" />
-
-        </LinearLayout>
-
-        <View
-            android:id="@+id/dummy1"
-            android:layout_width="match_parent"
-            android:layout_height="2dp"
-            android:layout_gravity="bottom"
-            android:gravity="center_horizontal" />
+            android:text="---"
+            android:textColor="@color/white"
+            android:textSize="42sp"
+            tools:ignore="HardcodedText" />
 
         <TextView
-            android:id="@+id/externaltstatus"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:gravity="center"
-            android:text="No Loop Status"
-            android:textAlignment="center"
-            android:textColor="#FFFFFF"
-            android:textSize="21sp" />
-
-        <View
-            android:id="@+id/dummy2"
-            android:layout_width="match_parent"
-            android:layout_height="2dp"
-            android:layout_gravity="bottom"
-            android:layout_weight="0"
-            android:gravity="center_horizontal" />
-
-        <LinearLayout
+            android:id="@+id/avgdelta"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center_horizontal|bottom"
-            android:orientation="horizontal"
-            android:textAlignment="center">
-
-            <TextView
-                android:id="@+id/watch_time"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginEnd="6dp"
-                android:text="23:24"
-                android:textAlignment="center"
-                android:textColor="#FFFFFF"
-                android:textSize="45sp" />
-
-            <TextView
-                android:id="@+id/timestamp"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical|center_horizontal"
-                android:text="--'"
-                android:textAlignment="center"
-                android:textColor="#FFFFFF"
-                android:textSize="24sp" />
-        </LinearLayout>
+            android:layout_height="match_parent"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginStart="5dp"
+            android:layout_marginBottom="-15dp"
+            android:gravity="center_vertical|center_horizontal|center"
+            android:text=" ---"
+            android:textColor="@color/white"
+            android:textSize="22sp"
+            tools:ignore="HardcodedText" />
 
     </LinearLayout>
 
-</RelativeLayout>
\ No newline at end of file
+    <View
+        android:id="@+id/dummy1"
+        android:layout_width="match_parent"
+        android:layout_height="2dp"
+        android:layout_gravity="bottom"
+        android:gravity="center_horizontal" />
+
+    <TextView
+        android:id="@+id/externaltstatus"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:paddingBottom="2dp"
+        android:text="@string/no_loop_status"
+        android:textAlignment="center"
+        android:textColor="@color/white"
+        android:textSize="21sp" />
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal|bottom"
+        android:orientation="horizontal"
+        android:textAlignment="center">
+
+        <TextView
+            android:id="@+id/watch_time"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginEnd="6dp"
+            android:textAlignment="center"
+            android:textColor="@color/white"
+            android:textSize="43sp"
+            tools:text="23:24" />
+
+        <TextView
+            android:id="@+id/timestamp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical|center_horizontal"
+            android:text="--'"
+            android:textAlignment="center"
+            android:textColor="@color/white"
+            android:textSize="24sp"
+            tools:ignore="HardcodedText" />
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/wear/src/main/res/layout-round/activity_steampunk.xml b/wear/src/main/res/layout-round/activity_steampunk.xml
index 78f9c52383..531bf99513 100644
--- a/wear/src/main/res/layout-round/activity_steampunk.xml
+++ b/wear/src/main/res/layout-round/activity_steampunk.xml
@@ -5,7 +5,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".watchfaces.SteampunkWatchface"
-    tools:deviceIds="wear_round">
+    tools:deviceIds="wear_round"
+    tools:ignore="MissingDefaultResource">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -18,6 +19,7 @@
             android:layout_height="match_parent"
             android:layout_gravity="center"
             android:gravity="center"
+            android:importantForAccessibility="no"
             android:src="@drawable/steampunk_dial_mgdl" />
 
     </LinearLayout>
@@ -57,13 +59,10 @@
             android:orientation="vertical"
             android:weightSum="1">
 
-            <LinearLayout
+            <View
                 android:layout_width="match_parent"
                 android:layout_height="0px"
-                android:layout_gravity="center"
-                android:layout_weight="0.05"
-                android:gravity="center"
-                android:orientation="horizontal" />
+                android:layout_weight="0.05" />
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -97,7 +96,7 @@
                         android:gravity="center"
                         android:paddingTop="7dp"
                         android:rotation="-28"
-                        android:text="--g"
+                        android:text="@string/no_cob_g"
                         android:textAlignment="center"
                         android:textColor="@color/black_86p"
                         android:textSize="13sp"
@@ -119,7 +118,7 @@
                         android:gravity="center"
                         android:paddingBottom="14dp"
                         android:rotation="0"
-                        android:text="-.--U/h"
+                        android:text="@string/no_tmp_basal_u_h"
                         android:textAlignment="center"
                         android:textColor="@color/black_86p"
                         android:textSize="13sp"
@@ -141,7 +140,7 @@
                         android:gravity="center"
                         android:paddingTop="6dp"
                         android:rotation="28"
-                        android:text="0.00U"
+                        android:text="@string/no_iob_u"
                         android:textAlignment="center"
                         android:textColor="@color/black_86p"
                         android:textSize="13sp"
@@ -170,11 +169,10 @@
             android:orientation="horizontal"
             android:weightSum="1">
 
-            <LinearLayout
+            <View
                 android:layout_width="0px"
                 android:layout_height="match_parent"
-                android:layout_weight="0.25"
-                android:orientation="horizontal" />
+                android:layout_weight="0.25" />
 
             <lecho.lib.hellocharts.view.LineChartView
                 android:id="@+id/chart"
@@ -182,7 +180,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="0.5" />
 
-            <LinearLayout
+            <View
                 android:layout_width="0px"
                 android:layout_height="match_parent"
                 android:layout_weight="0.25"
@@ -190,11 +188,10 @@
 
         </LinearLayout>
 
-        <LinearLayout
+        <View
             android:layout_width="match_parent"
             android:layout_height="0px"
-            android:layout_weight="0.03"
-            android:orientation="vertical" />
+            android:layout_weight="0.03" />
 
     </LinearLayout>
 
@@ -207,26 +204,25 @@
         android:orientation="vertical"
         android:weightSum="1">
 
-        <LinearLayout
+        <View
             android:layout_width="match_parent"
             android:layout_height="0px"
-            android:layout_weight="0.15"
-            android:orientation="horizontal" />
+            android:layout_weight="0.15" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="0px"
             android:layout_gravity="center"
             android:layout_weight="0.21"
+            android:baselineAligned="false"
             android:gravity="center"
             android:orientation="horizontal"
             android:weightSum="1">
 
-            <LinearLayout
+            <View
                 android:layout_width="0px"
                 android:layout_height="match_parent"
-                android:layout_weight="0.32"
-                android:orientation="horizontal" />
+                android:layout_weight="0.32" />
 
             <LinearLayout
                 android:layout_width="0px"
@@ -240,14 +236,16 @@
                     android:layout_height="match_parent"
                     android:layout_gravity="center"
                     android:gravity="center"
-                    android:paddingEnd="8dp"
+                    android:paddingStart="0dp"
                     android:paddingTop="8dp"
+                    android:paddingEnd="8dp"
                     android:rotation="-24"
                     android:text="-'"
                     android:textAlignment="center"
                     android:textColor="@color/black_86p"
                     android:textSize="12sp"
-                    android:textStyle="bold" />
+                    android:textStyle="bold"
+                    tools:ignore="HardcodedText" />
 
             </LinearLayout>
 
@@ -270,7 +268,8 @@
                     android:textColor="@color/black_86p"
                     android:textSize="12sp"
                     android:textStyle="bold"
-                    android:visibility="gone" />
+                    android:visibility="gone"
+                    tools:ignore="HardcodedText" />
 
                 <TextView
                     android:id="@+id/uploader_battery"
@@ -282,7 +281,8 @@
                     android:textAlignment="center"
                     android:textColor="@color/black_86p"
                     android:textSize="12sp"
-                    android:textStyle="bold" />
+                    android:textStyle="bold"
+                    tools:ignore="HardcodedText" />
 
             </LinearLayout>
 
@@ -300,28 +300,28 @@
                     android:gravity="center"
                     android:paddingStart="10dp"
                     android:paddingTop="8dp"
+                    android:paddingEnd="0dp"
                     android:rotation="24"
                     android:text="-'"
                     android:textAlignment="center"
                     android:textColor="@color/black_86p"
                     android:textSize="12sp"
-                    android:textStyle="bold" />
+                    android:textStyle="bold"
+                    tools:ignore="HardcodedText" />
 
             </LinearLayout>
 
-            <LinearLayout
+            <View
                 android:layout_width="0px"
                 android:layout_height="match_parent"
-                android:layout_weight="0.32"
-                android:orientation="horizontal" />
+                android:layout_weight="0.32" />
 
         </LinearLayout>
 
-        <LinearLayout
+        <View
             android:layout_width="match_parent"
             android:layout_height="0px"
-            android:layout_weight="0.64"
-            android:orientation="horizontal" />
+            android:layout_weight="0.64" />
 
     </LinearLayout>
 
@@ -330,8 +330,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@drawable/steampunk_cover_plate"
-        android:orientation="vertical">
-    </LinearLayout>
+        android:orientation="vertical" />
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -370,10 +369,10 @@
 
     </LinearLayout>
 
-    <TextView
+    <View
         android:id="@+id/AAPSv2"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:visibility="gone"/>
+        android:visibility="gone" />
 
 </RelativeLayout>
diff --git a/wear/src/main/res/layout-v26/list_item.xml b/wear/src/main/res/layout-v26/list_item.xml
index 7e5efb671f..2616da7efb 100644
--- a/wear/src/main/res/layout-v26/list_item.xml
+++ b/wear/src/main/res/layout-v26/list_item.xml
@@ -12,9 +12,9 @@
         android:layout_width="35dp"
         android:layout_height="35dp"
         android:layout_alignParentStart="true"
-        android:layout_alignParentLeft="true"
         android:layout_centerVertical="true"
         android:layout_marginStart="10dp"
+        android:importantForAccessibility="no"
         android:src="@drawable/circle" />
 
     <TextView
@@ -24,14 +24,13 @@
         android:layout_centerVertical="true"
         android:layout_marginStart="10dp"
         android:layout_toEndOf="@+id/menuItemIcon"
-        android:layout_toRightOf="@+id/menuItemIcon"
         android:autoSizeMaxTextSize="32sp"
         android:autoSizeMinTextSize="12sp"
         android:autoSizeStepGranularity="2sp"
         android:autoSizeTextType="uniform"
-        android:text="action item"
         android:textColor="@color/dark_statusView"
         android:textSize="20sp"
-        android:textStyle="bold" />
+        android:textStyle="bold"
+        tools:text="action item" />
 
 </RelativeLayout>
diff --git a/wear/src/main/res/layout/action_confirm_ok.xml b/wear/src/main/res/layout/action_confirm_ok.xml
index fd0d4c89b9..097dc75adb 100644
--- a/wear/src/main/res/layout/action_confirm_ok.xml
+++ b/wear/src/main/res/layout/action_confirm_ok.xml
@@ -1,26 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_gravity="center"
+    android:gravity="center">
 
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
+    <ImageView
+        android:id="@+id/confirmbutton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:gravity="center">
+        android:layout_margin="10sp"
+        android:background="@drawable/circle"
+        android:backgroundTint="@color/white"
+        android:contentDescription="@string/action_confirm"
+        android:padding="25sp"
+        android:src="@drawable/ic_confirm"
+        app:tint="@color/white" />
 
-        <ImageView
-            android:id="@+id/confirmbutton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:background="@drawable/circle"
-            android:backgroundTint="#ffffff"
-            android:src="@drawable/ic_confirm"
-            android:tint="#ffffff"
-            android:padding="25sp"
-            android:layout_margin="10sp"/>
-
-    </LinearLayout>
-</RelativeLayout>
+</LinearLayout>
diff --git a/wear/src/main/res/layout/action_confirm_text.xml b/wear/src/main/res/layout/action_confirm_text.xml
index 031d98d1e2..9fde2356c6 100644
--- a/wear/src/main/res/layout/action_confirm_text.xml
+++ b/wear/src/main/res/layout/action_confirm_text.xml
@@ -1,5 +1,6 @@
 <androidx.wear.widget.BoxInsetLayout 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">
 
@@ -11,18 +12,21 @@
 
         <androidx.core.widget.NestedScrollView
             android:id="@+id/message_scroll"
-            android:focusable="true"
-            android:focusableInTouchMode="true"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="match_parent"
+            android:focusable="true"
+            android:focusableInTouchMode="true">
+
             <TextView
                 android:id="@+id/message"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:text="message"
                 android:textAppearance="@style/TextAppearance.Wearable.Small"
-                android:textColor="@color/white" />
+                android:textColor="@color/white"
+                tools:text="message" />
+
         </androidx.core.widget.NestedScrollView>
 
     </FrameLayout>
-</androidx.wear.widget.BoxInsetLayout>
\ No newline at end of file
+
+</androidx.wear.widget.BoxInsetLayout>
diff --git a/wear/src/main/res/layout/action_editplusminus_item.xml b/wear/src/main/res/layout/action_editplusminus_item.xml
index be5b622dbe..c3cbe263ba 100644
--- a/wear/src/main/res/layout/action_editplusminus_item.xml
+++ b/wear/src/main/res/layout/action_editplusminus_item.xml
@@ -1,66 +1,68 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent">
+<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:layout_gravity="center"
+    android:gravity="center"
+    android:orientation="horizontal">
+
+    <ImageView
+        android:id="@+id/minusbutton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:background="@drawable/circle"
+        android:backgroundTint="@color/white"
+        android:contentDescription="@string/decrement"
+        android:src="@drawable/ic_action_minus"
+        android:tint="@color/white" />
 
     <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:gravity="center">
+        android:orientation="vertical">
 
-        <ImageView
-            android:id="@+id/minusbutton"
+        <EditText
+            android:id="@+id/amountfield"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:background="@drawable/circle"
-            android:backgroundTint="#ffffff"
-            android:src="@drawable/ic_action_minus"
-            android:tint="#ffffff" />
+            android:cursorVisible="false"
+            android:gravity="center_horizontal"
+            android:inputType="numberDecimal"
+            android:minWidth="50dp"
+            android:padding="10dp"
+            android:textColor="@color/white"
+            android:textSize="45sp"
+            tools:text="112" />
 
-        <LinearLayout
-            android:orientation="vertical"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center">
-
-            <EditText
-                android:id="@+id/amountfield"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:cursorVisible="false"
-                android:gravity="center_horizontal"
-                android:inputType="numberDecimal"
-                android:minWidth="50dp"
-                android:padding="10dp"
-                android:text="112"
-                android:textColor="@color/white"
-                android:textSize="45sp" />
-
-            <TextView
-                android:id="@+id/label"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:gravity="center"
-                android:text="label"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textColor="@color/white"
-                android:textSize="25sp" />
-        </LinearLayout>
-        <ImageView
-            android:id="@+id/plusbutton"
+        <TextView
+            android:id="@+id/label"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:background="@drawable/circle"
-            android:backgroundTint="#ffffff"
-            android:src="@drawable/ic_action_add"
-            android:tint="#ffffff" />
+            android:gravity="center"
+            android:labelFor="@+id/amountfield"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="@color/white"
+            android:textSize="25sp"
+            tools:ignore="LabelFor"
+            tools:text="label" />
 
     </LinearLayout>
 
-</RelativeLayout>
+    <ImageView
+        android:id="@+id/plusbutton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:background="@drawable/circle"
+        android:backgroundTint="@color/white"
+        android:contentDescription="@string/increment"
+        android:src="@drawable/ic_action_add"
+        android:tint="@color/white" />
+
+</LinearLayout>
+
diff --git a/wear/src/main/res/layout/action_editplusminus_item_quicklefty.xml b/wear/src/main/res/layout/action_editplusminus_item_quicklefty.xml
index 980677522c..bf3418ca2c 100644
--- a/wear/src/main/res/layout/action_editplusminus_item_quicklefty.xml
+++ b/wear/src/main/res/layout/action_editplusminus_item_quicklefty.xml
@@ -1,69 +1,68 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent">
+<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:layout_gravity="center"
+    android:gravity="center"
+    android:orientation="horizontal">
+
+    <ImageView
+        android:id="@+id/plusbutton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:background="@drawable/circle"
+        android:backgroundTint="@color/white"
+        android:contentDescription="@string/increment"
+        android:src="@drawable/ic_action_add"
+        android:tint="@color/white" />
 
     <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:gravity="center">
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <EditText
+            android:id="@+id/amountfield"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:cursorVisible="false"
+            android:gravity="center_horizontal"
+            android:inputType="numberDecimal"
+            android:minWidth="100dp"
+            android:paddingTop="10dp"
+            android:textColor="@color/white"
+            android:textSize="45sp"
+            tools:text="112" />
+
+        <TextView
+            android:id="@+id/label"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:labelFor="@+id/amountfield"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="@color/white"
+            android:textSize="25sp"
+            tools:ignore="LabelFor"
+            tools:text="label" />
 
         <ImageView
-            android:id="@+id/plusbutton"
+            android:id="@+id/minusbutton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:background="@drawable/circle"
-            android:backgroundTint="#ffffff"
-            android:src="@drawable/ic_action_add"
-            android:tint="#ffffff" />
-
-        <LinearLayout
-            android:orientation="vertical"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:gravity="center">
-
-            <EditText
-                android:id="@+id/amountfield"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:cursorVisible="false"
-                android:gravity="center_horizontal"
-                android:inputType="numberDecimal"
-                android:minWidth="100dp"
-                android:paddingTop="10dp"
-                android:text="112"
-                android:textColor="@color/white"
-                android:textSize="45sp" />
-
-            <TextView
-                android:id="@+id/label"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:gravity="center"
-                android:text="label"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textColor="@color/white"
-                android:textSize="25sp" />
-
-            <ImageView
-                android:id="@+id/minusbutton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:background="@drawable/circle"
-                android:backgroundTint="#ffffff"
-                android:src="@drawable/ic_action_minus"
-                android:tint="#ffffff" />
-
-        </LinearLayout>
+            android:backgroundTint="@color/white"
+            android:contentDescription="@string/decrement"
+            android:src="@drawable/ic_action_minus"
+            android:tint="@color/white" />
 
     </LinearLayout>
 
-</RelativeLayout>
+</LinearLayout>
diff --git a/wear/src/main/res/layout/action_editplusminus_item_quickrighty.xml b/wear/src/main/res/layout/action_editplusminus_item_quickrighty.xml
index a1b2107768..78c5d7e817 100644
--- a/wear/src/main/res/layout/action_editplusminus_item_quickrighty.xml
+++ b/wear/src/main/res/layout/action_editplusminus_item_quickrighty.xml
@@ -1,69 +1,68 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent">
+<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:layout_gravity="center"
+    android:gravity="center"
+    android:orientation="horizontal">
 
     <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:gravity="center">
+        android:gravity="center"
+        android:orientation="vertical">
 
-        <LinearLayout
-            android:orientation="vertical"
+        <EditText
+            android:id="@+id/amountfield"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:gravity="center">
+            android:cursorVisible="false"
+            android:gravity="center_horizontal"
+            android:inputType="numberDecimal"
+            android:minWidth="100dp"
+            android:paddingTop="10dp"
+            android:textColor="@color/white"
+            android:textSize="45sp"
+            tools:text="112" />
 
-            <EditText
-                android:id="@+id/amountfield"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:cursorVisible="false"
-                android:gravity="center_horizontal"
-                android:inputType="numberDecimal"
-                android:minWidth="100dp"
-                android:paddingTop="10dp"
-                android:text="112"
-                android:textColor="@color/white"
-                android:textSize="45sp" />
-
-            <TextView
-                android:id="@+id/label"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:gravity="center"
-                android:text="label"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textColor="@color/white"
-                android:textSize="25sp" />
-
-            <ImageView
-                android:id="@+id/minusbutton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:background="@drawable/circle"
-                android:backgroundTint="#ffffff"
-                android:src="@drawable/ic_action_minus"
-                android:tint="#ffffff" />
-
-        </LinearLayout>
+        <TextView
+            android:id="@+id/label"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:labelFor="@+id/amountfield"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="@color/white"
+            android:textSize="25sp"
+            tools:ignore="LabelFor"
+            tools:text="label" />
 
         <ImageView
-            android:id="@+id/plusbutton"
+            android:id="@+id/minusbutton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:background="@drawable/circle"
-            android:backgroundTint="#ffffff"
-            android:src="@drawable/ic_action_add"
-            android:tint="#ffffff" />
+            android:backgroundTint="@color/white"
+            android:contentDescription="@string/decrement"
+            android:src="@drawable/ic_action_minus"
+            android:tint="@color/white" />
 
     </LinearLayout>
 
-</RelativeLayout>
+    <ImageView
+        android:id="@+id/plusbutton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:background="@drawable/circle"
+        android:backgroundTint="@color/white"
+        android:contentDescription="@string/increment"
+        android:src="@drawable/ic_action_add"
+        android:tint="@color/white" />
+
+</LinearLayout>
diff --git a/wear/src/main/res/layout/action_editplusminus_item_viktoria.xml b/wear/src/main/res/layout/action_editplusminus_item_viktoria.xml
index 357fa7c4f2..0b396d8b7f 100644
--- a/wear/src/main/res/layout/action_editplusminus_item_viktoria.xml
+++ b/wear/src/main/res/layout/action_editplusminus_item_viktoria.xml
@@ -1,71 +1,67 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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="vertical">
+    android:orientation="horizontal">
+
+    <TextView
+        android:id="@+id/label"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_gravity="start|center_vertical"
+        android:gravity="center"
+        android:labelFor="@+id/amountfield"
+        android:rotation="90"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textColor="@color/white"
+        android:textSize="25sp"
+        tools:ignore="LabelFor"
+        tools:text="labelx" />
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="start|center_vertical|center_horizontal"
         android:orientation="vertical">
 
-        <LinearLayout
+        <ImageView
+            android:id="@+id/plusbutton"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical|center_horizontal"
+            android:backgroundTint="@color/white"
+            android:contentDescription="@string/increment"
+            android:src="@drawable/ic_action_add"
+            android:tint="@color/white" />
+
+        <EditText
+            android:id="@+id/amountfield"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="horizontal"
-            android:weightSum="1">
+            android:layout_gravity="center_vertical|center_horizontal"
+            android:background="@android:color/transparent"
+            android:cursorVisible="false"
+            android:gravity="center_vertical|center_horizontal"
+            android:inputType="numberDecimal"
+            android:minWidth="50dp"
+            android:padding="10dp"
+            android:textColor="@color/white"
+            android:textSize="45sp"
+            tools:text="112" />
 
-            <TextView
-                android:id="@+id/label"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_gravity="left|center_vertical"
-                android:gravity="center"
-                android:rotation="90"
-                android:text="labelx"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textColor="@color/white"
-                android:textSize="25sp" />
+        <ImageView
+            android:id="@+id/minusbutton"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical|center_horizontal"
+            android:backgroundTint="@color/white"
+            android:contentDescription="@string/decrement"
+            android:src="@drawable/ic_action_minus"
+            android:tint="@color/white" />
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="left|center_vertical|center_horizontal"
-                android:orientation="vertical">
-
-                <ImageView
-                    android:id="@+id/plusbutton"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical|center_horizontal"
-                    android:backgroundTint="#ffffff"
-                    android:src="@drawable/ic_action_add"
-                    android:tint="#ffffff" />
-
-                <EditText
-                    android:id="@+id/amountfield"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="center_vertical|center_horizontal"
-                    android:background="@android:color/transparent"
-                    android:cursorVisible="false"
-                    android:gravity="center_vertical|center_horizontal"
-                    android:inputType="numberDecimal"
-                    android:minWidth="50dp"
-                    android:padding="10dp"
-                    android:text="112"
-                    android:textColor="@color/white"
-                    android:textSize="45sp" />
-
-                <ImageView
-                    android:id="@+id/minusbutton"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical|center_horizontal"
-                    android:backgroundTint="#ffffff"
-                    android:src="@drawable/ic_action_minus"
-                    android:tint="#ffffff" />
-            </LinearLayout>
-        </LinearLayout>
     </LinearLayout>
-</RelativeLayout>
+
+</LinearLayout>
+
+
diff --git a/wear/src/main/res/layout/actions_list_activity.xml b/wear/src/main/res/layout/actions_list_activity.xml
index 45037c8337..4acdee7c25 100644
--- a/wear/src/main/res/layout/actions_list_activity.xml
+++ b/wear/src/main/res/layout/actions_list_activity.xml
@@ -1,9 +1,9 @@
 <FrameLayout 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">
 
-    <androidx.wear.widget.WearableRecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
+    <androidx.wear.widget.WearableRecyclerView
         android:id="@+id/action_list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -26,16 +26,17 @@
             android:autoSizeMinTextSize="12sp"
             android:autoSizeTextType="uniform"
             android:gravity="center"
-            android:text="Title"
-            android:textSize="18sp" />
+            android:textSize="18sp"
+            tools:text="Title" />
+
     </LinearLayout>
 
     <androidx.wear.widget.CurvedTextView
         android:id="@+id/title_curved"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="Title"
         android:textSize="18sp"
-        android:visibility="gone" />
+        android:visibility="gone"
+        tools:text="Title" />
 
 </FrameLayout>
diff --git a/wear/src/main/res/layout/activity_circle.xml b/wear/src/main/res/layout/activity_circle.xml
index 9837a8a2aa..57a9c6325a 100644
--- a/wear/src/main/res/layout/activity_circle.xml
+++ b/wear/src/main/res/layout/activity_circle.xml
@@ -1,53 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:orientation="vertical" android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center_vertical|center_horizontal"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentStart="true">
+<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:layout_alignParentStart="true"
+    android:layout_alignParentTop="true"
+    android:gravity="center_vertical|center_horizontal"
+    android:orientation="vertical">
 
-        <TextView android:id="@+id/agoString"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textSize="18sp"
-            android:layout_centerHorizontal="true"
-            android:layout_centerVertical="true"
-            android:text="99'"
-            android:layout_gravity="center"
-            android:layout_marginBottom="-5dp" />
-
-        <TextView android:id="@+id/sgvString"
+    <TextView
+        android:id="@+id/agoString"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginBottom="-5dp"
+        android:textSize="18sp"
+        tools:text="99'" />
+
+    <TextView
+        android:id="@+id/sgvString"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
         android:textSize="55sp"
-        android:layout_centerHorizontal="true"
-        android:layout_centerVertical="true"
-        android:text="999"
-        android:layout_gravity="center" />
+        tools:text="999" />
 
-        <TextView android:id="@+id/statusString"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textSize="18sp"
-            android:layout_centerHorizontal="true"
-            android:layout_centerVertical="true"
-            android:text="@string/activity_no_status"
-            android:layout_gravity="center"
-            android:layout_marginTop="-5dp" />
+    <TextView
+        android:id="@+id/statusString"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginTop="-5dp"
+        android:text="@string/activity_no_status"
+        android:textSize="18sp" />
 
-        <TextView android:id="@+id/deltaString"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textSize="18sp"
-            android:layout_centerHorizontal="true"
-            android:layout_centerVertical="true"
-            android:text="+99"
-            android:layout_gravity="center"
-            android:layout_marginTop="-5dp" />
+    <TextView
+        android:id="@+id/deltaString"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginTop="-5dp"
+        android:textSize="18sp"
+        tools:text="+99" />
 
-    </LinearLayout>
-
-</RelativeLayout>
+</LinearLayout>
diff --git a/wear/src/main/res/layout/grid_layout.xml b/wear/src/main/res/layout/grid_layout.xml
index 26f1e92a6a..51091b08c4 100644
--- a/wear/src/main/res/layout/grid_layout.xml
+++ b/wear/src/main/res/layout/grid_layout.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout 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"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:layout_height="match_parent">
 
     <androidx.wear.widget.CurvedTextView
         android:id="@+id/title_curved"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="Title"
         android:textSize="18sp"
-        android:visibility="gone" />
+        android:visibility="gone"
+        tools:text="Title" />
 
     <TextView
         android:id="@+id/title"
@@ -20,8 +21,8 @@
         android:autoSizeMinTextSize="12sp"
         android:autoSizeTextType="uniform"
         android:gravity="center"
-        android:text="Title"
-        android:textSize="18sp" />
+        android:textSize="18sp"
+        tools:text="Title" />
 
     <android.support.wearable.view.GridViewPager
         android:id="@+id/pager"
@@ -34,6 +35,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal|bottom"
-        app:dotFadeOutDelay="100000"/>
+        app:dotFadeOutDelay="100000" />
 
 </FrameLayout>
diff --git a/wear/src/main/res/layout/list_item.xml b/wear/src/main/res/layout/list_item.xml
index c5fd3b2433..2c5fbb2653 100644
--- a/wear/src/main/res/layout/list_item.xml
+++ b/wear/src/main/res/layout/list_item.xml
@@ -11,10 +11,9 @@
         android:id="@+id/menuItemIcon"
         android:layout_width="35dp"
         android:layout_height="35dp"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentLeft="true"
         android:layout_centerVertical="true"
         android:layout_marginStart="10dp"
+        android:importantForAccessibility="no"
         android:src="@drawable/circle" />
 
     <TextView
@@ -24,10 +23,9 @@
         android:layout_centerVertical="true"
         android:layout_marginStart="10dp"
         android:layout_toEndOf="@+id/menuItemIcon"
-        android:layout_toRightOf="@+id/menuItemIcon"
-        android:text="action item"
         android:textColor="@color/dark_statusView"
         android:textSize="20sp"
-        android:textStyle="bold" />
+        android:textStyle="bold"
+        tools:text="action item" />
 
 </RelativeLayout>
diff --git a/wear/src/main/res/values/strings.xml b/wear/src/main/res/values/strings.xml
index 1869913e37..d5331aa883 100644
--- a/wear/src/main/res/values/strings.xml
+++ b/wear/src/main/res/values/strings.xml
@@ -222,5 +222,21 @@
     <string name="key_dark" translatable="false">dark</string>
     <string name="key_input_design" translatable="false">input_design</string>
     <string name="key_complication_tap_action" translatable="false">complication_tap_action</string>
+    <string name="increment">increment</string>
+    <string name="decrement">decrement</string>
+    <string name="first_char_high">H</string>
+    <string name="first_char_low">L</string>
+    <string name="abbreviation_average">avg</string>
+    <string name="no_iob_u">--U</string>
+    <string name="no_cob_g">--g</string>
+    <string name="no_tmp_basal_u_h">-.--U/h</string>
+    <string name="uploader_na">Uploader: ---%</string>
+    <string name="no_status">S: no status</string>
+    <string name="time_stamp_na_min_ago">-- Minutes ago</string>
+    <string name="delta_na">--- mg/dl</string>
+    <string name="no_loop_status">No Loop Status</string>
+    <string name="cob_000g">000g</string>
+    <string name="svg_00_0">00,0</string>
+    <string name="iob_0_00u">0,00U</string>
 
 </resources>