diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/ImageListAdapter.java b/app/src/main/java/de/apps4ics/mountainnavigation/ImageListAdapter.java
index 117a370..a32244c 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/ImageListAdapter.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/ImageListAdapter.java
@@ -16,12 +16,14 @@
     private final Activity context;
     private final String[] texts;
     private final Integer[] imgs;
+    private final boolean selected;
 
-    public ImageListAdapter(Activity context, String[] texts, Integer[] imgs) {
+    public ImageListAdapter(Activity context, String[] texts, Integer[] imgs, boolean selected) {
         super(context, R.layout.drawer_list_item, texts);
         this.context = context;
         this.texts = texts;
         this.imgs = imgs;
+        this.selected = selected;
     }
 
     @Override
@@ -34,7 +36,7 @@
         txtTitle.setText(texts[position]);
 
         imageView.setImageResource(imgs[position]);
-        imageView.setColorFilter(context.getResources().getColor(R.color.icon_unselected_gray));
+        if(!selected) imageView.setColorFilter(context.getResources().getColor(R.color.icon_unselected_gray));
         return rowView;
     }
 }
diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
index 715fda3..263c39d 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
@@ -333,7 +333,7 @@
         drawerLayout.setDrawerShadow(R.drawable.drawer_shadow, GravityCompat.START);
 
 //        listView.setItemsCanFocus(false);
-        ImageListAdapter adapter = new ImageListAdapter(MainActivity.this, entries, entryImgs);
+        ImageListAdapter adapter = new ImageListAdapter(MainActivity.this, entries, entryImgs, false);
         listView.setAdapter(adapter);
         listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
@@ -923,7 +923,7 @@
             AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
             builder.setTitle(R.string.add_poi_dialog_title)
                     //.setIcon(res.getDrawable(R.mipmap.ic_add_poi))
-                    .setAdapter(new ImageListAdapter(MainActivity.this, entries, entryImgs), new DialogInterface.OnClickListener() {
+                    .setAdapter(new ImageListAdapter(MainActivity.this, entries, entryImgs, true), new DialogInterface.OnClickListener() {
                         @Override
                         public void onClick(DialogInterface dialog, int which) {
                             int type = getType(which);
@@ -1094,7 +1094,7 @@
 
         AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
         builder.setView(popupMapView)
-                .setTitle(R.string.path_map_dialog_title) //TODO title
+                .setTitle(R.string.image_map_dialog_title) //TODO title
                 .setPositiveButton(R.string.continue_button, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/pois/AddFountainDialog.java b/app/src/main/java/de/apps4ics/mountainnavigation/pois/AddFountainDialog.java
index 9ecf4fe..334788f 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/pois/AddFountainDialog.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/pois/AddFountainDialog.java
@@ -27,7 +27,7 @@
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
         builder.setTitle(R.string.fountain_size_dialog_title)
                 //.setIcon(res.getDrawable(R.drawable.water))
-                .setAdapter(new ImageListAdapter(getActivity(), ma.getFountainSizes(), ma.getFountainImgs()), new DialogInterface.OnClickListener() {
+                .setAdapter(new ImageListAdapter(getActivity(), ma.getFountainSizes(), ma.getFountainImgs(), true), new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         int size = 0;