diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
index 5d5c996..c47f6fe 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
@@ -84,7 +84,6 @@
 
 import org.osmdroid.api.IMapController;
 import org.osmdroid.bonuspack.overlays.Marker;
-import org.osmdroid.bonuspack.overlays.Polygon;
 import org.osmdroid.bonuspack.overlays.Polyline;
 import org.osmdroid.tileprovider.tilesource.TileSourceFactory;
 import org.osmdroid.util.GeoPoint;
@@ -103,16 +102,13 @@
 import java.util.Locale;
 
 import de.apps4ics.mountainnavigation.adapters.HikeListAdapter;
-import de.apps4ics.mountainnavigation.adapters.ShowEndangeredListAdapter;
 import de.apps4ics.mountainnavigation.handlers.DatabaseHandler;
 import de.apps4ics.mountainnavigation.handlers.HikeHandler;
 import de.apps4ics.mountainnavigation.handlers.PoiHandler;
 import de.apps4ics.mountainnavigation.handlers.WeatherHandler;
 import de.apps4ics.mountainnavigation.pois.AddBiotaDialog;
 import de.apps4ics.mountainnavigation.pois.AddPoiDialog;
-import de.apps4ics.mountainnavigation.pois.Biota;
 import de.apps4ics.mountainnavigation.pois.DbGeoPoint;
-import de.apps4ics.mountainnavigation.pois.Endangered;
 import de.apps4ics.mountainnavigation.pois.Fountain;
 import de.apps4ics.mountainnavigation.pois.Hike;
 import de.apps4ics.mountainnavigation.pois.Poi;
@@ -172,6 +168,8 @@
     private TextView weatherDesc;
     private TextView weatherMinTemp;
     private TextView weatherMaxTemp;
+    private TextView weatherSunrise;
+    private TextView weatherSunset;
 
     private Marker currentPosition;
 
@@ -286,6 +284,8 @@
         weatherDesc = (TextView) findViewById(R.id.weather_desc);
         weatherMinTemp = (TextView) findViewById(R.id.weather_min_temp);
         weatherMaxTemp = (TextView) findViewById(R.id.weather_max_temp);
+        weatherSunrise = (TextView) findViewById(R.id.weather_sunrise);
+        weatherSunset = (TextView) findViewById(R.id.weather_sunset);
 
         drawerLayout.setDrawerShadow(R.drawable.drawer_shadow, GravityCompat.START);
 
@@ -1065,6 +1065,10 @@
         }
         weatherMinTemp.setText(String.format(Locale.getDefault(), weatherText, minTemp));
         weatherMaxTemp.setText(String.format(Locale.getDefault(), weatherText, maxTemp));
+        weatherSunrise.setText(df_hm.format(new Date(weather.getSunrise()*1000)));
+        weatherSunset.setText(df_hm.format(new Date(weather.getSunset()*1000)));
+        weatherSunrise.setVisibility(View.VISIBLE);
+        weatherSunset.setVisibility(View.VISIBLE);
         if(weather.isSevereWeather()) weatherCity.setCompoundDrawablesWithIntrinsicBounds(null, null, res.getDrawable(R.drawable.ic_warning, null), null);
         else weatherCity.setCompoundDrawables(null, null, null, null);
         weatherHandler.displayHints(weather);
