diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Wear/wearintegration/WatchUpdaterService.java b/app/src/main/java/info/nightscout/androidaps/plugins/Wear/wearintegration/WatchUpdaterService.java
index f835df7171..b9d42a72f1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Wear/wearintegration/WatchUpdaterService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Wear/wearintegration/WatchUpdaterService.java
@@ -276,6 +276,7 @@ public class WatchUpdaterService extends WearableListenerService implements
 
         NSProfile profile = MainApp.getConfigBuilder().getActiveProfile().getProfile();
 
+        if( profile == null) return;
 
         long beginBasalSegmentTime = startTimeWindow;
         long runningTime = startTimeWindow;
diff --git a/wear/build.gradle b/wear/build.gradle
index 26fc3e0e72..3906ab934a 100644
--- a/wear/build.gradle
+++ b/wear/build.gradle
@@ -52,4 +52,5 @@ dependencies {
     compile files('libs/hellocharts-library-1.5.5.jar')
     compile(name:'ustwo-clockwise-debug', ext:'aar')
     compile 'com.android.support:support-v4:23.0.1'
+    compile 'me.denley.wearpreferenceactivity:wearpreferenceactivity:0.5.0'
 }
diff --git a/wear/src/main/java/info/nightscout/androidaps/NWPreferences.java b/wear/src/main/java/info/nightscout/androidaps/NWPreferences.java
index 7a2ce9bb6c..a6e23c23cd 100644
--- a/wear/src/main/java/info/nightscout/androidaps/NWPreferences.java
+++ b/wear/src/main/java/info/nightscout/androidaps/NWPreferences.java
@@ -5,8 +5,9 @@ import android.os.Bundle;
 import android.preference.PreferenceActivity;
 
 import info.nightscout.androidaps.R;
+import preference.WearPreferenceActivity;
 
