diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
index d121910..ac421f5 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
@@ -1,6 +1,7 @@
 package de.apps4ics.mountainnavigation;
 
 import android.app.Activity;
+import android.graphics.Color;
 import android.graphics.Typeface;
 import android.os.Environment;
 import android.support.v4.view.GravityCompat;
@@ -12,6 +13,7 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.support.v4.app.ActionBarDrawerToggle;
+import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -23,7 +25,10 @@
 import android.widget.ArrayAdapter;
 import android.widget.CheckBox;
 import android.widget.FrameLayout;
+import android.widget.ImageView;
 import android.widget.ListView;
+import android.widget.TableLayout;
+import android.widget.TableRow;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -44,6 +49,7 @@
 public class MainActivity extends ActionBarActivity
         implements NavigationDrawerFragment.NavigationDrawerCallbacks {
 
+    private static final String TAG = "MountainNavigation";
     /**
      * Fragment managing the behaviors, interactions and presentation of the navigation drawer.
      */
@@ -94,31 +100,96 @@
         mTitle = mDrawerTitle = getTitle();
 
         entries = getResources().getStringArray(R.array.toggleEntries);
+        final Integer[] entryImgs = {
+                R.drawable.water,
+                R.drawable.path,
+                R.drawable.break_point,
+                R.drawable.trash,
+                R.drawable.image_upload,
+                R.drawable.cell_reception,
+                R.drawable.wifi,
+                R.drawable.lift
+        };
         drawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
         listView = (ListView) findViewById(R.id.navigation_drawer);
 
         drawerLayout.setDrawerShadow(R.drawable.drawer_shadow, GravityCompat.START);
 
         listView.setItemsCanFocus(false);
-        listView.setAdapter(new ArrayAdapter<String>(this, R.layout.drawer_list_item, entries));
+        ImageListAdapter adapter = new ImageListAdapter(MainActivity.this, entries, entryImgs);
+        //listView.setAdapter(new ArrayAdapter<String>(this, R.layout.drawer_list_item, entries));
+        listView.setAdapter(adapter);
         listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                CheckBox cb = (CheckBox) view;
-                cb.setChecked(!cb.isChecked());
+                TableLayout layout = (TableLayout) view;
+                TableRow tr = (TableRow) layout.getChildAt(0); //TODO is tablerow?
+                TextView tv = null;
+                ImageView iv = null;
+                for(int i=0; i<tr.getChildCount(); ++i){
+                    View v = tr.getChildAt(i);
+                    try {
+                        tv = (TextView) v;
+                    } catch(ClassCastException cce){
+                    }
+                    try {
+                        iv = (ImageView) v;
+                    } catch(ClassCastException cce){
+                    }
+                }
+                if(tv == null || iv == null) Log.e(TAG, "Neither TextView nor ImageView can be null!");
+                if(iv.getTag() != "disabled"){
+                    iv.setColorFilter(Color.argb(200, 185, 185, 185));
+                    iv.setTag("disabled");
+                    tv.setTypeface(null, Typeface.NORMAL);
+                    Toast.makeText(getApplicationContext(), "You disabled " + entries[position], Toast.LENGTH_SHORT).show();
+                } else {
+                    iv.setColorFilter(null);
+                    iv.setTag("");
+                    tv.setTypeface(null, Typeface.BOLD);
+                    Toast.makeText(getApplicationContext(), "You enabled " + entries[position], Toast.LENGTH_SHORT).show();
+                }
+                /*cb.setChecked(!cb.isChecked());
                 if(cb.isChecked()){
                     cb.setTypeface(null, Typeface.BOLD);
                     Toast.makeText(getApplicationContext(), "Selected " + entries[position], Toast.LENGTH_SHORT).show();
                 } else {
                     cb.setTypeface(null, Typeface.NORMAL);
                     Toast.makeText(getApplicationContext(), "Deselected " + entries[position], Toast.LENGTH_SHORT).show();
-                }
+                }*/
             }
         });
 
                 drawerLayout.setDrawerListener(drawerToggle);
     }
 
+    private class ImageListAdapter extends ArrayAdapter<String> {
+
+        private final Activity context;
+        private final String[] texts;
+        private final Integer[] imgs;
+
+        public ImageListAdapter(Activity context, String[] texts, Integer[] imgs) {
+            super(context, R.layout.drawer_list_item, texts);
+            this.context = context;
+            this.texts = texts;
+            this.imgs = imgs;
+        }
+
+        @Override
+        public View getView(int position, View view, ViewGroup parent) {
+            LayoutInflater inflater = context.getLayoutInflater();
+            View rowView= inflater.inflate(R.layout.drawer_list_item, null, true);
+            TextView txtTitle = (TextView) rowView.findViewById(R.id.toggleEntryDesc);
+
+            ImageView imageView = (ImageView) rowView.findViewById(R.id.toggleEntryImg);
+            txtTitle.setText(texts[position]);
+
+            imageView.setImageResource(imgs[position]);
+            return rowView;
+        }
+    }
+
     @Override
     public void setTitle(CharSequence title){
         mTitle = title;
diff --git a/app/src/main/res/layout/drawer_list_item.xml b/app/src/main/res/layout/drawer_list_item.xml
index 314a25d..e88d1fe 100644
--- a/app/src/main/res/layout/drawer_list_item.xml
+++ b/app/src/main/res/layout/drawer_list_item.xml
@@ -1,7 +1,36 @@
-<CheckBox xmlns:android="http://schemas.android.com/apk/res/android"
+<?xml version="1.0" encoding="utf-8"?>
+<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <TableRow
+        android:layout_height="35dp">
+        <View
+            android:layout_height="match_parent"
+            android:layout_width="12dp">
+
+        </View>
+        <ImageView
+            android:id="@+id/toggleEntryImg"
+            android:layout_width="25dp"
+            android:layout_height="25dp"/>
+        <View
+            android:layout_height="match_parent"
+            android:layout_width="12dp">
+
+        </View>
+        <TextView
+            android:id="@+id/toggleEntryDesc"
+            android:layout_width="wrap_content"
+            android:layout_height="25dp"
+            android:layout_gravity="center"
+            android:gravity="center"/>
+
+    </TableRow>
+</TableLayout>
+    <!--<CheckBox xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:id="@+id/toggleEntryCB"
     android:focusable="false"
     android:focusableInTouchMode="false"
-    android:clickable="false"/>
\ No newline at end of file
+    android:clickable="false"/>-->
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d29dfe9..5d379c5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -13,9 +13,13 @@
     <string name="action_settings">Settings</string>
 
     <string-array name="toggleEntries">
-        <item>Water</item>
-        <item>Water1</item>
-        <item>Water2</item>
-        <item>Water3</item>
+        <item>Spring</item>
+        <item>Path</item>
+        <item>Break points</item>
+        <item>Trash Bins</item>
+        <item>Pictures</item>
+        <item>Cell reception</item>
+        <item>WiFi</item>
+        <item>Lift</item>
     </string-array>
 </resources>