diff --git a/app/src/main/res/drawable-hdpi/ic_camera_96.png b/app/src/main/res/drawable-hdpi/ic_camera_96.png
new file mode 100644
index 0000000..8204193
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_camera_96.png
Binary files differ
diff --git a/app/src/main/res/drawable-hdpi/ic_picture_96.png b/app/src/main/res/drawable-hdpi/ic_picture_96.png
new file mode 100644
index 0000000..6a20716
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_picture_96.png
Binary files differ
diff --git a/app/src/main/res/drawable-hdpi/ic_sunrise_96.png b/app/src/main/res/drawable-hdpi/ic_sunrise_96.png
new file mode 100644
index 0000000..b51fe4d
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_sunrise_96.png
Binary files differ
diff --git a/app/src/main/res/drawable-hdpi/ic_sunset_96.png b/app/src/main/res/drawable-hdpi/ic_sunset_96.png
new file mode 100644
index 0000000..ceb674e
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_sunset_96.png
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/ic_camera_96.png b/app/src/main/res/drawable-mdpi/ic_camera_96.png
new file mode 100644
index 0000000..930acaa
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_camera_96.png
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/ic_picture_96.png b/app/src/main/res/drawable-mdpi/ic_picture_96.png
new file mode 100644
index 0000000..dbd6d49
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_picture_96.png
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/ic_sunrise_96.png b/app/src/main/res/drawable-mdpi/ic_sunrise_96.png
new file mode 100644
index 0000000..81eb843
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_sunrise_96.png
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/ic_sunset_96.png b/app/src/main/res/drawable-mdpi/ic_sunset_96.png
new file mode 100644
index 0000000..3c5ad22
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_sunset_96.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_camera_96.png b/app/src/main/res/drawable-xhdpi/ic_camera_96.png
new file mode 100644
index 0000000..77649f1
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_camera_96.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_picture_96.png b/app/src/main/res/drawable-xhdpi/ic_picture_96.png
new file mode 100644
index 0000000..b773331
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_picture_96.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_sunrise_96.png b/app/src/main/res/drawable-xhdpi/ic_sunrise_96.png
new file mode 100644
index 0000000..745987d
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_sunrise_96.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_sunset_96.png b/app/src/main/res/drawable-xhdpi/ic_sunset_96.png
new file mode 100644
index 0000000..6acaf8e
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_sunset_96.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_camera_96.png b/app/src/main/res/drawable-xxhdpi/ic_camera_96.png
new file mode 100644
index 0000000..dd20c61
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_camera_96.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_picture_96.png b/app/src/main/res/drawable-xxhdpi/ic_picture_96.png
new file mode 100644
index 0000000..2162cec
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_picture_96.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_sunrise_96.png b/app/src/main/res/drawable-xxhdpi/ic_sunrise_96.png
new file mode 100644
index 0000000..9dd517d
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_sunrise_96.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_sunset_96.png b/app/src/main/res/drawable-xxhdpi/ic_sunset_96.png
new file mode 100644
index 0000000..dc420d8
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_sunset_96.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_camera_96.png b/app/src/main/res/drawable-xxxhdpi/ic_camera_96.png
new file mode 100644
index 0000000..ed20f99
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_camera_96.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_picture_96.png b/app/src/main/res/drawable-xxxhdpi/ic_picture_96.png
new file mode 100644
index 0000000..c80973d
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_picture_96.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_sunrise_96.png b/app/src/main/res/drawable-xxxhdpi/ic_sunrise_96.png
new file mode 100644
index 0000000..b1c9e47
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_sunrise_96.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_sunset_96.png b/app/src/main/res/drawable-xxxhdpi/ic_sunset_96.png
new file mode 100644
index 0000000..7ba3299
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_sunset_96.png
Binary files differ
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 5c536b6..2ba5ce0 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -91,7 +91,7 @@
                     android:id="@+id/weather_symbol"/>
                 <LinearLayout
                     android:layout_width="wrap_content"
-                    android:layout_height="72dp"
+                    android:layout_height="wrap_content"
                     android:orientation="vertical"
                     android:layout_marginLeft="12dp"
                     android:layout_marginStart="12dp">
@@ -133,6 +133,32 @@
                         android:textColor="@color/text_color"
                         android:fontFamily="sans-serif-medium"
                         android:textStyle="italic"/>
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="6dp"
+                        android:layout_marginStart="6dp"
+                        android:id="@+id/weather_sunrise"
+                        android:gravity="center"
+                        android:textSize="12sp"
+                        android:textColor="@color/text_color_light"
+                        android:fontFamily="sans-serif-medium"
+                        android:textStyle="italic"
+                        android:visibility="gone"
+                        android:drawableStart="@drawable/ic_sunrise_96"/>
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="6dp"
+                        android:layout_marginStart="6dp"
+                        android:id="@+id/weather_sunset"
+                        android:gravity="center"
+                        android:textSize="12sp"
+                        android:textColor="@color/text_color_light"
+                        android:fontFamily="sans-serif-medium"
+                        android:textStyle="italic"
+                        android:visibility="gone"
+                        android:drawableStart="@drawable/ic_sunset_96"/>
                 </LinearLayout>
             </LinearLayout>
             <ExpandableListView