-public class NWPreferences extends PreferenceActivity {
+public class NWPreferences extends WearPreferenceActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
diff --git a/wear/src/main/res/drawable-hdpi/settings_off.png b/wear/src/main/res/drawable-hdpi/settings_off.png
new file mode 100644
index 0000000000..ab7e4249a7
Binary files /dev/null and b/wear/src/main/res/drawable-hdpi/settings_off.png differ
diff --git a/wear/src/main/res/drawable-hdpi/settings_on.png b/wear/src/main/res/drawable-hdpi/settings_on.png
new file mode 100644
index 0000000000..d22797b946
Binary files /dev/null and b/wear/src/main/res/drawable-hdpi/settings_on.png differ
diff --git a/wear/src/main/res/drawable-mdpi/settings_off.png b/wear/src/main/res/drawable-mdpi/settings_off.png
new file mode 100644
index 0000000000..8ead2a2c50
Binary files /dev/null and b/wear/src/main/res/drawable-mdpi/settings_off.png differ
diff --git a/wear/src/main/res/drawable-mdpi/settings_on.png b/wear/src/main/res/drawable-mdpi/settings_on.png
new file mode 100644
index 0000000000..b113766ec4
Binary files /dev/null and b/wear/src/main/res/drawable-mdpi/settings_on.png differ
diff --git a/wear/src/main/res/drawable-xhdpi/settings_off.png b/wear/src/main/res/drawable-xhdpi/settings_off.png
new file mode 100644
index 0000000000..271ac298d7
Binary files /dev/null and b/wear/src/main/res/drawable-xhdpi/settings_off.png differ
diff --git a/wear/src/main/res/drawable-xhdpi/settings_on.png b/wear/src/main/res/drawable-xhdpi/settings_on.png
new file mode 100644
index 0000000000..db90aa602c
Binary files /dev/null and b/wear/src/main/res/drawable-xhdpi/settings_on.png differ
diff --git a/wear/src/main/res/drawable-xxhdpi/settings_off.png b/wear/src/main/res/drawable-xxhdpi/settings_off.png
new file mode 100644
index 0000000000..7776112fef
Binary files /dev/null and b/wear/src/main/res/drawable-xxhdpi/settings_off.png differ
diff --git a/wear/src/main/res/drawable-xxhdpi/settings_on.png b/wear/src/main/res/drawable-xxhdpi/settings_on.png
new file mode 100644
index 0000000000..6088091eae
Binary files /dev/null and b/wear/src/main/res/drawable-xxhdpi/settings_on.png differ
diff --git a/wear/src/main/res/xml/preferences.xml b/wear/src/main/res/xml/preferences.xml
index eb59d8a4e4..97f8bb4027 100644
--- a/wear/src/main/res/xml/preferences.xml
+++ b/wear/src/main/res/xml/preferences.xml
@@ -1,73 +1,99 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <PreferenceCategory
-        android:title="@string/app_settings"
-        android:key="category"
-        android:selectable="false">
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <CheckBoxPreference
+        android:defaultValue="true"
+        android:key="showExternalStatus"
+        android:title="Show Loop Status"
+        app:wear_iconOff="@drawable/settings_off"
+        app:wear_iconOn="@drawable/settings_on" />
 
-        <CheckBoxPreference android:title="Show Loop Status"
-            android:defaultValue="true"
-            android:summary="Show Loop Staus (Temps and IOB)."
-            android:key="showExternalStatus" />
+    <CheckBoxPreference
+        android:defaultValue="false"
+        android:key="highlight_basals"
+        android:summary="Better visible basal rate and temp basals"
+        android:title="Highlight Basals"
+        app:wear_iconOff="@drawable/settings_off"
+        app:wear_iconOn="@drawable/settings_on"/>
 
-        <ListPreference
-            android:key="chart_timeframe"
-            android:title="Chart Timeframe"
-            android:summary="Chart Timeframe"
-            android:entries="@array/chart_timeframe"
-            android:entryValues="@array/chart_timeframe_values"
-            android:defaultValue="3" />
+    <CheckBoxPreference
+        android:defaultValue="true"
+        android:key="showAvgDelta"
+        android:summary="Show the avgDelta."
+        android:title="Show AvgDelta"
+        app:wear_iconOff="@drawable/settings_off"
+        app:wear_iconOn="@drawable/settings_on"/>
 
-        <CheckBoxPreference android:title="Highlight Basals"
-            android:defaultValue="false"
-            android:summary="Better visible basal rate and temp basals"
-            android:key="highlight_basals" />
+    <CheckBoxPreference
+        android:defaultValue="true"
+        android:key="dark"
+        android:summary="Dark theme"
+        android:title="Dark"
+        app:wear_iconOff="@drawable/settings_off"
+        app:wear_iconOn="@drawable/settings_on"/>
 
-        <CheckBoxPreference android:title="Show AvgDelta"
-            android:defaultValue="true"
-            android:summary="Show the avgDelta."
-            android:key="showAvgDelta" />
+    <ListPreference
+        android:defaultValue="3"
+        android:entries="@array/chart_timeframe"
+        android:entryValues="@array/chart_timeframe_values"
+        android:key="chart_timeframe"
+        android:summary="Chart Timeframe"
+        android:title="Chart Timeframe" />
 
-        <CheckBoxPreference android:title="Dark"
-            android:defaultValue="true"
-            android:summary="Dark theme"
-            android:key="dark" />
+    <CheckBoxPreference
+        android:defaultValue="true"
+        android:key="showAgo"
+        android:summary="Minutes since last reading. (Circle WF)"
+        android:title="Show Ago"
+        app:wear_iconOff="@drawable/settings_off"
+        app:wear_iconOn="@drawable/settings_on"/>
 
-        <CheckBoxPreference android:title="Show Ago"
-            android:defaultValue="true"
-            android:summary="Minutes since last reading. (Circle WF)"
-            android:key="showAgo" />
+    <CheckBoxPreference
+        android:defaultValue="true"
+        android:key="showDelta"
+        android:summary="Show delta. (Circle WF)"
+        android:title="Show Delta"
+        app:wear_iconOff="@drawable/settings_off"
+        app:wear_iconOn="@drawable/settings_on"/>
 
-        <CheckBoxPreference android:title="Show Delta"
-            android:defaultValue="true"
-            android:summary="Show delta. (Circle WF)"
-            android:key="showDelta" />
+    <CheckBoxPreference
+        android:defaultValue="true"
+        android:key="showBG"
+        android:summary="Show BG. (Circle WF)"
+        android:title="Show BG"
+        app:wear_iconOff="@drawable/settings_off"
+        app:wear_iconOn="@drawable/settings_on"/>
 
-        <CheckBoxPreference android:title="Show BG"
-            android:defaultValue="true"
-            android:summary="Show BG. (Circle WF)"
-            android:key="showBG" />
+    <CheckBoxPreference
+        android:defaultValue="false"
+        android:key="showBigNumbers"
+        android:summary="Big numbers. (Circle WF)"
+        android:title="Big Numbers"
+        app:wear_iconOff="@drawable/settings_off"
+        app:wear_iconOn="@drawable/settings_on"/>
 
-        <CheckBoxPreference android:title="Show Big Numbers"
-            android:defaultValue="false"
-            android:summary="Big numbers. (Circle WF)"
-            android:key="showBigNumbers" />
+    <CheckBoxPreference
+        android:defaultValue="false"
+        android:key="showRingHistory"
+        android:summary="Graphical history. (Circle WF)"
+        android:title="Ring History"
+        app:wear_iconOff="@drawable/settings_off"
+        app:wear_iconOn="@drawable/settings_on" />
 
-        <CheckBoxPreference android:title="Show Ring History"
-            android:defaultValue="false"
-            android:summary="Graphical history. (Circle WF)"
-            android:key="showRingHistory" />
-
-        <CheckBoxPreference android:title="Light Ring History"
-            android:defaultValue="true"
-            android:summary="Less eyecandy. (Circle WF)"
-            android:key="softRingHistory" />
+    <CheckBoxPreference
+        android:defaultValue="true"
+        android:key="softRingHistory"
+        android:summary="Less eyecandy. (Circle WF)"
+        android:title="Light Ring History"
+        app:wear_iconOff="@drawable/settings_off"
+        app:wear_iconOn="@drawable/settings_on"/>
 
 
-        <CheckBoxPreference android:title="Show Animations"
-            android:defaultValue="true"
-            android:summary="Animations. (Circle WF)"
-            android:key="animation" />
-
-    </PreferenceCategory>
+    <CheckBoxPreference
+        android:defaultValue="true"
+        android:key="animation"
+        android:summary="Animations. (Circle WF)"
+        android:title="Animations"
+        app:wear_iconOff="@drawable/settings_off"
+        app:wear_iconOn="@drawable/settings_on"/>
 </PreferenceScreen>
diff --git a/wear/wear.iml b/wear/wear.iml
index dfd9e96a36..33cd39a6c1 100644
--- a/wear/wear.iml
+++ b/wear/wear.iml
@@ -43,6 +43,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/fullDebug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/fullDebug/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/fullDebug/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/full/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/full/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/full/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/full/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/full/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/full/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/full/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testFullDebug/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testFullDebug/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testFullDebug/assets" type="java-test-resource" />
@@ -51,13 +58,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/testFullDebug/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testFullDebug/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testFullDebug/shaders" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/full/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/full/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/full/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/full/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/full/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/full/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/full/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/full/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/full/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/full/assets" type="java-resource" />
@@ -131,6 +131,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-base/7.3.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-wearable/7.3.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.support/wearable/1.4.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/me.denley.wearpreferenceactivity/wearpreferenceactivity/0.5.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/ustwo-clockwise-debug/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
@@ -151,6 +152,7 @@
     <orderEntry type="library" exported="" name="ustwo-clockwise-debug-" level="project" />
     <orderEntry type="library" exported="" name="hellocharts-library-1.5.5" level="project" />
     <orderEntry type="library" exported="" name="play-services-wearable-7.3.0" level="project" />
+    <orderEntry type="library" exported="" name="wearpreferenceactivity-0.5.0" level="project" />
     <orderEntry type="library" exported="" name="wearable-1.4.0" level="project" />
     <orderEntry type="library" exported="" name="support-v4-23.0.1" level="project" />
     <orderEntry type="library" exported="" name="play-services-base-7.3.0" level="project" />