diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/MyWeather.java b/app/src/main/java/de/apps4ics/mountainnavigation/MyWeather.java
index 522c564..fcffc2f 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/MyWeather.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/MyWeather.java
@@ -164,6 +164,10 @@
                 getWeatherCode() == WeatherCode.SLEET.getCode();
     }
 
+    /**
+     * Gets a proper icon for the current weather code, adapted from http://openweathermap.org/weather-conditions
+     * @return int resource id of the drawable
+     */
     public int getWeatherCodeStringId() {
         switch(getWeatherCode()) {
             case 200:
@@ -173,13 +177,13 @@
             case 202:
                 return R.drawable.ic_chance_of_storm_96;
             case 210:
-                return R.drawable.ic_chance_of_storm_96;
+                return R.drawable.ic_storm_96;
             case 211:
-                return R.drawable.ic_chance_of_storm_96;
+                return R.drawable.ic_storm_96;
             case 212:
-                return R.drawable.ic_chance_of_storm_96;
+                return R.drawable.ic_storm_96;
             case 221:
-                return R.drawable.ic_chance_of_storm_96;
+                return R.drawable.ic_storm_96;
             case 230:
                 return R.drawable.ic_chance_of_storm_96;
             case 231:
@@ -191,59 +195,59 @@
             case 301:
                 return R.drawable.ic_light_rain_96;
             case 302:
-                return R.drawable.ic_light_rain_96;
+                return R.drawable.ic_moderate_rain_96;
             case 310:
                 return R.drawable.ic_light_rain_96;
             case 311:
                 return R.drawable.ic_light_rain_96;
             case 312:
-                return R.drawable.ic_light_rain_96;
+                return R.drawable.ic_moderate_rain_96;
             case 313:
-                return R.drawable.ic_light_rain_96;
+                return R.drawable.ic_moderate_rain_96;
             case 314:
-                return R.drawable.ic_light_rain_96;
+                return R.drawable.ic_heavy_rain_96;
             case 321:
                 return R.drawable.ic_light_rain_96;
             case 500:
-                return R.drawable.ic_partly_cloudy_rain_96;
+                return R.drawable.ic_light_rain_96;
             case 501:
-                return R.drawable.ic_partly_cloudy_rain_96;
+                return R.drawable.ic_moderate_rain_96;
             case 502:
-                return R.drawable.ic_partly_cloudy_rain_96;
+                return R.drawable.ic_heavy_rain_96;
             case 503:
-                return R.drawable.ic_partly_cloudy_rain_96;
+                return R.drawable.ic_intense_rain_96;
             case 504:
-                return R.drawable.ic_partly_cloudy_rain_96;
+                return R.drawable.ic_torrential_rain_96;
             case 511:
                 return R.drawable.ic_snow_96;
             case 520:
                 return R.drawable.ic_light_rain_96;
             case 521:
-                return R.drawable.ic_light_rain_96;
+                return R.drawable.ic_moderate_rain_96;
             case 522:
-                return R.drawable.ic_light_rain_96;
+                return R.drawable.ic_intense_rain_96;
             case 531:
-                return R.drawable.ic_light_rain_96;
+                return R.drawable.ic_intense_rain_96;
             case 600:
                 return R.drawable.ic_snow_96;
             case 601:
                 return R.drawable.ic_snow_96;
             case 602:
-                return R.drawable.ic_snow_96;
+                return R.drawable.ic_snow_storm_96;
             case 611:
-                return R.drawable.ic_snow_96;
+                return R.drawable.ic_sleet_96;
             case 612:
-                return R.drawable.ic_snow_96;
+                return R.drawable.ic_sleet_96;
             case 615:
-                return R.drawable.ic_snow_96;
+                return R.drawable.ic_sleet_96;
             case 616:
-                return R.drawable.ic_snow_96;
+                return R.drawable.ic_sleet_96;
             case 620:
                 return R.drawable.ic_snow_96;
             case 621:
                 return R.drawable.ic_snow_96;
             case 622:
-                return R.drawable.ic_snow_96;
+                return R.drawable.ic_snow_storm_96;
             case 701:
                 if(isAfterSunset()) return R.drawable.ic_fog_night_96;
                 else return R.drawable.ic_fog_day_96;
@@ -289,6 +293,20 @@
             case 804:
                 if(isAfterSunset()) return R.drawable.ic_clouds_96;
                 else return R.drawable.ic_clouds_96;
+            case 900:
+                return R.drawable.ic_tornado_96;
+            case 901:
+                return R.drawable.ic_tornado_96;
+            case 902:
+                return R.drawable.ic_tornado_96;
+            case 903:
+                return R.drawable.ic_cold_96;
+            case 904:
+                return R.drawable.ic_hot_96;
+            case 905:
+                return R.drawable.ic_windsock_96;
+            case 906:
+                return R.drawable.ic_hail_96;
             default:
                 return R.drawable.ic_clouds_96;
         }
diff --git a/app/src/main/res/drawable-hdpi/ic_cold_96.png b/app/src/main/res/drawable-hdpi/ic_cold_96.png
new file mode 100644
index 0000000..d69a10b
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_cold_96.png
Binary files differ
diff --git a/app/src/main/res/drawable-hdpi/ic_hot_96.png b/app/src/main/res/drawable-hdpi/ic_hot_96.png
new file mode 100644
index 0000000..d5111b5
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_hot_96.png
Binary files differ
diff --git a/app/src/main/res/drawable-hdpi/ic_snow_storm_96.png b/app/src/main/res/drawable-hdpi/ic_snow_storm_96.png
new file mode 100644
index 0000000..fdd85cf
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_snow_storm_96.png
Binary files differ
diff --git a/app/src/main/res/drawable-hdpi/ic_tornado_96.png b/app/src/main/res/drawable-hdpi/ic_tornado_96.png
new file mode 100644
index 0000000..2e0fdc2
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_tornado_96.png
Binary files differ
diff --git a/app/src/main/res/drawable-hdpi/ic_windsock_96.png b/app/src/main/res/drawable-hdpi/ic_windsock_96.png
new file mode 100644
index 0000000..4bf0e8d
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_windsock_96.png
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/ic_cold_96.png b/app/src/main/res/drawable-mdpi/ic_cold_96.png
new file mode 100644
index 0000000..b9cf367
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_cold_96.png
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/ic_hot_96.png b/app/src/main/res/drawable-mdpi/ic_hot_96.png
new file mode 100644
index 0000000..8ede8e5
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_hot_96.png
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/ic_snow_storm_96.png b/app/src/main/res/drawable-mdpi/ic_snow_storm_96.png
new file mode 100644
index 0000000..37a483a
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_snow_storm_96.png
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/ic_tornado_96.png b/app/src/main/res/drawable-mdpi/ic_tornado_96.png
new file mode 100644
index 0000000..2f81343
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_tornado_96.png
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/ic_windsock_96.png b/app/src/main/res/drawable-mdpi/ic_windsock_96.png
new file mode 100644
index 0000000..abce502
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_windsock_96.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_cold_96.png b/app/src/main/res/drawable-xhdpi/ic_cold_96.png
new file mode 100644
index 0000000..bfc34fe
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_cold_96.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_hot_96.png b/app/src/main/res/drawable-xhdpi/ic_hot_96.png
new file mode 100644
index 0000000..146f505
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_hot_96.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_snow_storm_96.png b/app/src/main/res/drawable-xhdpi/ic_snow_storm_96.png
new file mode 100644
index 0000000..4f7a5dc
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_snow_storm_96.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_tornado_96.png b/app/src/main/res/drawable-xhdpi/ic_tornado_96.png
new file mode 100644
index 0000000..dd3fab7
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_tornado_96.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_windsock_96.png b/app/src/main/res/drawable-xhdpi/ic_windsock_96.png
new file mode 100644
index 0000000..16f90c9
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_windsock_96.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_cold_96.png b/app/src/main/res/drawable-xxhdpi/ic_cold_96.png
new file mode 100644
index 0000000..b6340b5
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_cold_96.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_hot_96.png b/app/src/main/res/drawable-xxhdpi/ic_hot_96.png
new file mode 100644
index 0000000..44dda26
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_hot_96.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_snow_storm_96.png b/app/src/main/res/drawable-xxhdpi/ic_snow_storm_96.png
new file mode 100644
index 0000000..6ccad03
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_snow_storm_96.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_tornado_96.png b/app/src/main/res/drawable-xxhdpi/ic_tornado_96.png
new file mode 100644
index 0000000..6435baf
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_tornado_96.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_windsock_96.png b/app/src/main/res/drawable-xxhdpi/ic_windsock_96.png
new file mode 100644
index 0000000..a4be4b5
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_windsock_96.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_cold_96.png b/app/src/main/res/drawable-xxxhdpi/ic_cold_96.png
new file mode 100644
index 0000000..dc7386c
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_cold_96.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_hot_96.png b/app/src/main/res/drawable-xxxhdpi/ic_hot_96.png
new file mode 100644
index 0000000..63bf578
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_hot_96.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_snow_storm_96.png b/app/src/main/res/drawable-xxxhdpi/ic_snow_storm_96.png
new file mode 100644
index 0000000..11bd180
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_snow_storm_96.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_tornado_96.png b/app/src/main/res/drawable-xxxhdpi/ic_tornado_96.png
new file mode 100644
index 0000000..87e6165
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_tornado_96.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_windsock_96.png b/app/src/main/res/drawable-xxxhdpi/ic_windsock_96.png
new file mode 100644
index 0000000..7552edc
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_windsock_96.png
Binary files differ