diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
index c47f6fe..6750528 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
@@ -163,6 +163,7 @@
     private ActionBarDrawerToggle drawerToggle;
     private DrawerLayout drawerLayout;
     private ExpandableListView poiView;
+    private LinearLayout sunLayout;
     private ImageView weatherSymbol;
     private TextView weatherCity;
     private TextView weatherDesc;
@@ -284,6 +285,7 @@
         weatherDesc = (TextView) findViewById(R.id.weather_desc);
         weatherMinTemp = (TextView) findViewById(R.id.weather_min_temp);
         weatherMaxTemp = (TextView) findViewById(R.id.weather_max_temp);
+        sunLayout = (LinearLayout) findViewById(R.id.sun_layout);
         weatherSunrise = (TextView) findViewById(R.id.weather_sunrise);
         weatherSunset = (TextView) findViewById(R.id.weather_sunset);
 
@@ -1067,8 +1069,7 @@
         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);
+        sunLayout.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_sort_down_96.png b/app/src/main/res/drawable-hdpi/ic_sort_down_96.png
new file mode 100644
index 0000000..cea839a
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_sort_down_96.png
Binary files differ
diff --git a/app/src/main/res/drawable-hdpi/ic_sort_up_96.png b/app/src/main/res/drawable-hdpi/ic_sort_up_96.png
new file mode 100644
index 0000000..51d8f32
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_sort_up_96.png
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/ic_sort_down_96.png b/app/src/main/res/drawable-mdpi/ic_sort_down_96.png
new file mode 100644
index 0000000..9059a90
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_sort_down_96.png
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/ic_sort_up_96.png b/app/src/main/res/drawable-mdpi/ic_sort_up_96.png
new file mode 100644
index 0000000..98a8626
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_sort_up_96.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_sort_down_96.png b/app/src/main/res/drawable-xhdpi/ic_sort_down_96.png
new file mode 100644
index 0000000..0fb1dc2
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_sort_down_96.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_sort_up_96.png b/app/src/main/res/drawable-xhdpi/ic_sort_up_96.png
new file mode 100644
index 0000000..c7fa67f
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_sort_up_96.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_sort_down_96.png b/app/src/main/res/drawable-xxhdpi/ic_sort_down_96.png
new file mode 100644
index 0000000..8589f43
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_sort_down_96.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_sort_up_96.png b/app/src/main/res/drawable-xxhdpi/ic_sort_up_96.png
new file mode 100644
index 0000000..5969c54
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_sort_up_96.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_sort_down_96.png b/app/src/main/res/drawable-xxxhdpi/ic_sort_down_96.png
new file mode 100644
index 0000000..e0bafd8
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_sort_down_96.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_sort_up_96.png b/app/src/main/res/drawable-xxxhdpi/ic_sort_up_96.png
new file mode 100644
index 0000000..65416b3
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_sort_up_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 2ba5ce0..e2fab7a 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -133,32 +133,37 @@
                         android:textColor="@color/text_color"
                         android:fontFamily="sans-serif-medium"
                         android:textStyle="italic"/>
-                    <TextView
-                        android:layout_width="match_parent"
+                    <LinearLayout
+                        android:layout_width="wrap_content"
                         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:orientation="horizontal"
                         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"/>
+                        android:id="@+id/sun_layout">
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="6dp"
+                            android:layout_marginStart="6dp"
+                            android:id="@+id/weather_sunrise"
+                            android:textSize="12sp"
+                            android:textColor="@color/text_color_light"
+                            android:fontFamily="sans-serif-medium"
+                            android:textStyle="italic"
+                            android:drawablePadding="6dp"
+                            android:drawableStart="@drawable/ic_sunrise_96"/>
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="6dp"
+                            android:layout_marginStart="6dp"
+                            android:id="@+id/weather_sunset"
+                            android:textSize="12sp"
+                            android:textColor="@color/text_color_light"
+                            android:fontFamily="sans-serif-medium"
+                            android:textStyle="italic"
+                            android:drawablePadding="6dp"
+                            android:drawableStart="@drawable/ic_sunset_96"/>
+                    </LinearLayout>
                 </LinearLayout>
             </LinearLayout>
             <ExpandableListView
diff --git a/app/src/main/res/layout/hike_list.xml b/app/src/main/res/layout/hike_list.xml
index 1accdba..5abb2ed 100644
--- a/app/src/main/res/layout/hike_list.xml
+++ b/app/src/main/res/layout/hike_list.xml
@@ -56,7 +56,7 @@
                     android:textSize="12sp"
                     android:textStyle="italic"
                     android:textColor="@color/text_color_light"
-                    android:fontFamily="sans-serif-medium"
+                    android:fontFamily="sans-serif-light"
                     android:layout_gravity="center_vertical"
                     android:gravity="center_vertical"/>
             </LinearLayout>
diff --git a/app/src/main/res/layout/hike_list_detail.xml b/app/src/main/res/layout/hike_list_detail.xml
index 354aeb2..7f332c1 100644
--- a/app/src/main/res/layout/hike_list_detail.xml
+++ b/app/src/main/res/layout/hike_list_detail.xml
@@ -45,7 +45,7 @@
             android:textSize="12sp"
             android:textStyle="italic"
             android:textColor="@color/text_color_light"
-            android:fontFamily="sans-serif-medium"
+            android:fontFamily="sans-serif-light"
             android:layout_gravity="center_vertical"
             android:gravity="center_vertical"/>
     </LinearLayout>
@@ -97,7 +97,8 @@
             android:textSize="12sp"
             android:textColor="@color/text_color_light"
             android:fontFamily="sans-serif-light"
-            android:layout_gravity="center_vertical"
+            android:drawableStart="@drawable/ic_sort_up_96"
+            android:drawablePadding="2dp"
             android:gravity="center_vertical"/>
         <TextView
             android:id="@+id/hike_list_detail_down"
@@ -108,7 +109,8 @@
             android:textSize="12sp"
             android:textColor="@color/text_color_light"
             android:fontFamily="sans-serif-light"
-            android:layout_gravity="center_vertical"
+            android:drawableStart="@drawable/ic_sort_down_96"
+            android:drawablePadding="2dp"
             android:gravity="center_vertical"/>
     </LinearLayout>
     <com.db.chart.view.LineChartView