diff --git a/res/values/custom_strings.xml b/res/values/custom_strings.xml
index 06c34fd..8f79b98 100644
--- a/res/values/custom_strings.xml
+++ b/res/values/custom_strings.xml
@@ -317,11 +317,12 @@
 
     <string name="weather_title">Weather</string>
     <string name="weather_config_title">Weather service</string>
-    <string name="weather_config_summary"></string>
+    <string name="weather_config_summary">System service settings</string>
     <string name="header_weather_title">Header view weather</string>
     <string name="header_weather_summary">Enable notification panel header weather display</string>
     <string name="weather_icon_pack_title">Condition icon pack</string>
     <string name="weather_icon_pack_note">Note\u003a you can install new icon packs from play store by searching for \"Chronus icons\"</string>
+    <string name="weather_icon_pack_info_title">Condition icon pack is used in quick settings and lock screen</string>
 
     <!-- Navigationbar settings -->
     <string name="navigationbar_title">Navigation bar</string>
@@ -757,4 +758,7 @@
     <string name="hide_lockscreen_indicator_display_summary">Hide charging information and unlock hints</string>
     <string name="hide_lockscreen_icon_title">Hide lock screen icon</string>
     <string name="hide_lockscreen_icon_summary">Change the lock screen icon visibility</string>
+    <string name="lockscreen_weather_title">Show weather condition</string>
+    <string name="lockscreen_weather_summary">Show current weather condition and temperature</string>
+    <string name="lockscreen_items_aod_info_title">This visibility configuration also applies to the ambient display</string>
 </resources>
diff --git a/res/xml/lockscreenitems.xml b/res/xml/lockscreenitems.xml
index fc43787..395c698 100644
--- a/res/xml/lockscreenitems.xml
+++ b/res/xml/lockscreenitems.xml
@@ -56,5 +56,15 @@
         android:summary="@string/hide_lockscreen_icon_summary"
         android:defaultValue="false" />
 
+    <org.omnirom.omnigears.preference.SystemSettingSwitchPreference
+        android:key="lockscreen_weather"
+        android:title="@string/lockscreen_weather_title"
+        android:summary="@string/lockscreen_weather_summary"
+        android:defaultValue="false" />
+
+    <Preference
+        android:icon="@drawable/ic_info_outline_24dp"
+        android:persistent="false"
+        android:summary="@string/lockscreen_items_aod_info_title" />
 </PreferenceScreen>
 
diff --git a/res/xml/omni_dashboard_fragment.xml b/res/xml/omni_dashboard_fragment.xml
index 8a54d4b..8e8b310 100644
--- a/res/xml/omni_dashboard_fragment.xml
+++ b/res/xml/omni_dashboard_fragment.xml
@@ -68,7 +68,7 @@
         android:icon="@drawable/ic_settings_event_service"
         android:fragment="org.omnirom.omnigears.service.EventServiceSettings" />
 
-    <Preference
+    <!--<Preference
         android:key="weather_service_settings"
         android:icon="@drawable/ic_qs_weather_default_on"
         android:title="@string/weather_config_title"
@@ -76,7 +76,13 @@
         <intent android:action="android.intent.action.MAIN"
                 android:targetPackage="org.omnirom.omnijaws"
                 android:targetClass="org.omnirom.omnijaws.SettingsActivityService" />
-    </Preference>
+    </Preference>-->
+
+    <Preference
+        android:key="omnijaws_settings"
+        android:icon="@drawable/ic_qs_weather_default_on"
+        android:title="@string/weather_title"
+        android:fragment="org.omnirom.omnigears.moresettings.OmniJawsSettings" />
 
     <Preference
         android:key="more_settings"
diff --git a/res/xml/omnijaws_settings.xml b/res/xml/omnijaws_settings.xml
index 20017b7..2c24a0f 100644
--- a/res/xml/omnijaws_settings.xml
+++ b/res/xml/omnijaws_settings.xml
@@ -21,7 +21,6 @@
 
         <PreferenceScreen
             android:title="@string/weather_config_title"
-            android:icon="@drawable/ic_qs_weather_default_on"
             android:summary="@string/weather_config_summary" >
             <intent android:action="android.intent.action.MAIN"
                     android:targetPackage="org.omnirom.omnijaws"
@@ -32,4 +31,9 @@
             android:key="weather_icon_pack"
             android:title="@string/weather_icon_pack_title"
             android:persistent="false" />
+
+        <Preference
+            android:icon="@drawable/ic_info_outline_24dp"
+            android:persistent="false"
+            android:summary="@string/weather_icon_pack_info_title" />
 </PreferenceScreen>