diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
index 4ff2b71..bb47089 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
@@ -16,6 +16,7 @@
 import android.location.Location;
 import android.location.LocationListener;
 import android.location.LocationManager;
+import android.os.AsyncTask;
 import android.provider.Settings;
 import android.support.design.widget.FloatingActionButton;
 import android.support.v4.view.GravityCompat;
@@ -259,6 +260,41 @@
             Toaster("You enabled " + entries[position]);
             String title = entries[position];
             List<Poi> tempPoiList = dbHandler.getPoiByType(type);
+            UpdatePoiIconsAsyncTask asyncTask = new UpdatePoiIconsAsyncTask(type, title);
+            poiMarkers[type] = asyncTask.doInBackground(tempPoiList);
+            for(int i=0; i<poiMarkers[type].size(); ++i){
+                mapView.getOverlays().add(poiMarkers[type].get(i));
+            }
+            mapView.invalidate();
+        } else {
+            iv.setColorFilter(Color.argb(200, 185, 185, 185));
+            iv.setTag("disabled");
+            tv.setTextColor(res.getColor(R.color.text_color));
+            //Typeface tf = Typeface.create("sans-serif-medium", Typeface.NORMAL);
+            //tv.setTypeface(tf);
+            Toaster("You disabled " + entries[position]);
+            for(int i=0; i<poiMarkers[type].size(); ++i){
+                Overlay poi = poiMarkers[type].get(i);
+                mapView.getOverlays().remove(poi);
+            }
+            poiMarkers[type] = new ArrayList<>();
+            mapView.invalidate();
+        }
+    }
+
+    private class UpdatePoiIconsAsyncTask extends AsyncTask<List<Poi>, Void, List<Marker>> {
+        int type;
+        String title;
+
+        public UpdatePoiIconsAsyncTask(int type, String title){
+            this.type = type;
+            this.title = title;
+        }
+
+        @Override
+        protected List<Marker> doInBackground(List<Poi>... params) {
+            List<Marker> result = new ArrayList<>();
+            List<Poi> tempPoiList = params[0]; //This is only one list
             for(int i=0; i<tempPoiList.size(); ++i){
                 Poi poi = tempPoiList.get(i);
                 GeoPoint gp = new GeoPoint(poi.getLat(), poi.getLon(), poi.getAlt());
@@ -287,23 +323,10 @@
                 iconLayer[1] = bd;
                 LayerDrawable icon = new LayerDrawable(iconLayer);
                 positionMarker.setIcon(icon);
-                mapView.getOverlays().add(positionMarker);
+                result.add(positionMarker);
                 poiMarkers[type].add(positionMarker);
             }
-            mapView.invalidate();
-        } else {
-            iv.setColorFilter(Color.argb(200, 185, 185, 185));
-            iv.setTag("disabled");
-            tv.setTextColor(res.getColor(R.color.text_color));
-            //Typeface tf = Typeface.create("sans-serif-medium", Typeface.NORMAL);
-            //tv.setTypeface(tf);
-            Toaster("You disabled " + entries[position]);
-            for(int i=0; i<poiMarkers[type].size(); ++i){
-                Overlay poi = poiMarkers[type].get(i);
-                mapView.getOverlays().remove(poi);
-            }
-            poiMarkers[type] = new ArrayList<>();
-            mapView.invalidate();
+            return result;
         }
     }