diff --git a/app/src/main/res/drawable-hdpi/ic_device_watchxplus.png b/app/src/main/res/drawable-hdpi/ic_device_watchxplus.png
new file mode 100644
index 000000000..749155a19
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_device_watchxplus.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_device_watchxplus_disabled.png b/app/src/main/res/drawable-hdpi/ic_device_watchxplus_disabled.png
new file mode 100644
index 000000000..212cb44d5
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_device_watchxplus_disabled.png differ
diff --git a/app/src/main/res/layout/activity_watchxplus_calibration.xml b/app/src/main/res/layout/activity_watchxplus_calibration.xml
new file mode 100644
index 000000000..dc5efc52f
--- /dev/null
+++ b/app/src/main/res/layout/activity_watchxplus_calibration.xml
@@ -0,0 +1,124 @@
+<?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">
+
+    <TextView
+        android:id="@+id/tv_note"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentTop="true"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:text="@string/discovery_note"
+        android:textColor="@color/accent"
+        android:textStyle="bold" />
+
+    <TextView
+        android:id="@+id/tv_hint"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignStart="@+id/tv_note"
+        android:layout_below="@+id/tv_note"
+        android:layout_marginTop="16dp"
+        android:text="@string/watch9_calibration_hint" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_above="@id/watch9_bt_calibrate"
+        android:layout_below="@id/tv_hint"
+        android:orientation="horizontal"
+        android:paddingLeft="8dp"
+        android:paddingRight="8dp"
+        android:baselineAligned="false">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginLeft="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_weight="1"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/watch9_time_hours"
+                android:textAllCaps="true"
+                android:textColor="@color/accent" />
+
+            <NumberPicker
+                android:id="@+id/np_hour"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:descendantFocusability="blocksDescendants"  />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginLeft="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_weight="1"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/watch9_time_minutes"
+                android:textAllCaps="true"
+                android:textColor="@color/accent" />
+
+            <NumberPicker
+                android:id="@+id/np_minute"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:descendantFocusability="blocksDescendants"  />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginLeft="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_weight="1"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/watch9_time_seconds"
+                android:textAllCaps="true"
+                android:textColor="@color/accent" />
+
+            <NumberPicker
+                android:id="@+id/np_second"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:descendantFocusability="blocksDescendants"  />
+        </LinearLayout>
+
+
+
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/watch9_bt_calibrate"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="16dp"
+        android:padding="16dp"
+        android:text="@string/watch9_calibration_button" />
+
+</RelativeLayout>
\ No newline at end of file