diff --git a/app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java b/app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java
index 4b4ab38..e119077 100644
--- a/app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java
@@ -195,7 +195,7 @@ public class MapActivity extends BaseActivity
             // User cancelled the dialog
         });
 
-        TextView userName = view.findViewById(R.id.userName);
+        TextView userName = view.findViewById(R.id. userName);
         TextView status = view.findViewById(R.id.label);
         TextView sharingLevelView = view.findViewById(R.id.sharing_level);
 
@@ -232,7 +232,7 @@ public class MapActivity extends BaseActivity
         mapboxMap.addOnMapLongClickListener((LatLng latLng) -> {
             selectLocationButton.setVisibility(View.VISIBLE);
             removeLocationButton.setVisibility(View.GONE);
-            Icon icon = IconFactory.getInstance(MapActivity.this).fromResource(R.drawable.green_marker);
+            Icon icon = IconFactory.getInstance(MapActivity.this).fromResource(R.drawable.my_marker);
 
             if (tmpLocalMarker == null) {
 
@@ -400,14 +400,14 @@ public class MapActivity extends BaseActivity
                                         coordsMap.put(id, element);
 
                                         String sharingLevel = coordsMap.get(id).getDisplayMode();
-                                        Icon defaultIcon = IconFactory.getInstance(MapActivity.this).fromResource(R.drawable.red_marker);
+                                        Icon defaultIcon = IconFactory.getInstance(MapActivity.this).fromResource(R.drawable.exact_localization_marker);
 
                                         if (sharingLevel.equals(SharingLevel.APPROXIMATED.toString())) {
-                                            defaultIcon = IconFactory.getInstance(MapActivity.this).fromResource(R.drawable.blue_marker);
+                                            defaultIcon = IconFactory.getInstance(MapActivity.this).fromResource(R.drawable.approximate_localization_marker);
                                         } else if (sharingLevel.equals(SharingLevel.MANUAL.toString())) {
-                                            defaultIcon = IconFactory.getInstance(MapActivity.this).fromResource(R.drawable.green_marker);
+                                            defaultIcon = IconFactory.getInstance(MapActivity.this).fromResource(R.drawable.manual_localization_marker);
                                         } else if (id.equals(myID)) {
-                                            defaultIcon = IconFactory.getInstance(MapActivity.this).fromResource(R.drawable.custom_marker);
+                                            defaultIcon = IconFactory.getInstance(MapActivity.this).fromResource(R.drawable.my_marker);
                                         }
 
                                         MarkerOptions markerOptions = new MarkerOptions()
@@ -426,16 +426,16 @@ public class MapActivity extends BaseActivity
                                     Boolean newLocalizationMode = markerHash.get(id).getMarkerType().equals(newSharingLevel);
 
                                     if (!newLocalizationMode) {
-                                        Icon defaultIcon = IconFactory.getInstance(MapActivity.this).fromResource(R.drawable.red_marker);
+                                        Icon defaultIcon = IconFactory.getInstance(MapActivity.this).fromResource(R.drawable.exact_localization_marker);
                                         MapMarker marker = markerHash.get(id);
                                         coordsMap.get(id).setDisplayMode(newSharingLevel);
 
                                         if (newSharingLevel.equals(SharingLevel.APPROXIMATED.toString())) {
-                                            defaultIcon = IconFactory.getInstance(MapActivity.this).fromResource(R.drawable.blue_marker);
+                                            defaultIcon = IconFactory.getInstance(MapActivity.this).fromResource(R.drawable.approximate_localization_marker);
                                         } else if (newSharingLevel.equals(SharingLevel.MANUAL.toString())) {
-                                            defaultIcon = IconFactory.getInstance(MapActivity.this).fromResource(R.drawable.green_marker);
+                                            defaultIcon = IconFactory.getInstance(MapActivity.this).fromResource(R.drawable.manual_localization_marker);
                                         } else if (id.equals(myID)) {
-                                            defaultIcon = IconFactory.getInstance(MapActivity.this).fromResource(R.drawable.custom_marker);
+                                            defaultIcon = IconFactory.getInstance(MapActivity.this).fromResource(R.drawable.my_marker);
                                         }
 
                                         marker.setDefaultIcon(defaultIcon);
diff --git a/app/src/main/res/drawable-v21/custom_marker.png b/app/src/main/res/drawable-v21/custom_marker.png
deleted file mode 100644
index 1df09fd..0000000
Binary files a/app/src/main/res/drawable-v21/custom_marker.png and /dev/null differ
diff --git a/app/src/main/res/drawable-v24/custom_marker.png b/app/src/main/res/drawable-v24/custom_marker.png
deleted file mode 100644
index 1df09fd..0000000
Binary files a/app/src/main/res/drawable-v24/custom_marker.png and /dev/null differ
diff --git a/app/src/main/res/drawable/approximate_localization_marker.png b/app/src/main/res/drawable/approximate_localization_marker.png
new file mode 100644
index 0000000..6f35fd3
Binary files /dev/null and b/app/src/main/res/drawable/approximate_localization_marker.png differ
diff --git a/app/src/main/res/drawable/blue_marker.png b/app/src/main/res/drawable/blue_marker.png
deleted file mode 100644
index 7bbbd9b..0000000
Binary files a/app/src/main/res/drawable/blue_marker.png and /dev/null differ
diff --git a/app/src/main/res/drawable/custom_marker.png b/app/src/main/res/drawable/custom_marker.png
deleted file mode 100644
index 8b1f284..0000000
Binary files a/app/src/main/res/drawable/custom_marker.png and /dev/null differ
diff --git a/app/src/main/res/drawable/exact_localization_marker.png b/app/src/main/res/drawable/exact_localization_marker.png
new file mode 100644
index 0000000..be49182
Binary files /dev/null and b/app/src/main/res/drawable/exact_localization_marker.png differ
diff --git a/app/src/main/res/drawable/green_marker.png b/app/src/main/res/drawable/green_marker.png
deleted file mode 100644
index 0babab0..0000000
Binary files a/app/src/main/res/drawable/green_marker.png and /dev/null differ
diff --git a/app/src/main/res/drawable/manual_localization_marker.png b/app/src/main/res/drawable/manual_localization_marker.png
new file mode 100644
index 0000000..89adebf
Binary files /dev/null and b/app/src/main/res/drawable/manual_localization_marker.png differ
diff --git a/app/src/main/res/drawable/manual_marker.png b/app/src/main/res/drawable/manual_marker.png
deleted file mode 100644
index d127895..0000000
Binary files a/app/src/main/res/drawable/manual_marker.png and /dev/null differ
diff --git a/app/src/main/res/drawable/my_marker.png b/app/src/main/res/drawable/my_marker.png
new file mode 100644
index 0000000..f63d50f
Binary files /dev/null and b/app/src/main/res/drawable/my_marker.png differ
diff --git a/app/src/main/res/drawable/purple_marker.png b/app/src/main/res/drawable/purple_marker.png
deleted file mode 100644
index b3cdf26..0000000
Binary files a/app/src/main/res/drawable/purple_marker.png and /dev/null differ
diff --git a/app/src/main/res/drawable/red_marker.png b/app/src/main/res/drawable/red_marker.png
deleted file mode 100644
index 6b72939..0000000
Binary files a/app/src/main/res/drawable/red_marker.png and /dev/null differ
diff --git a/app/src/main/res/drawable/search_marker.png b/app/src/main/res/drawable/search_marker.png
index 09681e0..cc8d803 100644
Binary files a/app/src/main/res/drawable/search_marker.png and b/app/src/main/res/drawable/search_marker.png differ
diff --git a/app/src/main/res/drawable/yellow_marker.png b/app/src/main/res/drawable/yellow_marker.png
deleted file mode 100644
index 85b97e1..0000000
Binary files a/app/src/main/res/drawable/yellow_marker.png and /dev/null differ
diff --git a/app/src/main/res/manual_localization_marker.png b/app/src/main/res/manual_localization_marker.png
new file mode 100644
index 0000000..8fc03dd
Binary files /dev/null and b/app/src/main/res/manual_localization_marker.png differ