diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
index e7f8fc7..97e36ad 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
@@ -28,6 +28,7 @@
 import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.graphics.PorterDuff;
+import android.graphics.drawable.Drawable;
 import android.location.Criteria;
 import android.location.Location;
 import android.location.LocationListener;
@@ -409,6 +410,19 @@
                                         lengthView.setText(String.format(Locale.getDefault(), "Length: %.02fm", hike.getLength()));
                                         timeView.setText(String.format(Locale.getDefault(), "Time: %ds", hike.getTime()));
                                         difficultyView.setText(res.getStringArray(R.array.hike_difficulties)[hike.getDifficulty()]);
+                                        Drawable difficultyDrawable = null;
+                                        switch (hike.getDifficulty()) {
+                                            case 0:
+                                                difficultyDrawable = res.getDrawable(R.drawable.difficulty_indicator_easy, null);
+                                                break;
+                                            case 1:
+                                                difficultyDrawable = res.getDrawable(R.drawable.difficulty_indicator_medium, null);
+                                                break;
+                                            case 2:
+                                                difficultyDrawable = res.getDrawable(R.drawable.difficulty_indicator_hard, null);
+                                                break;
+                                        }
+                                        difficultyView.setCompoundDrawablesWithIntrinsicBounds(difficultyDrawable, null, null, null);
                                         upView.setText(String.format(Locale.getDefault(), "Up: %.02fm", hike.getHeightUp()));
                                         downView.setText(String.format(Locale.getDefault(), "Down: %.02fm", hike.getHeightDown()));
                                         hikeMap.setTileSource(TileSourceFactory.MAPNIK);
diff --git a/app/src/main/res/drawable/difficulty_indicator_easy.xml b/app/src/main/res/drawable/difficulty_indicator_easy.xml
new file mode 100644
index 0000000..e187e09
--- /dev/null
+++ b/app/src/main/res/drawable/difficulty_indicator_easy.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+	* This file is part of MountainNavigation.
+	*
+	* MountainNavigation is free software: you can redistribute it and/or modify
+	* it under the terms of the GNU General Public License as published by
+	* the Free Software Foundation, either version 3 of the License, or
+	* (at your option) any later version.
+	*
+	* MountainNavigation is distributed in the hope that it will be useful,
+	* but WITHOUT ANY WARRANTY; without even the implied warranty of
+	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	* GNU General Public License for more details.
+	*
+	* You should have received a copy of the GNU General Public License
+	* along with MountainNavigation. If not, see <http://www.gnu.org/licenses/>.
+	*
+	* Copyright (c) 2016 Vinzenz Rosenkanz <vinzenz.rosenkranz@gmail.com>
+	*
+	* Vinzenz Rosenkranz <vinzenz.rosenkranz@gmail.com>
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:innerRadius="0dp"
+    android:shape="ring"
+    android:thickness="2dp"
+    android:useLevel="false" >
+    <solid android:color="#FF00BA00" />
+    <size
+        android:height="5dp"
+        android:width="5dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/difficulty_indicator_hard.xml b/app/src/main/res/drawable/difficulty_indicator_hard.xml
new file mode 100644
index 0000000..4a79134
--- /dev/null
+++ b/app/src/main/res/drawable/difficulty_indicator_hard.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+	* This file is part of MountainNavigation.
+	*
+	* MountainNavigation is free software: you can redistribute it and/or modify
+	* it under the terms of the GNU General Public License as published by
+	* the Free Software Foundation, either version 3 of the License, or
+	* (at your option) any later version.
+	*
+	* MountainNavigation is distributed in the hope that it will be useful,
+	* but WITHOUT ANY WARRANTY; without even the implied warranty of
+	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	* GNU General Public License for more details.
+	*
+	* You should have received a copy of the GNU General Public License
+	* along with MountainNavigation. If not, see <http://www.gnu.org/licenses/>.
+	*
+	* Copyright (c) 2016 Vinzenz Rosenkanz <vinzenz.rosenkranz@gmail.com>
+	*
+	* Vinzenz Rosenkranz <vinzenz.rosenkranz@gmail.com>
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:innerRadius="0dp"
+    android:shape="ring"
+    android:thickness="2dp"
+    android:useLevel="false" >
+    <solid android:color="#FFFF0000" />
+    <size
+        android:height="5dp"
+        android:width="5dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/difficulty_indicator_medium.xml b/app/src/main/res/drawable/difficulty_indicator_medium.xml
new file mode 100644
index 0000000..8373c89
--- /dev/null
+++ b/app/src/main/res/drawable/difficulty_indicator_medium.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+	* This file is part of MountainNavigation.
+	*
+	* MountainNavigation is free software: you can redistribute it and/or modify
+	* it under the terms of the GNU General Public License as published by
+	* the Free Software Foundation, either version 3 of the License, or
+	* (at your option) any later version.
+	*
+	* MountainNavigation is distributed in the hope that it will be useful,
+	* but WITHOUT ANY WARRANTY; without even the implied warranty of
+	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	* GNU General Public License for more details.
+	*
+	* You should have received a copy of the GNU General Public License
+	* along with MountainNavigation. If not, see <http://www.gnu.org/licenses/>.
+	*
+	* Copyright (c) 2016 Vinzenz Rosenkanz <vinzenz.rosenkranz@gmail.com>
+	*
+	* Vinzenz Rosenkranz <vinzenz.rosenkranz@gmail.com>
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:innerRadius="0dp"
+    android:shape="ring"
+    android:thickness="2dp"
+    android:useLevel="false" >
+    <solid android:color="#FFFFB000" />
+    <size
+        android:height="5dp"
+        android:width="5dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/hike_list_detail.xml b/app/src/main/res/layout/hike_list_detail.xml
index 8738dde..a48594f 100644
--- a/app/src/main/res/layout/hike_list_detail.xml
+++ b/app/src/main/res/layout/hike_list_detail.xml
@@ -74,10 +74,12 @@
         android:gravity="center_vertical"/>
     <TextView
         android:id="@+id/hike_list_detail_difficulty"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:paddingLeft="2dp"
         android:paddingStart="2dp"
+        android:drawablePadding="2dp"
+        android:drawableStart="@drawable/difficulty_indicator_easy"
         android:textSize="12sp"
         android:textColor="@color/text_color_light"
         android:fontFamily="sans-serif-light"
@@ -90,7 +92,7 @@
         android:paddingBottom="16dp"> <!-- padding for mapView -->
         <TextView
             android:id="@+id/hike_list_detail_up"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingLeft="2dp"
             android:paddingStart="2dp"
@@ -101,10 +103,10 @@
             android:gravity="center_vertical"/>
         <TextView
             android:id="@+id/hike_list_detail_down"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingLeft="6dp"
-            android:paddingStart="6dp"
+            android:paddingLeft="2dp"
+            android:paddingStart="2dp"
             android:textSize="12sp"
             android:textColor="@color/text_color_light"
             android:fontFamily="sans-serif-light"