diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyListFragment.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyListFragment.java
index 68bf7ee73..0c2159195 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyListFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyListFragment.java
@@ -220,21 +220,47 @@ public class NearbyListFragment extends ListFragment implements TaskListener {
                 case "farmhouse":
                     icon.setImageResource(R.drawable.round_icon_house);
                     break;
-                
+                case "church":
+                    icon.setImageResource(R.drawable.round_icon_church);
+                    break;
+                case "railway station":
+                    icon.setImageResource(R.drawable.round_icon_railway_station);
+                    break;
+                case "gatehouse":
+                    icon.setImageResource(R.drawable.round_icon_gatehouse);
+                    break;
+                case "milestone":
+                    icon.setImageResource(R.drawable.round_icon_milestone);
+                    break;
+                case "inn":
+                    icon.setImageResource(R.drawable.round_icon_house);
+                    break;
                 case "city":
-                    icon.setImageResource(R.drawable.icon_city);
-                    break;
-                case "edu":
-                    icon.setImageResource(R.drawable.icon_edu);
-                    break;
-                case "event":
-                    icon.setImageResource(R.drawable.icon_event);
-                    break;
-                case "mountain":
-                    icon.setImageResource(R.drawable.icon_mountain);
+                    icon.setImageResource(R.drawable.round_icon_city);
                     break;
                 case "isle":
-                    icon.setImageResource(R.drawable.icon_isle);
+                    icon.setImageResource(R.drawable.round_icon_island);
+                    break;
+                case "mountain":
+                    icon.setImageResource(R.drawable.round_icon_mountain);
+                    break;
+                case "airport":
+                    icon.setImageResource(R.drawable.round_icon_airport);
+                    break;
+                case "bridge":
+                    icon.setImageResource(R.drawable.round_icon_bridge);
+                    break;
+                case "forest":
+                    icon.setImageResource(R.drawable.round_icon_forest);
+                    break;
+                case "park":
+                    icon.setImageResource(R.drawable.round_icon_park);
+                    break;
+                case "river":
+                    icon.setImageResource(R.drawable.round_icon_river);
+                    break;
+                case "waterfall":
+                    icon.setImageResource(R.drawable.round_icon_waterfall);
                     break;
                 default:
                     icon.setImageResource(R.drawable.round_icon_unknown);
diff --git a/app/src/main/res/drawable/Round_Landmark_Icon_Road.xml b/app/src/main/res/drawable/Round_Landmark_Icon_Road.xml
new file mode 100644
index 000000000..a556a9efc
--- /dev/null
+++ b/app/src/main/res/drawable/Round_Landmark_Icon_Road.xml
@@ -0,0 +1,15 @@
+<vector android:height="24dp" android:viewportHeight="234.999"
+    android:viewportWidth="235.001" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#B1B1B1" android:pathData="M0,0h235v235h-235z"/>
+    <path android:fillColor="#E3E3E3" android:pathData="M117.5,18.5c-54.67,0 -99,44.32 -99,99c0,54.67 44.32,99 99,99c54.67,0 99,-44.32 99,-99C216.5,62.83 172.18,18.5 117.5,18.5zM117.5,202.98c-47.21,0 -85.48,-38.27 -85.48,-85.48c0,-47.21 38.27,-85.48 85.48,-85.48s85.48,38.27 85.48,85.48C202.98,164.71 164.71,202.98 117.5,202.98z"/>
+    <path android:fillColor="#EDA33F" android:pathData="M197.23,117.5c0,44.03 -35.69,79.72 -79.73,79.72c-44.03,0 -79.73,-35.69 -79.73,-79.72c0,-44.03 35.69,-79.73 79.73,-79.73C161.53,37.77 197.23,73.47 197.23,117.5z"/>
+    <path android:fillColor="#352200" android:pathData="M195.22,99.74c-4.62,-1.5 -10.24,-2.97 -14.99,-3.58l-37.11,-5.24c-42.73,-5.28 -76.6,-2.88 -101.46,1.97c-2.52,7.75 -3.89,16.02 -3.89,24.61c0,44.03 35.69,79.72 79.73,79.72c44.03,0 79.73,-35.69 79.73,-79.72C197.23,111.39 196.52,105.46 195.22,99.74z"/>
+    <path android:fillColor="#58595B" android:pathData="M143.12,90.92c-34.33,0 -72.04,26.87 -100.43,54.18c10.9,29.55 38.81,50.84 71.85,52.05c17.33,-38.25 45.29,-97.09 65.69,-100.99L143.12,90.92z"/>
+    <path android:fillColor="#FFE500" android:pathData="M65.55,172.89c1.64,-2.23 6.98,-8.56 8.69,-10.77l4.17,2.17c-1.59,2.27 -6.75,8.58 -8.29,10.9L65.55,172.89z"/>
+    <path android:fillColor="#FFE500" android:pathData="M80.39,154.18c1.75,-2.15 5.91,-7.06 7.72,-9.18l3.29,1.9c-1.7,2.19 -5.7,7.11 -7.35,9.35L80.39,154.18z"/>
+    <path android:fillColor="#FFE500" android:pathData="M93.63,138.68c1.85,-2.06 4.78,-5.47 6.7,-7.52l2.55,1.15c-1.78,2.09 -4.59,5.57 -6.36,7.73L93.63,138.68z"/>
+    <path android:fillColor="#FFE500" android:pathData="M106.18,125.14c1.96,-1.96 3.99,-3.92 6.03,-5.82l2.09,0.94c-1.94,1.99 -3.81,3.98 -5.68,6.04L106.18,125.14z"/>
+    <path android:fillColor="#FFE500" android:pathData="M118.47,113.73c2.1,-1.8 4.29,-3.59 6.5,-5.29l1.96,0.71c-2.11,1.8 -4.14,3.63 -6.17,5.54L118.47,113.73z"/>
+    <path android:fillColor="#FFE500" android:pathData="M131.79,103.53c2.3,-1.54 4.72,-3.02 7.17,-4.35l1.26,0.44c-2.37,1.44 -4.63,2.98 -6.87,4.64L131.79,103.53z"/>
+    <path android:fillColor="#FFE500" android:pathData="M146.57,95.66c2.61,-0.98 5.32,-1.76 8.08,-2.17l0.04,0.22c-2.72,0.54 -5.35,1.43 -7.89,2.53L146.57,95.66z"/>
+</vector>
diff --git a/app/src/main/res/drawable/round_icon_airport.xml b/app/src/main/res/drawable/round_icon_airport.xml
new file mode 100644
index 000000000..9e224165a
--- /dev/null
+++ b/app/src/main/res/drawable/round_icon_airport.xml
@@ -0,0 +1,23 @@
+<vector android:height="24dp" android:viewportHeight="235.0"
+    android:viewportWidth="235.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#B1B1B1" android:pathData="M0,0h235v235h-235z"/>
+    <path android:fillColor="#E3E3E3" android:pathData="M117.5,18.5c-54.68,0 -99,44.32 -99,99c0,54.67 44.32,99 99,99c54.67,0 99,-44.32 99,-99C216.5,62.83 172.18,18.5 117.5,18.5zM117.5,202.98c-47.21,0 -85.48,-38.27 -85.48,-85.48c0,-47.21 38.27,-85.48 85.48,-85.48c47.21,0 85.48,38.27 85.48,85.48C202.98,164.71 164.71,202.98 117.5,202.98z"/>
+    <path android:fillColor="#EDA33F" android:pathData="M197.23,117.5c0,44.03 -35.69,79.72 -79.73,79.72c-44.03,0 -79.73,-35.69 -79.73,-79.72c0,-44.03 35.69,-79.73 79.73,-79.73C161.53,37.77 197.23,73.47 197.23,117.5z"/>
+    <path android:fillColor="#352200" android:pathData="M116.97,97.32c-38.84,0 -71.25,11.73 -78.86,27.34c0.63,7.06 2.16,13.86 4.51,20.28c12.15,12.41 40.86,21.13 74.35,21.13c35.18,0 65.08,-9.63 76.06,-23.04c1.76,-5.21 3,-10.67 3.65,-16.3C191.03,110.1 157.5,97.32 116.97,97.32z"/>
+    <path android:fillColor="#737577" android:pathData="M124.72,73.49c-4.95,0 -8.96,1.11 -8.96,2.47v27.34c0,1.37 4.01,2.47 8.96,2.47c4.95,0 8.96,-1.11 8.96,-2.47V75.96C133.68,74.59 129.67,73.49 124.72,73.49z"/>
+    <path android:fillColor="#58595B" android:pathData="M146.75,99.76l-81.78,58.16c14.03,5.07 32.16,8.15 51.99,8.15c0.53,0 1.04,-0.02 1.56,-0.03l45.79,-62.15C158.94,102.21 153.04,100.82 146.75,99.76z"/>
+    <path android:fillColor="#D3D5D6" android:pathData="M102.56,97.31c-4.17,-1.04 -8.56,2.09 -10.85,6.47v11.69l20.66,5.64l10.85,-18.15L102.56,97.31z"/>
+    <path android:fillColor="#58595B" android:pathData="M112.37,121.1v-11.69c2.3,-4.38 6.68,-7.51 10.85,-6.47v10.54L112.37,121.1z"/>
+    <path android:fillColor="#C2C4C6" android:pathData="M91.71,103.78l20.66,5.63l0,11.69l-20.66,-5.63z"/>
+    <path android:fillColor="#D3D5D6" android:pathData="M86.12,104.73c-4.76,-1.19 -9.76,2.38 -12.38,7.38v13.33l23.56,6.43l12.38,-20.7L86.12,104.73z"/>
+    <path android:fillColor="#58595B" android:pathData="M97.31,131.87v-13.33c2.62,-5 7.62,-8.57 12.38,-7.38v12.02L97.31,131.87z"/>
+    <path android:fillColor="#C2C4C6" android:pathData="M73.74,112.11l23.56,6.43l0,13.33l-23.56,-6.43z"/>
+    <path android:fillColor="#D3D5D6" android:pathData="M67.62,113.46c-5.21,-1.3 -10.68,2.6 -13.54,8.07v14.58l25.78,7.03l13.54,-22.66L67.62,113.46z"/>
+    <path android:fillColor="#58595B" android:pathData="M79.86,143.15v-14.58c2.87,-5.47 8.33,-9.38 13.54,-8.07v13.15L79.86,143.15z"/>
+    <path android:fillColor="#C2C4C6" android:pathData="M54.08,121.53l25.78,7.03l0,14.58l-25.78,-7.03z"/>
+    <path android:fillColor="#D3D5D6" android:pathData="M126.56,80.3l3.47,-9.3l-20.79,-2.21l4.23,9.75z"/>
+    <path android:fillColor="#58595B" android:pathData="M130.03,71l10.42,-2.21l-4.56,8.64l-9.33,2.88z"/>
+    <path android:fillColor="#3D3D3E" android:pathData="M109.25,68.78l4.23,-6.2l11.21,-1.55l11.21,1.33l4.56,6.42l-10.42,2.21z"/>
+    <path android:fillColor="#8FBDCF" android:pathData="M109.68,69.78l20.04,2.06l-1.72,4.6l-16.26,-1.89z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M114.65,150.51c0,-0.85 2.97,-3.84 6.1,-5.21s13.54,-5.4 13.54,-5.4l0.39,-1.63c0,0 -1.69,1.17 -2.34,0.78l-0.72,-1.37l3.58,-1.82l0.85,-5.08l-2.28,0.65l-0.65,-1.43l3.26,-1.43l1.04,-5.86c0,0 0.39,-0.59 1.69,-0.72l0.46,5.27l1.3,6.7l1.37,2.87c0,0 14.97,-5.66 16.54,-5.99l1.43,-1.3v-4.43l1.11,-0.98l1.11,2.73l2.8,-3.06l2.41,-0.72l-3.65,6.05l1.37,-0.06c0,0 0.33,0.19 0.19,0.65l-1.21,0.98l7.14,2.8c-0.91,0.91 -2.86,0.39 -9.44,-1.17c-2.6,2.54 -10.16,6.31 -13.28,7.36l-3.19,2.21l3.13,2.6l8.72,5.99l9.7,4.88c0,0 -2.6,0.78 -3.38,0.72l-8.66,-3.58c0,0 -3.32,2.34 -5.27,2.8c-0.59,-0.39 -1.17,-1.56 -0.85,-1.89l3.84,-1.89l-7.62,-3.13l-5.86,2.47l-0.85,-1.89l3.58,-1.5l0.06,-0.39l-5.08,-1.89l-3.92,1.03C133.11,146.26 117.74,153.04 114.65,150.51z"/>
+</vector>
diff --git a/app/src/main/res/drawable/round_icon_bridge.xml b/app/src/main/res/drawable/round_icon_bridge.xml
new file mode 100644
index 000000000..c85f8d6e2
--- /dev/null
+++ b/app/src/main/res/drawable/round_icon_bridge.xml
@@ -0,0 +1,16 @@
+<vector android:height="24dp" android:viewportHeight="235.0"
+    android:viewportWidth="235.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#B1B1B1" android:pathData="M0,0h235v235h-235z"/>
+    <path android:fillColor="#E3E3E3" android:pathData="M117.5,18.5c-54.68,0 -99,44.32 -99,99c0,54.67 44.32,99 99,99c54.67,0 99,-44.32 99,-99C216.5,62.83 172.18,18.5 117.5,18.5zM117.5,202.98c-47.21,0 -85.48,-38.27 -85.48,-85.48c0,-47.21 38.27,-85.48 85.48,-85.48c47.21,0 85.48,38.27 85.48,85.48C202.98,164.71 164.71,202.98 117.5,202.98z"/>
+    <path android:fillColor="#EDA33F" android:pathData="M197.23,117.5c0,44.03 -35.69,79.72 -79.73,79.72c-44.03,0 -79.73,-35.69 -79.73,-79.72c0,-44.03 35.69,-79.73 79.73,-79.73C161.53,37.77 197.23,73.47 197.23,117.5z"/>
+    <path android:fillColor="#007F9F" android:pathData="M177.13,170.39c2.87,-3.23 5.47,-6.69 7.79,-10.36c-8.9,-5.09 -35.72,-8.79 -67.42,-8.79s-58.52,3.7 -67.42,8.79c2.32,3.66 4.92,7.13 7.79,10.36c12.51,3.49 34.53,5.81 59.63,5.81C142.6,176.2 164.63,173.88 177.13,170.39z"/>
+    <path android:fillColor="#352200" android:pathData="M184.92,160.03c-3.3,-1.88 -8.69,-9.5 -16.59,-4.96c-3.52,3.34 -5.65,10.88 1.92,16.93c2.52,-0.5 4.84,-1.04 6.89,-1.61C180,167.16 182.6,163.7 184.92,160.03z"/>
+    <path android:fillColor="#352200" android:pathData="M57.87,170.39c1.66,0.46 3.5,0.9 5.48,1.32c6.82,-5.86 4.9,-12.97 1.58,-16.31c-6.78,-4.16 -11.81,2.89 -14.84,4.63C52.4,163.7 55,167.16 57.87,170.39z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M87.14,166.72a9.17,2.73 0,1 0,18.33 0a9.17,2.73 0,1 0,-18.33 0z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M126.98,166.72a9.17,2.73 0,1 0,18.33 0a9.17,2.73 0,1 0,-18.33 0z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M90.83,158.72c9.95,-0.87 16.01,-2.6 17.31,-6.49c0.87,3.89 9.35,5.62 15.06,6.49c-10.73,0.44 -12.63,0.51 -15.06,-1.51C106.41,159.37 97.33,159.15 90.83,158.72z"/>
+    <path android:fillColor="#58595B" android:pathData="M39.45,101.2L39.45,101.2c-1.09,5.26 -1.67,10.71 -1.67,16.3c0,18.24 6.14,35.05 16.45,48.48c0.54,0.05 1.1,0.07 1.67,0.07c3.78,0 6.84,-1.04 6.84,-2.33v-34.26c0,-7.55 6.12,-13.66 13.66,-13.66s13.66,6.12 13.66,13.66v37.26c0,0.79 2.76,1.43 6.17,1.43s6.17,-0.64 6.17,-1.43v-37.26c0,-7.55 6.12,-13.66 13.66,-13.66s13.66,6.12 13.66,13.66v37.26c0,0.79 2.76,1.43 6.17,1.43s6.17,-0.64 6.17,-1.43v-37.26c0,-7.55 6.12,-13.66 13.66,-13.66s13.66,6.12 13.66,13.66v34.26h0c0,1.29 3.06,2.33 6.84,2.33c2.03,0 3.85,-0.3 5.1,-0.78c9.98,-13.31 15.9,-29.85 15.9,-47.77c0,-5.59 -0.58,-11.04 -1.67,-16.3l0,0H39.45z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M67.93,171.71c9.95,-0.87 16.01,-2.6 17.31,-6.49c0.87,3.89 9.35,5.62 15.06,6.49c-10.73,0.44 -12.63,0.51 -15.06,-1.51C83.51,172.37 74.43,172.15 67.93,171.71z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M129.13,171.71c9.95,-0.87 16.01,-2.6 17.31,-6.49c0.87,3.89 9.35,5.62 15.06,6.49c-10.73,0.44 -12.63,0.51 -15.06,-1.51C144.7,172.37 135.62,172.15 129.13,171.71z"/>
+    <path android:fillColor="#3D3D3E" android:pathData="M194.07,95.28H40.94c-0.56,1.95 -1.07,3.91 -1.49,5.92v0h156.1C195.14,99.2 194.63,97.23 194.07,95.28z"/>
+</vector>
diff --git a/app/src/main/res/drawable/round_icon_church.xml b/app/src/main/res/drawable/round_icon_church.xml
new file mode 100644
index 000000000..e861822d1
--- /dev/null
+++ b/app/src/main/res/drawable/round_icon_church.xml
@@ -0,0 +1,15 @@
+<vector android:height="24dp" android:viewportHeight="235.0"
+    android:viewportWidth="235.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#B1B1B1" android:pathData="M0,0h235v235h-235z"/>
+    <path android:fillColor="#E3E3E3" android:pathData="M117.5,18.5c-54.68,0 -99,44.32 -99,99c0,54.67 44.32,99 99,99c54.67,0 99,-44.32 99,-99C216.5,62.83 172.18,18.5 117.5,18.5zM117.5,202.98c-47.21,0 -85.48,-38.27 -85.48,-85.48c0,-47.21 38.27,-85.48 85.48,-85.48c47.21,0 85.48,38.27 85.48,85.48C202.98,164.71 164.71,202.98 117.5,202.98z"/>
+    <path android:fillColor="#EDA33F" android:pathData="M197.23,117.5c0,44.03 -35.69,79.72 -79.73,79.72c-44.03,0 -79.73,-35.69 -79.73,-79.72c0,-44.03 35.69,-79.73 79.73,-79.73C161.53,37.77 197.23,73.47 197.23,117.5z"/>
+    <path android:fillColor="#FF000000" android:pathData="M66.97,166.68a50.53,7.7 0,1 0,101.06 0a50.53,7.7 0,1 0,-101.06 0z"/>
+    <path android:fillColor="#D3D5D6" android:pathData="M128.66,111.79V68.27l-11.16,-8.2l-11.16,8.2v43.52l-32.12,15.77v39.12H117.5h43.29v-39.12L128.66,111.79zM109.36,87.07V71.21l8.14,-4.84l8.14,4.84v15.86H109.36z"/>
+    <path android:fillColor="#352200" android:pathData="M122.1,73.07c-0.39,-2.45 -1.87,-3.86 -4.6,-3.86s-4.22,1.41 -4.6,3.86c-0.36,2.3 0.08,7.21 -2.45,9.01h5.48c0,0.87 0.7,1.57 1.57,1.57s1.57,-0.7 1.57,-1.57h5.48C122.02,80.28 122.46,75.36 122.1,73.07z"/>
+    <path android:fillColor="#352200" android:pathData="M117.5,135.68c-5.39,0 -9.76,4.37 -9.76,9.76v21.24h19.52v-21.24C127.26,140.05 122.89,135.68 117.5,135.68z"/>
+    <path android:fillColor="#352200" android:pathData="M106.34,109.79l0,5.57l-35.88,17.32l0,-5.63z"/>
+    <path android:fillColor="#352200" android:pathData="M128.68,109.79l0,5.57l35.88,17.32l0,-5.63z"/>
+    <path android:fillColor="#8FBDCF" android:pathData="M91.51,137.17c-2.35,0 -4.25,1.6 -4.25,3.57v16.62h8.51v-16.62C95.76,138.77 93.86,137.17 91.51,137.17z"/>
+    <path android:fillColor="#8FBDCF" android:pathData="M144.11,137.17c-2.35,0 -4.25,1.6 -4.25,3.57v16.62h8.51v-16.62C148.36,138.77 146.46,137.17 144.11,137.17z"/>
+    <path android:fillColor="#352200" android:pathData="M117.5,55.07l-12.66,9.48l0,4.98l12.66,-9.46l12.66,9.46l0,-4.98z"/>
+</vector>
diff --git a/app/src/main/res/drawable/round_icon_city.xml b/app/src/main/res/drawable/round_icon_city.xml
new file mode 100644
index 000000000..6723ab959
--- /dev/null
+++ b/app/src/main/res/drawable/round_icon_city.xml
@@ -0,0 +1,34 @@
+<vector android:height="24dp" android:viewportHeight="235.0"
+    android:viewportWidth="235.001" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#B1B1B1" android:pathData="M0,0h235v235h-235z"/>
+    <path android:fillColor="#E3E3E3" android:pathData="M117.5,18.5c-54.67,0 -99,44.32 -99,99c0,54.67 44.32,99 99,99c54.67,0 99,-44.32 99,-99C216.5,62.83 172.18,18.5 117.5,18.5zM117.5,202.98c-47.21,0 -85.48,-38.27 -85.48,-85.48c0,-47.21 38.27,-85.48 85.48,-85.48s85.48,38.27 85.48,85.48C202.98,164.71 164.71,202.98 117.5,202.98z"/>
+    <path android:fillColor="#EDA33F" android:pathData="M117.5,117.5m-79.73,0a79.73,79.73 0,1 1,159.45 0a79.73,79.73 0,1 1,-159.45 0"/>
+    <path android:fillColor="#FF000000" android:pathData="M49.31,154.69a68.19,8.86 0,1 0,136.39 0a68.19,8.86 0,1 0,-136.39 0z"/>
+    <path android:fillColor="#3D3D3E" android:pathData="M70.94,101.13h59.9v44.62h-59.9z"/>
+    <path android:fillColor="#3D3D3E" android:pathData="M139.69,82h22.92v58.97h-22.92z"/>
+    <path android:fillColor="#58595B" android:pathData="M174.06,154.69l-114.58,0l0,-43.31l23.96,0l0,24.98l4.69,0l0,-59.56l12.5,-12.5l13.02,12.5l0,64.58l10.42,0l0,-21.35l20.83,0l0,-14.73l29.17,0z"/>
+    <path android:fillColor="#8FBDCF" android:pathData="M89.43,80.7h6.25v9.64h-6.25z"/>
+    <path android:fillColor="#8FBDCF" android:pathData="M97.76,80.7h6.25v9.64h-6.25z"/>
+    <path android:fillColor="#8FBDCF" android:pathData="M105.83,80.7h6.25v9.64h-6.25z"/>
+    <path android:fillColor="#8FBDCF" android:pathData="M89.43,92.68h6.25v9.64h-6.25z"/>
+    <path android:fillColor="#8FBDCF" android:pathData="M97.76,92.68h6.25v9.64h-6.25z"/>
+    <path android:fillColor="#8FBDCF" android:pathData="M105.83,92.68h6.25v9.64h-6.25z"/>
+    <path android:fillColor="#8FBDCF" android:pathData="M89.43,104.68h6.25v9.64h-6.25z"/>
+    <path android:fillColor="#8FBDCF" android:pathData="M97.76,104.68h6.25v9.64h-6.25z"/>
+    <path android:fillColor="#8FBDCF" android:pathData="M105.83,104.68h6.25v9.64h-6.25z"/>
+    <path android:fillColor="#8FBDCF" android:pathData="M89.43,143.09h6.25v9.64h-6.25z"/>
+    <path android:fillColor="#8FBDCF" android:pathData="M97.76,143.09h6.25v9.64h-6.25z"/>
+    <path android:fillColor="#8FBDCF" android:pathData="M105.83,143.09h6.25v9.64h-6.25z"/>
+    <path android:fillColor="#8FBDCF" android:pathData="M60.13,124.86h6.25v9.64h-6.25z"/>
+    <path android:fillColor="#8FBDCF" android:pathData="M68.46,124.86h6.25v9.64h-6.25z"/>
+    <path android:fillColor="#8FBDCF" android:pathData="M76.54,124.86h6.25v9.64h-6.25z"/>
+    <path android:fillColor="#8FBDCF" android:pathData="M148.02,108.06h6.25v9.64h-6.25z"/>
+    <path android:fillColor="#8FBDCF" android:pathData="M156.35,108.06h6.25v9.64h-6.25z"/>
+    <path android:fillColor="#8FBDCF" android:pathData="M164.43,108.06h6.25v9.64h-6.25z"/>
+    <path android:fillColor="#8FBDCF" android:pathData="M148.02,120.04h6.25v9.64h-6.25z"/>
+    <path android:fillColor="#8FBDCF" android:pathData="M156.35,120.04h6.25v9.64h-6.25z"/>
+    <path android:fillColor="#8FBDCF" android:pathData="M164.43,120.04h6.25v9.64h-6.25z"/>
+    <path android:fillColor="#8FBDCF" android:pathData="M148.02,143.09h6.25v9.64h-6.25z"/>
+    <path android:fillColor="#8FBDCF" android:pathData="M156.35,143.09h6.25v9.64h-6.25z"/>
+    <path android:fillColor="#8FBDCF" android:pathData="M164.43,143.09h6.25v9.64h-6.25z"/>
+</vector>
diff --git a/app/src/main/res/drawable/round_icon_forest.xml b/app/src/main/res/drawable/round_icon_forest.xml
new file mode 100644
index 000000000..c735354bb
--- /dev/null
+++ b/app/src/main/res/drawable/round_icon_forest.xml
@@ -0,0 +1,17 @@
+<vector android:height="24dp" android:viewportHeight="112.8"
+    android:viewportWidth="112.8" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#B1B1B1" android:pathData="M0,0h112.8v112.8h-112.8z"/>
+    <path android:fillColor="#E3E3E3" android:pathData="M56.4,8.88c-26.24,0 -47.52,21.28 -47.52,47.52c0,26.24 21.27,47.52 47.52,47.52c26.25,0 47.52,-21.28 47.52,-47.52C103.92,30.16 82.64,8.88 56.4,8.88zM56.4,97.43c-22.66,0 -41.03,-18.37 -41.03,-41.03c0,-22.66 18.37,-41.03 41.03,-41.03c22.66,0 41.03,18.37 41.03,41.03C97.43,79.06 79.06,97.43 56.4,97.43z"/>
+    <path android:fillColor="#54B948" android:pathData="M56.4,56.73m-38.27,0a38.27,38.27 0,1 1,76.54 0a38.27,38.27 0,1 1,-76.54 0"/>
+    <path android:fillColor="#352200" android:pathData="M28.6,69.79a27.8,10.31 0,1 0,55.6 0a27.8,10.31 0,1 0,-55.6 0z"/>
+    <path android:fillColor="#5E4319" android:pathData="M35.3,59.23v5.5c0,0.63 1.09,1.15 2.43,1.15c1.34,0 2.43,-0.52 2.43,-1.15v-5.5H35.3z"/>
+    <path android:fillColor="#295F2F" android:pathData="M43.46,54.67h2.61l-3.55,-5.23h2.27l-3.67,-4.95h2.2l-3.85,-5.23l1.6,0.69l-3.38,-7.01l-3.38,7.01l1.6,-0.69l-3.85,5.23h2.2l-3.67,4.95h2.27l-3.55,5.23h2.61l-3.16,5.72c4.95,1.02 4.68,1.29 8.94,1.29s3.99,-0.28 8.94,-1.29L43.46,54.67z"/>
+    <path android:fillColor="#5E4319" android:pathData="M54.55,57.03v5.5c0,0.63 1.09,1.15 2.43,1.15c1.34,0 2.43,-0.52 2.43,-1.15v-5.5H54.55z"/>
+    <path android:fillColor="#295F2F" android:pathData="M62.71,52.47h2.61l-3.55,-5.22h2.27l-3.67,-4.95h2.2l-3.85,-5.23l1.6,0.69l-3.38,-7.01l-3.38,7.01l1.6,-0.69l-3.85,5.23h2.2l-3.67,4.95h2.27l-3.55,5.22h2.61l-3.16,5.72c4.95,1.02 4.68,1.29 8.94,1.29s3.99,-0.28 8.94,-1.29L62.71,52.47z"/>
+    <path android:fillColor="#5E4319" android:pathData="M74.35,59.23v5.5c0,0.63 1.09,1.15 2.43,1.15s2.43,-0.52 2.43,-1.15v-5.5H74.35z"/>
+    <path android:fillColor="#295F2F" android:pathData="M82.51,54.67h2.61l-3.55,-5.23h2.27l-3.67,-4.95h2.2l-3.85,-5.23l1.6,0.69l-3.38,-7.01l-3.38,7.01l1.6,-0.69l-3.85,5.23h2.2l-3.67,4.95h2.27l-3.55,5.23h2.61l-3.16,5.72c4.95,1.02 4.68,1.29 8.94,1.29s3.99,-0.28 8.94,-1.29L82.51,54.67z"/>
+    <path android:fillColor="#5E4319" android:pathData="M65.96,67.34v5.5c0,0.63 1.09,1.15 2.43,1.15c1.34,0 2.43,-0.52 2.43,-1.15v-5.5H65.96z"/>
+    <path android:fillColor="#295F2F" android:pathData="M74.12,62.78h2.61l-3.55,-5.22h2.27l-3.67,-4.95h2.2l-3.85,-5.23l1.6,0.69l-3.38,-7.01l-3.38,7.01l1.6,-0.69l-3.85,5.23h2.2l-3.67,4.95h2.27l-3.55,5.22h2.61l-3.16,5.72c4.95,1.02 4.68,1.29 8.94,1.29c4.26,0 3.99,-0.28 8.94,-1.29L74.12,62.78z"/>
+    <path android:fillColor="#5E4319" android:pathData="M40.8,69.04v5.5c0,0.63 1.09,1.15 2.43,1.15c1.34,0 2.43,-0.52 2.43,-1.15v-5.5H40.8z"/>
+    <path android:fillColor="#295F2F" android:pathData="M48.96,64.49h2.61l-3.55,-5.23h2.27l-3.67,-4.95h2.2l-3.85,-5.23l1.6,0.69l-3.38,-7.01l-3.38,7.01l1.6,-0.69l-3.85,5.23h2.2l-3.67,4.95h2.27l-3.55,5.23h2.61l-3.16,5.72c4.95,1.02 4.68,1.29 8.94,1.29s3.99,-0.28 8.94,-1.29L48.96,64.49z"/>
+</vector>
diff --git a/app/src/main/res/drawable/round_icon_gatehouse.xml b/app/src/main/res/drawable/round_icon_gatehouse.xml
new file mode 100644
index 000000000..8c282ac82
--- /dev/null
+++ b/app/src/main/res/drawable/round_icon_gatehouse.xml
@@ -0,0 +1,17 @@
+<vector android:height="24dp" android:viewportHeight="235.0"
+    android:viewportWidth="235.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#B1B1B1" android:pathData="M0,0h235v235h-235z"/>
+    <path android:fillColor="#E3E3E3" android:pathData="M117.5,18.5c-54.68,0 -99,44.32 -99,99c0,54.67 44.32,99 99,99c54.67,0 99,-44.32 99,-99C216.5,62.83 172.18,18.5 117.5,18.5zM117.5,202.98c-47.21,0 -85.48,-38.27 -85.48,-85.48c0,-47.21 38.27,-85.48 85.48,-85.48c47.21,0 85.48,38.27 85.48,85.48C202.98,164.71 164.71,202.98 117.5,202.98z"/>
+    <path android:fillColor="#EDA33F" android:pathData="M197.23,117.5c0,44.03 -35.69,79.72 -79.73,79.72c-44.03,0 -79.73,-35.69 -79.73,-79.72c0,-44.03 35.69,-79.73 79.73,-79.73C161.53,37.77 197.23,73.47 197.23,117.5z"/>
+    <path android:fillColor="#FF000000" android:pathData="M56.94,153.5a60.56,8.91 0,1 0,121.12 0a60.56,8.91 0,1 0,-121.12 0z"/>
+    <path android:fillColor="#FF000000" android:pathData="M106.15,126.28h2.5l1.2,2l1.3,-2h2.5l1.29,2l1.21,-2h2.5l1.33,2l1.17,-2h2.5l1.25,2l1.25,-2h2.5l1.2,2v-9.95h-24.7v9.95L106.15,126.28zM108.65,124.74h-2.5v-2h2.5V124.74zM108.65,121.32h-2.5v-2h2.5V121.32zM113.65,124.74h-2.5v-2h2.5V124.74zM113.65,121.32h-2.5v-2h2.5V121.32zM118.65,124.74h-2.5v-2h2.5V124.74zM118.65,121.32h-2.5v-2h2.5V121.32zM123.65,124.74h-2.5v-2h2.5V124.74zM123.65,121.32h-2.5v-2h2.5V121.32zM128.65,124.74h-2.5v-2h2.5V124.74zM128.65,121.32h-2.5v-2h2.5V121.32z"/>
+    <path android:fillColor="#58595B" android:pathData="M97.7,153.5l-36.59,0l0,-59.09l-1.76,-2.16l1.76,-0.56l0,-7.38l5.23,0l0,4.18l5.23,0l0,-4.18l5.23,0l0,4.18l5.23,0l0,-4.18l5.23,0l0,4.18l5.23,0l0,-4.18l5.23,0l0,7.39l1.74,0.56l-1.76,2.16z"/>
+    <path android:fillColor="#58595B" android:pathData="M137.3,153.5l36.59,0l0,-59.09l1.76,-2.16l-1.76,-0.56l0,-7.38l-5.23,0l0,4.18l-5.23,0l0,-4.18l-5.23,0l0,4.18l-5.23,0l0,-4.18l-5.23,0l0,4.18l-5.23,0l0,-4.18l-5.23,0l0,7.39l-1.75,0.56l1.76,2.16z"/>
+    <path android:fillColor="#48484A" android:pathData="M137.3,103.46H97.7v50.04h7.45c0,0 0,-21.62 0,-25.22c0,-3.6 0.24,-4 2.64,-5.6c2.4,-1.6 6.49,-3.84 9.71,-3.84s7.31,2.24 9.71,3.84c2.4,1.6 2.64,2 2.64,5.6c0,3.6 0,25.22 0,25.22h7.45v-50.04H137.3z"/>
+    <path android:fillColor="#FF000000" android:pathData="M81.73,133.99l-5.01,0l0,-14.67l2.5,-3.24l2.5,3.24z"/>
+    <path android:fillColor="#FF000000" android:pathData="M74.89,133.99l-3.51,0l0,-14.67l1.75,-3.24l1.75,3.24z"/>
+    <path android:fillColor="#FF000000" android:pathData="M87.14,133.99l-3.51,0l0,-14.67l1.75,-3.24l1.75,3.24z"/>
+    <path android:fillColor="#FF000000" android:pathData="M158.48,133.99l-5.01,0l0,-14.67l2.5,-3.24l2.5,3.24z"/>
+    <path android:fillColor="#FF000000" android:pathData="M151.65,133.99l-3.51,0l0,-14.67l1.75,-3.24l1.75,3.24z"/>
+    <path android:fillColor="#FF000000" android:pathData="M163.9,133.99l-3.51,0l0,-14.67l1.75,-3.24l1.75,3.24z"/>
+</vector>
diff --git a/app/src/main/res/drawable/round_icon_island.xml b/app/src/main/res/drawable/round_icon_island.xml
new file mode 100644
index 000000000..0f70b5aab
--- /dev/null
+++ b/app/src/main/res/drawable/round_icon_island.xml
@@ -0,0 +1,15 @@
+<vector android:height="24dp" android:viewportHeight="112.801"
+    android:viewportWidth="112.8" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#B1B1B1" android:pathData="M0,0h112.8v112.8h-112.8z"/>
+    <path android:fillColor="#E3E3E3" android:pathData="M56.4,8.88c-26.24,0 -47.52,21.28 -47.52,47.52s21.27,47.52 47.52,47.52c26.25,0 47.52,-21.28 47.52,-47.52S82.64,8.88 56.4,8.88zM56.4,97.43c-22.66,0 -41.03,-18.37 -41.03,-41.03c0,-22.66 18.37,-41.03 41.03,-41.03c22.66,0 41.03,18.37 41.03,41.03C97.43,79.06 79.06,97.43 56.4,97.43z"/>
+    <path android:fillColor="#54B948" android:pathData="M56.4,56.73m-38.27,0a38.27,38.27 0,1 1,76.54 0a38.27,38.27 0,1 1,-76.54 0"/>
+    <path android:fillColor="#007F9F" android:pathData="M18.13,56.73c0,21.13 17.13,38.27 38.27,38.27c21.14,0 38.27,-17.13 38.27,-38.27c0,-4.1 -0.65,-8.03 -1.84,-11.73H19.97C18.78,48.7 18.13,52.64 18.13,56.73z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M36.54,55.98c6.38,-0.55 10.26,-1.66 11.1,-4.16c0.56,2.5 5.99,3.61 9.65,4.16c-6.88,0.28 -8.1,0.33 -9.65,-0.97C46.52,56.39 40.7,56.25 36.54,55.98z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M26.13,69.86c6.88,-0.6 11.06,-1.79 11.96,-4.48c0.6,2.69 6.46,3.88 10.4,4.48c-7.41,0.3 -8.72,0.35 -10.4,-1.05C36.89,70.32 30.61,70.17 26.13,69.86z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M67.29,66.01c6.88,-0.6 11.06,-1.79 11.96,-4.48c0.6,2.69 6.46,3.89 10.41,4.48c-7.42,0.3 -8.73,0.35 -10.41,-1.05C78.06,66.47 71.78,66.32 67.29,66.01z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M59.68,76.58c7.61,-0.66 12.25,-1.99 13.24,-4.96c0.66,2.98 7.15,4.3 11.52,4.96c-8.21,0.33 -9.66,0.39 -11.52,-1.16C71.6,77.07 64.65,76.91 59.68,76.58z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M44.02,76.58c7.61,-0.66 12.24,-1.99 13.24,-4.96c0.66,2.98 7.15,4.3 11.52,4.96c-8.21,0.33 -9.66,0.39 -11.52,-1.16C55.94,77.07 48.99,76.91 44.02,76.58z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M34.93,85.93c7.61,-0.66 12.24,-1.98 13.24,-4.96c0.66,2.98 7.15,4.3 11.52,4.96c-8.21,0.33 -9.66,0.39 -11.52,-1.16C46.84,86.43 39.89,86.26 34.93,85.93z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M30.91,57.15c-3.19,0.26 -6.82,2.44 0.73,3.31c7.55,0.87 7.97,0.77 12.62,0.74c4.66,-0.03 16.54,0.74 20.89,0s12.81,-2.43 7.71,-3.4C67.77,56.83 30.91,57.15 30.91,57.15z"/>
+    <path android:fillColor="#352200" android:pathData="M72.06,58.23c-2.44,-6.36 -5.5,-8.98 -12.38,-9.59c-6.88,-0.6 -7.56,-11.97 -7.56,-11.97l-6.46,-4.77l-4.86,8.07c0,0 -1.91,8.62 -5.5,10.74c-3.59,2.12 -4.86,7.51 -4.86,7.51s8.99,2.34 20.81,2.34S72.06,58.23 72.06,58.23z"/>
+</vector>
diff --git a/app/src/main/res/drawable/round_icon_milestone.xml b/app/src/main/res/drawable/round_icon_milestone.xml
new file mode 100644
index 000000000..b105ea3cd
--- /dev/null
+++ b/app/src/main/res/drawable/round_icon_milestone.xml
@@ -0,0 +1,13 @@
+<vector android:height="24dp" android:viewportHeight="235.0"
+    android:viewportWidth="235.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#B1B1B1" android:pathData="M0,0h235v235h-235z"/>
+    <path android:fillColor="#E3E3E3" android:pathData="M117.5,18.5c-54.68,0 -99,44.32 -99,99c0,54.67 44.32,99 99,99c54.67,0 99,-44.32 99,-99C216.5,62.83 172.18,18.5 117.5,18.5zM117.5,202.98c-47.21,0 -85.48,-38.27 -85.48,-85.48c0,-47.21 38.27,-85.48 85.48,-85.48s85.48,38.27 85.48,85.48S164.71,202.98 117.5,202.98z"/>
+    <path android:fillColor="#EDA33F" android:pathData="M197.23,117.5c0,44.03 -35.69,79.72 -79.73,79.72c-44.03,0 -79.73,-35.69 -79.73,-79.72c0,-44.03 35.69,-79.73 79.73,-79.73C161.53,37.77 197.23,73.47 197.23,117.5z"/>
+    <path android:fillColor="#FF000000" android:pathData="M73.27,163.84a44.23,6.61 0,1 0,88.46 0a44.23,6.61 0,1 0,-88.46 0z"/>
+    <path android:fillColor="#58595B" android:pathData="M114,62.05c-15.77,0 -28.56,12.79 -28.56,28.56v73.22h57.12V90.61C142.56,74.84 129.77,62.05 114,62.05z"/>
+    <path android:fillColor="#FFF200" android:pathData="M121,90.61m-28.56,0a28.56,28.56 0,1 1,57.12 0a28.56,28.56 0,1 1,-57.12 0"/>
+    <path android:fillColor="#D3D5D6" android:pathData="M92.44,90.61h57.12v73.22h-57.12z"/>
+    <path android:fillColor="#FF000000" android:pathData="M109,125.81l3.29,0.34v1.21h-10.63v-1.21l3.27,-0.34v-14.25l-3.26,1.07v-1.2l5.33,-3.13h2V125.81z"/>
+    <path android:fillColor="#FF000000" android:pathData="M127.12,117.83c0,6.54 -2.07,9.81 -6.2,9.81c-1.99,0 -3.5,-0.84 -4.51,-2.51s-1.52,-4.11 -1.52,-7.3c0,-3.13 0.51,-5.52 1.52,-7.18c1.01,-1.66 2.56,-2.49 4.63,-2.49c1.99,0 3.51,0.82 4.54,2.46C126.6,112.26 127.12,114.66 127.12,117.83zM122.99,117.83c0,-2.93 -0.16,-5.04 -0.49,-6.32s-0.85,-1.92 -1.55,-1.92c-0.7,0 -1.19,0.62 -1.49,1.86s-0.44,3.37 -0.44,6.39c0,3.06 0.15,5.23 0.45,6.5c0.3,1.27 0.79,1.9 1.48,1.9c0.69,0 1.21,-0.65 1.54,-1.95C122.82,122.98 122.99,120.82 122.99,117.83z"/>
+    <path android:fillColor="#FF000000" android:pathData="M141.56,117.83c0,6.54 -2.07,9.81 -6.2,9.81c-1.99,0 -3.5,-0.84 -4.51,-2.51c-1.01,-1.67 -1.52,-4.11 -1.52,-7.3c0,-3.13 0.51,-5.52 1.52,-7.18c1.02,-1.66 2.56,-2.49 4.63,-2.49c1.99,0 3.51,0.82 4.54,2.46C141.04,112.26 141.56,114.66 141.56,117.83zM137.43,117.83c0,-2.93 -0.16,-5.04 -0.49,-6.32s-0.85,-1.92 -1.55,-1.92c-0.7,0 -1.19,0.62 -1.49,1.86s-0.44,3.37 -0.44,6.39c0,3.06 0.15,5.23 0.45,6.5c0.3,1.27 0.79,1.9 1.48,1.9c0.69,0 1.21,-0.65 1.54,-1.95C137.26,122.98 137.43,120.82 137.43,117.83z"/>
+</vector>
diff --git a/app/src/main/res/drawable/round_icon_mountain.xml b/app/src/main/res/drawable/round_icon_mountain.xml
new file mode 100644
index 000000000..1551ede7f
--- /dev/null
+++ b/app/src/main/res/drawable/round_icon_mountain.xml
@@ -0,0 +1,16 @@
+<vector android:height="24dp" android:viewportHeight="235.0"
+    android:viewportWidth="235.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#B1B1B1" android:pathData="M0,0h235v235h-235z"/>
+    <path android:fillColor="#E3E3E3" android:pathData="M117.5,18.5c-54.67,0 -99,44.32 -99,99c0,54.67 44.32,99 99,99c54.68,0 99,-44.33 99,-99C216.5,62.83 172.18,18.5 117.5,18.5zM117.5,202.98c-47.21,0 -85.48,-38.27 -85.48,-85.48c0,-47.21 38.27,-85.48 85.48,-85.48c47.21,0 85.48,38.27 85.48,85.48C202.98,164.71 164.71,202.98 117.5,202.98z"/>
+    <path android:fillColor="#54B948" android:pathData="M117.5,118.19m-79.73,0a79.73,79.73 0,1 1,159.45 0a79.73,79.73 0,1 1,-159.45 0"/>
+    <path android:fillColor="#FF000000" android:pathData="M54.44,151.1a62.06,8.91 0,1 0,124.12 0a62.06,8.91 0,1 0,-124.12 0z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M114.52,69.93c0,-1.89 2.97,-3.42 6.64,-3.42c0.11,0 0.22,0.01 0.33,0.01c1.12,-0.8 2.95,-1.33 5.03,-1.33c3.2,0 5.84,1.25 6.15,2.85c0.28,-0.01 0.56,-0.02 0.85,-0.02c5,0 9.06,1.47 9.31,3.32c1.11,0.57 1.77,1.26 1.77,2.01c0,1.93 -4.36,3.5 -9.75,3.5c-2.34,0 -4.49,-0.3 -6.17,-0.79c-1.15,0.49 -2.74,0.79 -4.5,0.79c-3.5,0 -6.33,-1.19 -6.33,-2.67c0,-0.41 0.22,-0.79 0.61,-1.13C116.14,72.53 114.52,71.33 114.52,69.93z"/>
+    <path android:fillColor="#58595B" android:pathData="M169.81,152.11l-4.33,-17.71l-9.15,-6.04l-10.93,-27.31c-2.66,-0.59 -7.97,-4.45 -8.86,-7.42L125.9,74.64l-8.27,-5.05l-3.25,8.31l-9.16,8.61c-0.3,3.86 -5.61,14.25 -9.75,16.33c0,0 -5.91,-4.16 -6.2,-6.53c0,0 -5.32,9.5 -5.91,13.36c0,0 -3.84,18.11 -7.97,20.18l-12.5,19.89c7.68,4.06 17.33,5.44 26.39,5.44c9.06,0 30.32,-3.37 38.79,-3.37C136.53,151.81 148.54,155.97 169.81,152.11z"/>
+    <path android:fillColor="#3D3D3E" android:pathData="M91.81,112.39c2.46,3.63 7.66,6.71 9.13,10.27c-1.14,-3.39 -5.86,-17.66 -5.46,-19.82c0,0 -5.91,-4.16 -6.2,-6.53C89.19,100.26 89.19,108.51 91.81,112.39z"/>
+    <path android:fillColor="#3D3D3E" android:pathData="M133.56,96.39c1.97,1.31 9.58,14.2 17.23,18.16l-5.4,-13.49c-2.66,-0.59 -7.97,-4.45 -8.86,-7.42L125.9,74.64l-8.27,-5.05l6.18,8.67C123.81,78.26 131.31,94.89 133.56,96.39z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M118.45,72.09l-2.24,7.09l-7.47,6.72c3.41,2.24 7.58,2.35 10.78,2.24c3.2,-0.11 8.22,-0.43 10.35,-1.71l-6.08,-10.46L118.45,72.09z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M89.38,99.62c-0.9,2.11 -3.32,6.22 -3.32,8.32c0,0 2.24,0.63 4.02,0L89.38,99.62z"/>
+    <path android:fillColor="#3D3D3E" android:pathData="M103.89,124.51c2.67,2.83 9,5.67 9.5,9.17s5.92,12.17 5.92,12.17s-3.42,0.83 -5.92,-0.83S103.89,124.51 103.89,124.51z"/>
+    <path android:fillColor="#3D3D3E" android:pathData="M147.23,126.34c2.67,2 9.67,5.83 9.67,5.83l4.33,18c0,0 -2.33,1.17 -3.83,0.92S147.23,126.34 147.23,126.34z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M102.88,78.25c0,-1.89 -2.97,-3.42 -6.64,-3.42c-0.11,0 -0.22,0.01 -0.33,0.01c-1.12,-0.8 -2.95,-1.33 -5.03,-1.33c-3.2,0 -5.84,1.25 -6.15,2.85c-0.28,-0.01 -0.56,-0.02 -0.85,-0.02c-5,0 -9.06,1.47 -9.31,3.32c-1.11,0.57 -1.77,1.26 -1.77,2.01c0,1.93 4.36,3.5 9.75,3.5c2.34,0 4.49,-0.3 6.17,-0.79c1.15,0.49 2.74,0.79 4.5,0.79c3.5,0 6.33,-1.19 6.33,-2.67c0,-0.41 -0.22,-0.79 -0.61,-1.13C101.26,80.84 102.88,79.65 102.88,78.25z"/>
+</vector>
diff --git a/app/src/main/res/drawable/round_icon_ocean.xml b/app/src/main/res/drawable/round_icon_ocean.xml
new file mode 100644
index 000000000..22b903104
--- /dev/null
+++ b/app/src/main/res/drawable/round_icon_ocean.xml
@@ -0,0 +1,15 @@
+<vector android:height="24dp" android:viewportHeight="112.8"
+    android:viewportWidth="112.8" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#B1B1B1" android:pathData="M0,0h112.8v112.8h-112.8z"/>
+    <path android:fillColor="#E3E3E3" android:pathData="M56.4,8.88c-26.24,0 -47.52,21.27 -47.52,47.52c0,26.24 21.27,47.52 47.52,47.52c26.25,0 47.52,-21.28 47.52,-47.52C103.92,30.16 82.64,8.88 56.4,8.88zM56.4,97.43c-22.66,0 -41.03,-18.37 -41.03,-41.03s18.37,-41.03 41.03,-41.03c22.66,0 41.03,18.37 41.03,41.03S79.06,97.43 56.4,97.43z"/>
+    <path android:fillColor="#54B948" android:pathData="M56.4,56.73m-38.27,0a38.27,38.27 0,1 1,76.54 0a38.27,38.27 0,1 1,-76.54 0"/>
+    <path android:fillColor="#007F9F" android:pathData="M18.13,56.73c0,21.14 17.13,38.27 38.27,38.27c21.14,0 38.27,-17.13 38.27,-38.27c0,-4.09 -0.65,-8.03 -1.84,-11.73H19.97C18.78,48.7 18.13,52.64 18.13,56.73z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M22.55,55.98c6.38,-0.55 10.26,-1.66 11.1,-4.16c0.56,2.5 5.99,3.61 9.65,4.16c-6.88,0.28 -8.1,0.33 -9.65,-0.97C32.54,56.39 26.71,56.25 22.55,55.98z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M36.54,55.98c6.38,-0.55 10.26,-1.66 11.1,-4.16c0.56,2.5 5.99,3.61 9.65,4.16c-6.88,0.28 -8.1,0.33 -9.65,-0.97C46.52,56.39 40.7,56.25 36.54,55.98z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M58.4,53.95c6.45,-0.56 10.38,-1.68 11.22,-4.21c0.56,2.53 6.06,3.65 9.77,4.21c-6.96,0.28 -8.19,0.33 -9.77,-0.98C68.5,54.38 62.61,54.24 58.4,53.95z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M30.53,67.66c6.88,-0.6 11.06,-1.79 11.96,-4.48c0.6,2.69 6.46,3.88 10.4,4.48c-7.41,0.3 -8.72,0.35 -10.4,-1.05C41.29,68.11 35.01,67.96 30.53,67.66z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M66.19,63.81c6.88,-0.6 11.06,-1.79 11.96,-4.48c0.6,2.69 6.46,3.89 10.41,4.48c-7.42,0.3 -8.73,0.35 -10.41,-1.05C76.96,64.26 70.68,64.11 66.19,63.81z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M59.68,76.57c7.61,-0.66 12.25,-1.99 13.24,-4.96c0.66,2.98 7.15,4.3 11.52,4.96c-8.21,0.33 -9.66,0.39 -11.52,-1.16C71.6,77.07 64.65,76.91 59.68,76.57z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M44.02,76.57c7.61,-0.66 12.24,-1.99 13.24,-4.96c0.66,2.98 7.15,4.3 11.52,4.96c-8.21,0.33 -9.66,0.39 -11.52,-1.16C55.94,77.07 48.99,76.91 44.02,76.57z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M34.93,87.03c7.61,-0.66 12.24,-1.99 13.24,-4.96c0.66,2.98 7.15,4.3 11.52,4.96c-8.21,0.33 -9.66,0.39 -11.52,-1.16C46.84,87.52 39.89,87.36 34.93,87.03z"/>
+</vector>
diff --git a/app/src/main/res/drawable/round_icon_park.xml b/app/src/main/res/drawable/round_icon_park.xml
new file mode 100644
index 000000000..877c5fcd4
--- /dev/null
+++ b/app/src/main/res/drawable/round_icon_park.xml
@@ -0,0 +1,17 @@
+<vector android:height="24dp" android:viewportHeight="235.0"
+    android:viewportWidth="235.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#B1B1B1" android:pathData="M0,0h235v235h-235z"/>
+    <path android:fillColor="#E3E3E3" android:pathData="M117.5,18.5c-54.68,0 -99,44.32 -99,99c0,54.67 44.32,99 99,99c54.67,0 99,-44.32 99,-99C216.5,62.83 172.18,18.5 117.5,18.5zM117.5,202.98c-47.21,0 -85.48,-38.27 -85.48,-85.48c0,-47.21 38.27,-85.48 85.48,-85.48c47.21,0 85.48,38.27 85.48,85.48C202.98,164.71 164.71,202.98 117.5,202.98z"/>
+    <path android:fillColor="#EDA33F" android:pathData="M197.23,117.5c0,44.03 -35.69,79.72 -79.73,79.72c-44.03,0 -79.73,-35.69 -79.73,-79.72c0,-44.03 35.69,-79.73 79.73,-79.73C161.53,37.77 197.23,73.47 197.23,117.5z"/>
+    <path android:fillColor="#54B948" android:pathData="M50.99,153.38a65.64,7.45 0,1 0,131.28 0a65.64,7.45 0,1 0,-131.28 0z"/>
+    <path android:fillColor="#5E4319" android:pathData="M62.31,139.54v12.89c0,1.49 2.55,2.7 5.69,2.7c3.14,0 5.69,-1.21 5.69,-2.7v-12.89H62.31z"/>
+    <path android:fillColor="#295F2F" android:pathData="M81.43,128.86h6.12l-8.31,-12.24h5.32l-8.6,-11.6h5.16L72.08,92.77l3.74,1.61l-7.93,-16.43l-7.93,16.43l3.74,-1.61l-9.02,12.25h5.16l-8.6,11.6h5.32l-8.31,12.24h6.12l-7.41,13.4c11.6,2.38 10.95,3.03 20.94,3.03s9.35,-0.64 20.95,-3.03L81.43,128.86z"/>
+    <path android:fillColor="#5E4319" android:pathData="M159.72,139.61v12.89c0,1.49 2.55,2.69 5.69,2.69c3.14,0 5.69,-1.21 5.69,-2.69v-12.89H159.72z"/>
+    <path android:fillColor="#295F2F" android:pathData="M178.84,128.93h6.12l-8.31,-12.24h5.32l-8.6,-11.6h5.16l-9.02,-12.25l3.74,1.61l-7.93,-16.43l-7.93,16.43l3.74,-1.61l-9.02,12.25h5.16l-8.6,11.6h5.32l-8.31,12.24h6.12l-7.41,13.4c11.6,2.38 10.95,3.03 20.94,3.03s9.35,-0.64 20.95,-3.03L178.84,128.93z"/>
+    <path android:fillColor="#3D3D3E" android:pathData="M137.08,96.17v54.01c0,0.86 1.47,1.56 3.29,1.56c1.82,0 3.29,-0.7 3.29,-1.56V96.17H137.08z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M140.37,96.17m-7.96,0a7.96,7.96 0,1 1,15.93 0a7.96,7.96 0,1 1,-15.93 0"/>
+    <path android:fillColor="#3D3D3E" android:pathData="M140.37,91.84c2.3,0 4.39,-0.35 5.98,-0.92c-1.46,-1.66 -3.59,-2.71 -5.98,-2.71c-2.38,0 -4.52,1.05 -5.98,2.71C135.98,91.49 138.07,91.84 140.37,91.84z"/>
+    <path android:fillColor="#3D3D3E" android:pathData="M92.95,145.23h4.8v10.6h-4.8z"/>
+    <path android:fillColor="#3D3D3E" android:pathData="M126.86,145.23h4.8v10.6h-4.8z"/>
+    <path android:fillColor="#5E4319" android:pathData="M134.85,138.44v-11.72H91.07l-0.16,11.72l-4.25,6.79h52.74L134.85,138.44zM131.66,137.96H94.3V134.7h37.36V137.96z"/>
+</vector>
diff --git a/app/src/main/res/drawable/round_icon_railway_station.xml b/app/src/main/res/drawable/round_icon_railway_station.xml
new file mode 100644
index 000000000..1c89d2920
--- /dev/null
+++ b/app/src/main/res/drawable/round_icon_railway_station.xml
@@ -0,0 +1,26 @@
+<vector android:height="24dp" android:viewportHeight="235.0"
+    android:viewportWidth="235.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#B1B1B1" android:pathData="M0,0h235v235h-235z"/>
+    <path android:fillColor="#E3E3E3" android:pathData="M117.5,18.5c-54.68,0 -99,44.32 -99,99c0,54.67 44.32,99 99,99c54.67,0 99,-44.32 99,-99C216.5,62.83 172.18,18.5 117.5,18.5zM117.5,202.98c-47.21,0 -85.48,-38.27 -85.48,-85.48c0,-47.21 38.27,-85.48 85.48,-85.48c47.21,0 85.48,38.27 85.48,85.48C202.98,164.71 164.71,202.98 117.5,202.98z"/>
+    <path android:fillColor="#EDA33F" android:pathData="M197.23,117.5c0,44.03 -35.69,79.72 -79.73,79.72c-44.03,0 -79.73,-35.69 -79.73,-79.72c0,-44.03 35.69,-79.73 79.73,-79.73C161.53,37.77 197.23,73.47 197.23,117.5z"/>
+    <path android:fillColor="#352200" android:pathData="M48.69,144.99a69.93,13.72 0,1 0,139.86 0a69.93,13.72 0,1 0,-139.86 0z"/>
+    <path android:fillColor="#D3D5D6" android:pathData="M65.44,94.55h104.12v45.89h-104.12z"/>
+    <path android:fillColor="#352200" android:pathData="M78.81,94.55h5.38v45.89h-5.38z"/>
+    <path android:fillColor="#352200" android:pathData="M151.54,94.55h5.38v45.89h-5.38z"/>
+    <path android:fillColor="#352200" android:pathData="M172.31,98.91l-109.62,0l5.48,-12.06l98.66,0z"/>
+    <path android:fillColor="#295F2F" android:pathData="M54.73,135.11l-2.58,6.83h-3.83l-1.83,1.83v3h83v-5.17h-1.33v-22.75h0.75v-2.5c0,-1 0.17,-2 -2.42,-2h-19.25c-1.67,0 -1.17,3.08 -1.17,7h-11v-4.33h-5.17c0,-1.92 -3.08,-2 -4,-2s-3.67,-0.08 -3.67,1.92h-3.25c-1.17,0 -2.42,-0.33 -2.42,1.17v2.58h-14.5L54.73,135.11zM118.44,126.57c0,0.55 -0.45,1 -1,1h-5.38c-0.55,0 -1,-0.45 -1,-1v-5.5c0,-0.55 0.45,-1 1,-1h5.38c0.55,0 1,0.45 1,1V126.57zM126.87,126.57c0,0.55 -0.45,1 -1,1h-4.63c-0.55,0 -1,-0.45 -1,-1v-6.06c0,-0.55 0.45,-1 1,-1h4.63c0.55,0 1,0.45 1,1V126.57z"/>
+    <path android:fillColor="#FF000000" android:pathData="M109.56,146.78l0,-10.5l-53.75,0l-4.04,10.5z"/>
+    <path android:fillColor="#ED2224" android:pathData="M71.75,145.63m-4.44,0a4.44,4.44 0,1 1,8.88 0a4.44,4.44 0,1 1,-8.88 0"/>
+    <path android:fillColor="#ED2224" android:pathData="M83.54,145.63m-4.44,0a4.44,4.44 0,1 1,8.88 0a4.44,4.44 0,1 1,-8.88 0"/>
+    <path android:fillColor="#ED2224" android:pathData="M95.1,145.63m-4.44,0a4.44,4.44 0,1 1,8.88 0a4.44,4.44 0,1 1,-8.88 0"/>
+    <path android:fillColor="#ED2224" android:pathData="M107.17,145.63m-4.44,0a4.44,4.44 0,1 1,8.88 0a4.44,4.44 0,1 1,-8.88 0"/>
+    <path android:fillColor="#ED2224" android:pathData="M72.17,141.94l22.9,2.55l-0.25,2.26l-22.9,-2.55z"/>
+    <path android:fillColor="#ED2224" android:pathData="M97.23,145.81h10v1.92h-10z"/>
+    <path android:fillColor="#FF000000" android:pathData="M68.69,120.69h-6.63v-7.75h-4.58v7.67h-3.33c0.92,0 1,-4.58 -0.17,-4.58h-1.83c-0.92,0 -0.75,5.5 0,5.5h2.33v3.25c-1.08,0 -1.08,2.92 -1.08,4.83h-2.08c-0.92,0 -0.75,5.49 -0,5.5h17.38V120.69z"/>
+    <path android:fillColor="#FF000000" android:pathData="M72.98,130.57h18v4.54h-18z"/>
+    <path android:fillColor="#295F2F" android:pathData="M135.06,119.28h54.33v27.5h-54.33z"/>
+    <path android:fillColor="#FF000000" android:pathData="M141.23,136.28h43.5v10.48h-43.5z"/>
+    <path android:fillColor="#ED2224" android:pathData="M153.11,146.32m-3.75,0a3.75,3.75 0,1 1,7.5 0a3.75,3.75 0,1 1,-7.5 0"/>
+    <path android:fillColor="#ED2224" android:pathData="M163.08,146.32m-3.75,0a3.75,3.75 0,1 1,7.5 0a3.75,3.75 0,1 1,-7.5 0"/>
+    <path android:fillColor="#ED2224" android:pathData="M172.85,146.32m-3.75,0a3.75,3.75 0,1 1,7.5 0a3.75,3.75 0,1 1,-7.5 0"/>
+</vector>
diff --git a/app/src/main/res/drawable/round_icon_river.xml b/app/src/main/res/drawable/round_icon_river.xml
new file mode 100644
index 000000000..c7304cc10
--- /dev/null
+++ b/app/src/main/res/drawable/round_icon_river.xml
@@ -0,0 +1,15 @@
+<vector android:height="24dp" android:viewportHeight="112.801"
+    android:viewportWidth="112.801" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#B1B1B1" android:pathData="M0,0h112.8v112.8h-112.8z"/>
+    <path android:fillColor="#E3E3E3" android:pathData="M56.4,8.88c-26.24,0 -47.52,21.27 -47.52,47.52c0,26.24 21.27,47.52 47.52,47.52c26.25,0 47.52,-21.27 47.52,-47.52C103.92,30.16 82.64,8.88 56.4,8.88zM56.4,97.43c-22.66,0 -41.03,-18.37 -41.03,-41.03c0,-22.66 18.37,-41.03 41.03,-41.03c22.66,0 41.03,18.37 41.03,41.03C97.43,79.06 79.06,97.43 56.4,97.43z"/>
+    <path android:fillColor="#54B948" android:pathData="M56.4,56.4m-38.27,0a38.27,38.27 0,1 1,76.54 0a38.27,38.27 0,1 1,-76.54 0"/>
+    <path android:fillColor="#352200" android:pathData="M19.31,61.45a36.97,17.44 0,1 0,73.93 0a36.97,17.44 0,1 0,-73.93 0z"/>
+    <path android:fillColor="#007F9F" android:pathData="M90.08,74.58c-6.3,-5.11 -16.37,-11.67 -24.17,-13.17c-7.33,-1.42 -7.62,-4.28 -6.6,-8.31c1.1,-4.34 -10.06,-13.42 -34.65,-18.09c13.48,7.15 24.2,13.2 20.35,17.88c-3.85,4.68 -7.55,14.2 2.2,17.32c13.8,4.43 20.47,8.38 31.63,17.18C83.48,84.02 87.34,79.65 90.08,74.58z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M42.99,49.34c4.29,-0.37 6.9,-1.12 7.46,-2.8c0.37,1.68 4.03,2.42 6.49,2.8c-4.63,0.19 -5.44,0.22 -6.49,-0.65C49.7,49.62 45.78,49.53 42.99,49.34z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M42.87,58.58c5.47,-0.48 8.81,-1.43 9.52,-3.57c0.48,2.14 5.14,3.09 8.28,3.57c-5.9,0.24 -6.95,0.28 -8.28,-0.83C51.44,58.94 46.44,58.82 42.87,58.58z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M44.57,70.06c6.74,-0.59 10.84,-1.76 11.72,-4.39c0.59,2.64 6.33,3.81 10.19,4.39c-7.27,0.29 -8.55,0.34 -10.19,-1.02C55.12,70.5 48.96,70.35 44.57,70.06z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M60.54,70.06c6.74,-0.59 10.84,-1.76 11.72,-4.39c0.59,2.64 6.33,3.81 10.19,4.39c-7.27,0.29 -8.55,0.34 -10.19,-1.02C71.08,70.5 64.93,70.35 60.54,70.06z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M61.24,78.08c8.26,-0.72 13.29,-2.15 14.37,-5.39c0.72,3.23 7.76,4.67 12.5,5.39c-8.91,0.36 -10.48,0.42 -12.5,-1.26C74.17,78.62 66.63,78.44 61.24,78.08z"/>
+    <path android:fillColor="#295F2F" android:pathData="M65.86,60.04c-0.6,-11.83 -0.4,-25.46 -8.02,-29.67c11.63,5.21 11.63,23.86 11.23,30.48C71.27,50.22 72.07,41.4 71.87,37.59c1.8,6.01 1.24,17.69 0.03,21.85c2.78,-3.21 7.39,-14.75 6.39,-23.51c2.21,9.28 1.8,14.98 -3.61,25.86c7.22,-10.17 10.02,-17.99 16.84,-19.59c-4.81,5.61 -11.43,13.23 -13.63,20.65c7.62,-8.22 8.42,-10.83 13.63,-10.83c-5.01,3.21 -7.91,8.23 -10.02,11.93l-0.8,2.3C74.48,63.25 72.07,62.05 65.86,60.04z"/>
+    <path android:fillColor="#295F2F" android:pathData="M44.45,51.86c-0.85,-9.28 -2.52,-19.88 2.95,-24c-8.48,5.35 -6.41,19.88 -5.36,24.98c-2.9,-8.03 -4.5,-14.81 -4.77,-17.8c-0.74,4.89 1,13.91 2.4,17.02c-2.52,-2.19 -7.39,-10.66 -7.59,-17.6c-0.69,7.47 0.26,11.87 5.68,19.74c-6.75,-7.12 -9.81,-12.9 -15.29,-13.39c4.37,3.84 10.37,9.04 12.91,14.57c-6.85,-5.56 -7.76,-7.5 -11.82,-6.92c4.26,1.94 10.68,7.35 12.74,10l3.29,2.82C40.38,56.73 41.33,56.29 44.45,51.86z"/>
+</vector>
diff --git a/app/src/main/res/drawable/round_icon_school.xml b/app/src/main/res/drawable/round_icon_school.xml
new file mode 100644
index 000000000..22eef79cf
--- /dev/null
+++ b/app/src/main/res/drawable/round_icon_school.xml
@@ -0,0 +1,28 @@
+<vector android:height="24dp" android:viewportHeight="235.0"
+    android:viewportWidth="235.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#B1B1B1" android:pathData="M0,0h235v235h-235z"/>
+    <path android:fillColor="#E3E3E3" android:pathData="M117.5,18.5c-54.68,0 -99,44.32 -99,99c0,54.67 44.32,99 99,99c54.67,0 99,-44.32 99,-99C216.5,62.83 172.18,18.5 117.5,18.5zM117.5,202.98c-47.21,0 -85.48,-38.27 -85.48,-85.48c0,-47.21 38.27,-85.48 85.48,-85.48c47.21,0 85.48,38.27 85.48,85.48C202.98,164.71 164.71,202.98 117.5,202.98z"/>
+    <path android:fillColor="#EDA33F" android:pathData="M197.23,117.5c0,44.03 -35.69,79.72 -79.73,79.72c-44.03,0 -79.73,-35.69 -79.73,-79.72c0,-44.03 35.69,-79.73 79.73,-79.73C161.53,37.77 197.23,73.47 197.23,117.5z"/>
+    <path android:fillColor="#FF000000" android:pathData="M51.77,153.81a65.73,6.07 0,1 0,131.47 0a65.73,6.07 0,1 0,-131.47 0z"/>
+    <path android:fillColor="#352200" android:pathData="M60.47,108.47h114.07v2.95h-114.07z"/>
+    <path android:fillColor="#D3D5D6" android:pathData="M173.26,153.81l0,-42.4l-39.99,0l0,-25.77l-15.77,-10.2l0,0l-0,0l0,0l0,0l-15.77,10.2l0,25.77l-39.99,0l0,42.4z"/>
+    <path android:fillColor="#352200" android:pathData="M110.19,134.22h14.63v19.59h-14.63z"/>
+    <path android:fillColor="#352200" android:pathData="M117.5,97.45m-10.73,0a10.73,10.73 0,1 1,21.47 0a10.73,10.73 0,1 1,-21.47 0"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M117.5,97.45m-9.11,0a9.11,9.11 0,1 1,18.22 0a9.11,9.11 0,1 1,-18.22 0"/>
+    <path android:fillColor="#352200" android:pathData="M116.7,90.62v6.55h-6.55v1.92h7.51l0,0c0.53,-0 0.96,-0.43 0.96,-0.96h0V90.62H116.7z"/>
+    <path android:fillColor="#352200" android:pathData="M117.5,72.13l-16.82,10.18l0,5.35l16.82,-10.16l16.82,10.16l0,-5.35z"/>
+    <path android:fillColor="#8FBDCF" android:pathData="M65.5,115.7h9.66v12.75h-9.66z"/>
+    <path android:fillColor="#8FBDCF" android:pathData="M78.92,115.7h9.66v12.75h-9.66z"/>
+    <path android:fillColor="#8FBDCF" android:pathData="M92.34,115.7h9.66v12.75h-9.66z"/>
+    <path android:fillColor="#8FBDCF" android:pathData="M65.5,135.29h9.66v12.75h-9.66z"/>
+    <path android:fillColor="#8FBDCF" android:pathData="M78.92,135.29h9.66v12.75h-9.66z"/>
+    <path android:fillColor="#8FBDCF" android:pathData="M92.34,135.29h9.66v12.75h-9.66z"/>
+    <path android:fillColor="#8FBDCF" android:pathData="M130.99,115.7h9.66v12.75h-9.66z"/>
+    <path android:fillColor="#8FBDCF" android:pathData="M144.4,115.7h9.66v12.75h-9.66z"/>
+    <path android:fillColor="#8FBDCF" android:pathData="M157.82,115.7h9.66v12.75h-9.66z"/>
+    <path android:fillColor="#8FBDCF" android:pathData="M130.99,135.29h9.66v12.75h-9.66z"/>
+    <path android:fillColor="#8FBDCF" android:pathData="M144.4,135.29h9.66v12.75h-9.66z"/>
+    <path android:fillColor="#8FBDCF" android:pathData="M157.82,135.29h9.66v12.75h-9.66z"/>
+    <path android:fillColor="#58595B" android:pathData="M85.07,69.22c-0.73,0 -1.32,0.37 -1.32,0.83v86.33c0,0.46 0.59,0.83 1.32,0.83c0.73,0 1.32,-0.37 1.32,-0.83V70.06C86.39,69.6 85.8,69.22 85.07,69.22z"/>
+    <path android:fillColor="#ED2224" android:pathData="M83.75,70.64c-2.85,0 -4.06,2.25 -5.83,2.83s-4.77,0.92 -6.94,0.83v10c3.17,-0.08 5.58,-0.25 7.58,-1.67s3.21,-1.75 5.19,-1.75V70.64z"/>
+</vector>
diff --git a/app/src/main/res/drawable/round_icon_waterfall.xml b/app/src/main/res/drawable/round_icon_waterfall.xml
new file mode 100644
index 000000000..420704690
--- /dev/null
+++ b/app/src/main/res/drawable/round_icon_waterfall.xml
@@ -0,0 +1,18 @@
+<vector android:height="24dp" android:viewportHeight="235.0"
+    android:viewportWidth="235.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#B1B1B1" android:pathData="M0,0h235v235h-235z"/>
+    <path android:fillColor="#E3E3E3" android:pathData="M117.5,18.5c-54.67,0 -99,44.32 -99,99c0,54.67 44.32,99 99,99c54.68,0 99,-44.33 99,-99C216.5,62.83 172.18,18.5 117.5,18.5zM117.5,202.98c-47.21,0 -85.48,-38.27 -85.48,-85.48c0,-47.21 38.27,-85.48 85.48,-85.48c47.21,0 85.48,38.27 85.48,85.48C202.98,164.71 164.71,202.98 117.5,202.98z"/>
+    <path android:fillColor="#54B948" android:pathData="M117.5,118.19m-79.73,0a79.73,79.73 0,1 1,159.45 0a79.73,79.73 0,1 1,-159.45 0"/>
+    <path android:fillColor="#58595B" android:pathData="M117.5,197.91c44.03,0 79.73,-35.69 79.73,-79.72c0,-7.58 -1.08,-14.9 -3.06,-21.85c-27.77,-4.05 -53.39,-3.37 -55.11,0.61H91.73c-3.07,-5.81 -25.77,-5.67 -49.91,-3.83c-2.61,7.89 -4.04,16.31 -4.04,25.07C37.77,162.22 73.47,197.91 117.5,197.91z"/>
+    <path android:fillColor="#3D3D3E" android:pathData="M176.06,147.04c-5,-10.15 -18.33,-10.73 -20.33,-16.44c-1.53,-4.37 3.93,-20.85 0.29,-36.94c-9.63,0.21 -16.12,1.36 -16.96,3.3H91.73c-1.53,-2.89 -7.93,-4.31 -16.94,-4.78c3.91,15.01 8.94,33.28 11.94,39.63c3.67,7.75 2,17.74 2.33,27.58c0.22,6.6 -0.97,20.34 -1,32.89c9.11,3.62 19.03,5.64 29.44,5.64c24.39,0 46.21,-10.96 60.83,-28.22C178.44,159.86 178.05,151.07 176.06,147.04z"/>
+    <path android:fillColor="#007F9F" android:pathData="M117.5,197.91c16.31,0 31.46,-4.9 44.09,-13.3c-0.56,-5.74 -1.6,-13.6 -3.53,-22.06c-3.83,-16.83 -13.67,-24.67 -14.5,-28.83s5.5,-30.04 -4.5,-36.77c0,0 -18.33,-1.77 -47.33,0c2.83,7.27 5.83,21.44 8.5,27.1c2.67,5.67 2.17,17.83 3,24.33c0.73,5.67 2.31,34.44 0.22,48.27C108.01,197.46 112.7,197.91 117.5,197.91z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M161.59,184.61c-0.56,-5.74 -1.6,-13.6 -3.53,-22.06c-3.83,-16.83 -13.67,-24.67 -14.5,-28.83s5.5,-30.04 -4.5,-36.77c0,0 -0.43,-0.04 -1.26,-0.1c1.76,6.13 6.76,10.69 4.76,20.66s-2.25,18.22 2.25,25.47c3.95,6.37 15.43,26.47 14.69,42.97C160.21,185.51 160.9,185.07 161.59,184.61z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M103.23,148.39c0.73,5.67 2.31,34.44 0.22,48.27c2.45,0.44 4.94,0.76 7.46,0.97c-3.13,-11.2 -4.51,-35.25 -4.1,-42.4c0.5,-8.75 -1.75,-19 -3.25,-28c-1.35,-8.11 -5.75,-20.49 -10.33,-30.36c-0.5,0.03 -1,0.06 -1.5,0.09c2.83,7.27 5.83,21.44 8.5,27.1C102.89,129.72 102.39,141.89 103.23,148.39z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M102.56,98.97c2.88,4.13 8.88,14.75 9.13,29.5C114.31,119.22 114.69,107.1 102.56,98.97z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M115.06,101.1c2.5,4.13 7.73,14.75 7.94,29.5C125.29,121.35 125.61,109.22 115.06,101.1z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M125.64,100.1c2.12,3.5 6.55,12.5 6.73,25C134.31,117.26 134.59,106.98 125.64,100.1z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M111.03,134.72c0.31,7.5 5.88,9.38 9.16,22.75s-1.9,16.5 0,25.13c-3.47,-10.13 -0.47,-17.25 -3.35,-25S110.6,140.97 111.03,134.72z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M123.85,144.12c0.23,6.87 4.35,8.58 6.77,20.83c2.42,12.24 -1.4,15.1 0,23c-2.57,-9.27 -0.35,-15.79 -2.47,-22.89S123.52,149.84 123.85,144.12z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M129.24,131.8c0.53,6.85 4.72,8.38 7.68,20.51c2.96,12.13 -0.74,15.15 1.02,22.98c-2.97,-9.15 -1.05,-15.76 -3.48,-22.75S129.18,137.54 129.24,131.8z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M139.08,138.81c0.55,6.85 4.74,8.37 7.72,20.49c2.98,12.12 -0.7,15.15 1.06,22.98c-2.99,-9.14 -1.08,-15.76 -3.53,-22.75C141.88,152.54 139.02,144.54 139.08,138.81z"/>
+</vector>