diff --git a/app/src/main/res/drawable/ic_deployed_code.xml b/app/src/main/res/drawable/ic_deployed_code.xml
new file mode 100644
index 0000000000..05593b44f5
--- /dev/null
+++ b/app/src/main/res/drawable/ic_deployed_code.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M440,777L440,503L200,364L200,638Q200,638 200,638Q200,638 200,638L440,777ZM520,777L760,638Q760,638 760,638Q760,638 760,638L760,364L520,503L520,777ZM480,434L717,297L480,160Q480,160 480,160Q480,160 480,160L243,297L480,434ZM160,708Q141,697 130.5,679Q120,661 120,639L120,321Q120,299 130.5,281Q141,263 160,252L440,91Q459,80 480,80Q501,80 520,91L800,252Q819,263 829.5,281Q840,299 840,321L840,639Q840,661 829.5,679Q819,697 800,708L520,869Q501,880 480,880Q459,880 440,869L160,708ZM480,480Q480,480 480,480Q480,480 480,480L480,480Q480,480 480,480Q480,480 480,480L480,480Q480,480 480,480Q480,480 480,480L480,480Q480,480 480,480Q480,480 480,480L480,480Q480,480 480,480Q480,480 480,480L480,480Q480,480 480,480Q480,480 480,480Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_partly_cloudy_day.xml b/app/src/main/res/drawable/ic_partly_cloudy_day.xml
new file mode 100644
index 0000000000..0f62f0d9ea
--- /dev/null
+++ b/app/src/main/res/drawable/ic_partly_cloudy_day.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M440,200L440,40L520,40L520,200L440,200ZM706,310L650,254L763,140L819,197L706,310ZM760,520L760,440L920,440L920,520L760,520ZM763,819L650,706L706,650L820,762L763,819ZM254,310L141,197L198,140L310,254L254,310ZM240,760L420,760Q445,760 462.5,742.5Q480,725 480,700Q480,675 463,657.5Q446,640 421,640L370,640L350,592Q336,559 306,539.5Q276,520 240,520Q190,520 155,555Q120,590 120,640Q120,690 155,725Q190,760 240,760ZM240,840Q157,840 98.5,781.5Q40,723 40,640Q40,557 98.5,498.5Q157,440 240,440Q300,440 349.5,472.5Q399,505 423,560L423,560L423,560Q481,560 520.5,603Q560,646 560,706Q558,763 517.5,801.5Q477,840 420,840L240,840ZM560,706Q555,686 550,667Q545,648 540,628Q585,609 612.5,569Q640,529 640,480Q640,414 593,367Q546,320 480,320Q420,320 375,359Q330,398 322,458Q302,453 281,449Q260,445 240,440Q254,352 322.5,296Q391,240 480,240Q580,240 650,310Q720,380 720,480Q720,557 676,618.5Q632,680 560,706ZM481,480Q481,480 481,480Q481,480 481,480Q481,480 481,480Q481,480 481,480Q481,480 481,480Q481,480 481,480Q481,480 481,480Q481,480 481,480Q481,480 481,480Q481,480 481,480Z"/>
+</vector>
diff --git a/app/src/main/res/xml/devicesettings_ble_api.xml b/app/src/main/res/xml/devicesettings_ble_api.xml
index a9f68821bf..b81527d85e 100644
--- a/app/src/main/res/xml/devicesettings_ble_api.xml
+++ b/app/src/main/res/xml/devicesettings_ble_api.xml
@@ -25,6 +25,7 @@
         android:summary="@string/prefs_summary_gatt_client_filter_char" />
 
     <EditTextPreference
+        android:icon="@drawable/ic_deployed_code"
         android:key="prefs_device_ble_api_package"
         android:title="@string/prefs_title_gatt_client_api_package"
         android:summary="@string/prefs_summary_gatt_client_api_package" />
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 46894cb3ea..7f3d25584c 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -335,7 +335,7 @@
         </PreferenceScreen>
 
         <Preference
-            android:icon="@drawable/ic_navigation"
+            android:icon="@drawable/ic_deployed_code"
             android:key="pref_key_opentracks_packagename"
             android:summary="@string/pref_summary_opentracks_packagename"
             android:title="@string/pref_title_opentracks_packagename" />
@@ -346,7 +346,7 @@
             android:title="@string/sleepasandroid_settings" />
 
         <PreferenceScreen
-            android:icon="@drawable/ic_wb_sunny"
+            android:icon="@drawable/ic_partly_cloudy_day"
             android:key="pref_screen_weather"
             android:summary="@string/pref_title_weather_summary"
             android:title="@string/pref_title_weather">