diff --git a/src/main/res/drawable/ic_activity_bike_24dp.xml b/src/main/res/drawable/ic_activity_bike_24dp.xml
index f165cea9c..90c7f7a77 100644
--- a/src/main/res/drawable/ic_activity_bike_24dp.xml
+++ b/src/main/res/drawable/ic_activity_bike_24dp.xml
@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M15.5,5.5c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM5,12c-2.8,0 -5,2.2 -5,5s2.2,5 5,5 5,-2.2 5,-5 -2.2,-5 -5,-5zM5,20.5c-1.9,0 -3.5,-1.6 -3.5,-3.5s1.6,-3.5 3.5,-3.5 3.5,1.6 3.5,3.5 -1.6,3.5 -3.5,3.5zM10.8,10.5l2.4,-2.4 0.8,0.8c1.3,1.3 3,2.1 5.1,2.1L19.1,9c-1.5,0 -2.7,-0.6 -3.6,-1.5l-1.9,-1.9c-0.5,-0.4 -1,-0.6 -1.6,-0.6s-1.1,0.2 -1.4,0.6L7.8,8.4c-0.4,0.4 -0.6,0.9 -0.6,1.4 0,0.6 0.2,1.1 0.6,1.4L11,14v5h2v-6.2l-2.2,-2.3zM19,12c-2.8,0 -5,2.2 -5,5s2.2,5 5,5 5,-2.2 5,-5 -2.2,-5 -5,-5zM19,20.5c-1.9,0 -3.5,-1.6 -3.5,-3.5s1.6,-3.5 3.5,-3.5 3.5,1.6 3.5,3.5 -1.6,3.5 -3.5,3.5z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M15.5,5.5c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM5,12c-2.8,0 -5,2.2 -5,5s2.2,5 5,5 5,-2.2 5,-5 -2.2,-5 -5,-5zM5,20.5c-1.9,0 -3.5,-1.6 -3.5,-3.5s1.6,-3.5 3.5,-3.5 3.5,1.6 3.5,3.5 -1.6,3.5 -3.5,3.5zM10.8,10.5l2.4,-2.4 0.8,0.8c1.3,1.3 3,2.1 5.1,2.1L19.1,9c-1.5,0 -2.7,-0.6 -3.6,-1.5l-1.9,-1.9c-0.5,-0.4 -1,-0.6 -1.6,-0.6s-1.1,0.2 -1.4,0.6L7.8,8.4c-0.4,0.4 -0.6,0.9 -0.6,1.4 0,0.6 0.2,1.1 0.6,1.4L11,14v5h2v-6.2l-2.2,-2.3zM19,12c-2.8,0 -5,2.2 -5,5s2.2,5 5,5 5,-2.2 5,-5 -2.2,-5 -5,-5zM19,20.5c-1.9,0 -3.5,-1.6 -3.5,-3.5s1.6,-3.5 3.5,-3.5 3.5,1.6 3.5,3.5 -1.6,3.5 -3.5,3.5z" />
 </vector>
diff --git a/src/main/res/drawable/ic_activity_boat_24dp.xml b/src/main/res/drawable/ic_activity_boat_24dp.xml
index 48021a3a9..0979a4735 100644
--- a/src/main/res/drawable/ic_activity_boat_24dp.xml
+++ b/src/main/res/drawable/ic_activity_boat_24dp.xml
@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M20,21c-1.39,0 -2.78,-0.47 -4,-1.32 -2.44,1.71 -5.56,1.71 -8,0C6.78,20.53 5.39,21 4,21H2v2h2c1.38,0 2.74,-0.35 4,-0.99 2.52,1.29 5.48,1.29 8,0 1.26,0.65 2.62,0.99 4,0.99h2v-2h-2zM3.95,19H4c1.6,0 3.02,-0.88 4,-2 0.98,1.12 2.4,2 4,2s3.02,-0.88 4,-2c0.98,1.12 2.4,2 4,2h0.05l1.89,-6.68c0.08,-0.26 0.06,-0.54 -0.06,-0.78s-0.34,-0.42 -0.6,-0.5L20,10.62V6c0,-1.1 -0.9,-2 -2,-2h-3V1H9v3H6c-1.1,0 -2,0.9 -2,2v4.62l-1.29,0.42c-0.26,0.08 -0.48,0.26 -0.6,0.5s-0.15,0.52 -0.06,0.78L3.95,19zM6,6h12v3.97L12,8 6,9.97V6z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M20,21c-1.39,0 -2.78,-0.47 -4,-1.32 -2.44,1.71 -5.56,1.71 -8,0C6.78,20.53 5.39,21 4,21H2v2h2c1.38,0 2.74,-0.35 4,-0.99 2.52,1.29 5.48,1.29 8,0 1.26,0.65 2.62,0.99 4,0.99h2v-2h-2zM3.95,19H4c1.6,0 3.02,-0.88 4,-2 0.98,1.12 2.4,2 4,2s3.02,-0.88 4,-2c0.98,1.12 2.4,2 4,2h0.05l1.89,-6.68c0.08,-0.26 0.06,-0.54 -0.06,-0.78s-0.34,-0.42 -0.6,-0.5L20,10.62V6c0,-1.1 -0.9,-2 -2,-2h-3V1H9v3H6c-1.1,0 -2,0.9 -2,2v4.62l-1.29,0.42c-0.26,0.08 -0.48,0.26 -0.6,0.5s-0.15,0.52 -0.06,0.78L3.95,19zM6,6h12v3.97L12,8 6,9.97V6z" />
 </vector>
diff --git a/src/main/res/drawable/ic_activity_climbing_24dp.xml b/src/main/res/drawable/ic_activity_climbing_24dp.xml
index a660f3fd5..f08cfc558 100644
--- a/src/main/res/drawable/ic_activity_climbing_24dp.xml
+++ b/src/main/res/drawable/ic_activity_climbing_24dp.xml
@@ -1,113 +1,225 @@
-<vector android:height="24dp" android:viewportHeight="5.820833"
-    android:viewportWidth="5.820833" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#cacaca"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="5.820833"
+    android:viewportHeight="5.820833">
+    <path
+        android:fillColor="#cacaca"
         android:pathData="M14.77216,-15.55645l26.53766,0l0,30.62037l-26.53766,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.6855"/>
-    <path android:fillColor="#e74c3c"
+        android:strokeWidth="14.6855"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#e74c3c"
         android:pathData="M15.79283,-14.53577l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#ed1515"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#ed1515"
         android:pathData="M19.87555,-14.53577l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#f47750"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#f47750"
         android:pathData="M23.95827,-14.53577l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#fdbc4b"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#fdbc4b"
         android:pathData="M28.04098,-14.53577l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#c9ce3b"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#c9ce3b"
         android:pathData="M32.1237,-14.53577l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#da4453"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#da4453"
         android:pathData="M15.79283,-10.45305l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#c0392b"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#c0392b"
         android:pathData="M19.87555,-10.45305l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#d35400"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#d35400"
         android:pathData="M23.95827,-10.45305l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#f67400"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#f67400"
         android:pathData="M28.04098,-10.45305l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#f39c1f"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#f39c1f"
         android:pathData="M32.1237,-10.45305l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#1cdc9a"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#1cdc9a"
         android:pathData="M15.79283,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#2ecc71"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#2ecc71"
         android:pathData="M19.87555,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#1abc9c"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#1abc9c"
         android:pathData="M23.95827,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#3498db"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#3498db"
         android:pathData="M28.04098,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#3daee9"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#3daee9"
         android:pathData="M32.1237,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#10d116"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#10d116"
         android:pathData="M15.79283,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#27ae60"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#27ae60"
         android:pathData="M19.87555,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#16a085"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#16a085"
         android:pathData="M23.95827,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#2980b9"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#2980b9"
         android:pathData="M28.04098,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#1d99f3"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#1d99f3"
         android:pathData="M32.1237,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#9b59b6"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#9b59b6"
         android:pathData="M36.20642,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#8e44ad"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#8e44ad"
         android:pathData="M36.20642,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#34495e"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#34495e"
         android:pathData="M15.79284,5.87782l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#31363b"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#31363b"
         android:pathData="M19.87556,5.87782l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#7f8c8d"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#7f8c8d"
         android:pathData="M23.95828,5.87782l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#bdc3c7"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#bdc3c7"
         android:pathData="M28.04099,5.87782l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#fcfcfc"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#fcfcfc"
         android:pathData="M32.12371,5.87782l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#2c3e50"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#2c3e50"
         android:pathData="M15.79284,9.96054l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#232629"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#232629"
         android:pathData="M19.87556,9.96054l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#4d4d4d"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#4d4d4d"
         android:pathData="M23.95828,9.96054l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#95a5a6"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#95a5a6"
         android:pathData="M28.04099,9.96054l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#eff0f1"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#eff0f1"
         android:pathData="M32.12371,9.96054l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#ffffff" android:fillType="nonZero"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="nonZero"
         android:pathData="M6.31445,-0.15234L5.64648,0.3418L4.89453,2.88477L3.70508,3.23242L3.0293,4.91211L1.69922,5.11133L1.53711,5.45703L-0.22656,5.81836L-0.17383,6.07617L1.7207,5.69141L1.87891,5.35156L3.21875,5.15039L3.90234,3.44922L5.10742,3.09766L5.875,0.50195L6.47266,0.06055L6.31445,-0.15234z"
-        android:strokeColor="#00000000" android:strokeLineCap="butt"
-        android:strokeLineJoin="miter" android:strokeWidth="0.264583"/>
-    <path android:fillColor="#ffffff"
+        android:strokeWidth="0.264583"
+        android:strokeColor="#00000000"
+        android:strokeLineCap="butt"
+        android:strokeLineJoin="miter" />
+    <path
+        android:fillColor="#ffffff"
         android:pathData="M2.198,1.23865C2.42177,1.19788 2.57149,0.98144 2.53072,0.75767 2.48995,0.5339 2.27351,0.38417 2.04974,0.42494 1.82597,0.46572 1.67624,0.68216 1.71702,0.90593 1.75779,1.1297 1.97423,1.27942 2.198,1.23865ZM1.68595,4.19686 L1.95228,3.42332 2.46335,3.55617 2.93506,4.18433 3.28268,3.89484 2.72506,3.11037 2.24694,2.89657 2.38332,2.25579C2.70337,2.51274 3.14729,2.64204 3.59483,2.5605L3.5207,2.15365C3.13419,2.22407 2.77164,2.07994 2.55701,1.8248L2.29428,1.53638C2.19067,1.42915 2.05379,1.37002 1.91139,1.39596c-0.06103,0.01112 -0.09801,0.03887 -0.15903,0.04999L1.60548,2.19234 1.45861,2.93873 1.25698,3.92124 0.49782,5.18765 0.86657,5.49049Z"
-        android:strokeColor="#00000000" android:strokeWidth="0.168524"/>
-    <path android:fillAlpha="0.997" android:fillColor="#ffffff"
+        android:strokeWidth="0.168524"
+        android:strokeColor="#00000000" />
+    <path
+        android:fillAlpha="0.997"
+        android:fillColor="#ffffff"
         android:pathData="m1.38687,1.61032l0,0 -0.22274,0.98585 0.02179,-0.09645z"
-        android:strokeAlpha="0.997" android:strokeColor="#ffffff"
-        android:strokeLineJoin="round" android:strokeWidth="0.248933"/>
+        android:strokeWidth="0.248933"
+        android:strokeAlpha="0.997"
+        android:strokeColor="#ffffff"
+        android:strokeLineJoin="round" />
 </vector>
diff --git a/src/main/res/drawable/ic_activity_drive_24dp.xml b/src/main/res/drawable/ic_activity_drive_24dp.xml
index 981334c17..26404bddb 100644
--- a/src/main/res/drawable/ic_activity_drive_24dp.xml
+++ b/src/main/res/drawable/ic_activity_drive_24dp.xml
@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M18.92,6.01C18.72,5.42 18.16,5 17.5,5h-11c-0.66,0 -1.21,0.42 -1.42,1.01L3,12v8c0,0.55 0.45,1 1,1h1c0.55,0 1,-0.45 1,-1v-1h12v1c0,0.55 0.45,1 1,1h1c0.55,0 1,-0.45 1,-1v-8l-2.08,-5.99zM6.5,16c-0.83,0 -1.5,-0.67 -1.5,-1.5S5.67,13 6.5,13s1.5,0.67 1.5,1.5S7.33,16 6.5,16zM17.5,16c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM5,11l1.5,-4.5h11L19,11L5,11z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M18.92,6.01C18.72,5.42 18.16,5 17.5,5h-11c-0.66,0 -1.21,0.42 -1.42,1.01L3,12v8c0,0.55 0.45,1 1,1h1c0.55,0 1,-0.45 1,-1v-1h12v1c0,0.55 0.45,1 1,1h1c0.55,0 1,-0.45 1,-1v-8l-2.08,-5.99zM6.5,16c-0.83,0 -1.5,-0.67 -1.5,-1.5S5.67,13 6.5,13s1.5,0.67 1.5,1.5S7.33,16 6.5,16zM17.5,16c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM5,11l1.5,-4.5h11L19,11L5,11z" />
 </vector>
diff --git a/src/main/res/drawable/ic_activity_escooter_24dp.xml b/src/main/res/drawable/ic_activity_escooter_24dp.xml
index fcb0495bb..4a7560e95 100644
--- a/src/main/res/drawable/ic_activity_escooter_24dp.xml
+++ b/src/main/res/drawable/ic_activity_escooter_24dp.xml
@@ -3,269 +3,269 @@
     android:height="22dp"
     android:viewportWidth="5.820833"
     android:viewportHeight="5.820833">
-  <path
-      android:pathData="M2.36328,1.98438A0.1325,0.1325 0,0 0,2.25 2.13477A0.1325,0.1325 0,0 0,2.39844 2.24805C2.64244,2.2158 2.90617,2.30436 3.08203,2.47656C3.20488,2.59686 3.28941,2.75907 3.30859,2.92578C3.32135,3.03664 3.30546,3.15964 3.29297,3.29492C3.28044,3.43061 3.27019,3.5832 3.31055,3.73828C3.34385,3.86624 3.41023,3.98289 3.50195,4.07813C3.59367,4.17336 3.70932,4.24512 3.83594,4.2832A0.1325,0.1325 0,0 0,4.00195 4.19336A0.1325,0.1325 0,0 0,3.91211 4.0293C3.82972,4.00452 3.75304,3.9565 3.69336,3.89453C3.63368,3.83257 3.59003,3.75318 3.56836,3.66992C3.5418,3.56787 3.54669,3.4492 3.55859,3.32031C3.57054,3.19102 3.58793,3.04763 3.57031,2.89453C3.54353,2.66173 3.43207,2.44818 3.26758,2.28711C3.03092,2.05538 2.69165,1.94099 2.36328,1.98438z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="0.264999"
-      android:fillColor="#909090"
-      android:strokeColor="#00000000"
-      android:fillType="nonZero"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M1.5875,1.45521A0.13251,0.13251 0,0 0,1.45521 1.5875L1.45521,2.64583A0.13251,0.13251 0,0 0,1.5875 2.77812L1.85208,2.77812C2.21594,2.77812 2.51354,2.48053 2.51354,2.11667C2.51354,1.75281 2.21594,1.45521 1.85208,1.45521L1.5875,1.45521zM1.71979,1.71979L1.85208,1.71979C2.07273,1.71979 2.24896,1.89602 2.24896,2.11667C2.24896,2.33731 2.07273,2.51354 1.85208,2.51354L1.71979,2.51354L1.71979,1.71979z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="1.00157"
-      android:fillColor="#909090"
-      android:strokeColor="#00000000"
-      android:fillType="nonZero"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M1.05859,1.71875A0.1325,0.1325 0,0 0,0.92578 1.85156A0.1325,0.1325 0,0 0,1.05859 1.98438L1.58789,1.98438A0.1325,0.1325 0,0 0,1.7207 1.85156A0.1325,0.1325 0,0 0,1.58789 1.71875L1.05859,1.71875z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="0.264999"
-      android:fillColor="#909090"
-      android:strokeColor="#00000000"
-      android:fillType="nonZero"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M1.05859,2.24805A0.1325,0.1325 0,0 0,0.92578 2.38086A0.1325,0.1325 0,0 0,1.05859 2.51367L1.58789,2.51367A0.1325,0.1325 0,0 0,1.7207 2.38086A0.1325,0.1325 0,0 0,1.58789 2.24805L1.05859,2.24805z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="0.264999"
-      android:fillColor="#909090"
-      android:strokeColor="#00000000"
-      android:fillType="nonZero"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="m-1.32529,1.50326 l-0.41007,0.68344a0.12846,0.12846 60.48187,0 0,0.11015 0.19455l0.24958,-0 -0.11002,0.54956a0.08983,0.08983 21.14222,0 0,0.1651 0.06385L-0.91048,2.31121A0.12846,0.12846 60.48188,0 0,-1.02063 2.11667H-1.27021L-1.16019,1.56711a0.08983,0.08983 21.14223,0 0,-0.1651 -0.06385z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="0.264583"
-      android:fillColor="#fdbc4b"
-      android:strokeColor="#00000000"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M14.77216,-15.55645l26.53766,0l0,30.62037l-26.53766,0z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="14.6855"
-      android:fillColor="#cacaca"
-      android:strokeLineCap="square"/>
-  <path
-      android:pathData="M15.79283,-14.53577l4.08272,0l0,4.08272l-4.08272,0z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="14.955"
-      android:fillColor="#e74c3c"
-      android:strokeLineCap="square"/>
-  <path
-      android:pathData="M19.87555,-14.53577l4.08272,0l0,4.08272l-4.08272,0z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="14.955"
-      android:fillColor="#ed1515"
-      android:strokeLineCap="square"/>
-  <path
-      android:pathData="M23.95827,-14.53577l4.08272,0l0,4.08272l-4.08272,0z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="14.955"
-      android:fillColor="#f47750"
-      android:strokeLineCap="square"/>
-  <path
-      android:pathData="M28.04098,-14.53577l4.08272,0l0,4.08272l-4.08272,0z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="14.955"
-      android:fillColor="#fdbc4b"
-      android:strokeLineCap="square"/>
-  <path
-      android:pathData="M32.1237,-14.53577l4.08272,0l0,4.08272l-4.08272,0z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="14.955"
-      android:fillColor="#c9ce3b"
-      android:strokeLineCap="square"/>
-  <path
-      android:pathData="M15.79283,-10.45305l4.08272,0l0,4.08272l-4.08272,0z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="14.955"
-      android:fillColor="#da4453"
-      android:strokeLineCap="square"/>
-  <path
-      android:pathData="M19.87555,-10.45305l4.08272,0l0,4.08272l-4.08272,0z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="14.955"
-      android:fillColor="#c0392b"
-      android:strokeLineCap="square"/>
-  <path
-      android:pathData="M23.95827,-10.45305l4.08272,0l0,4.08272l-4.08272,0z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="14.955"
-      android:fillColor="#d35400"
-      android:strokeLineCap="square"/>
-  <path
-      android:pathData="M28.04098,-10.45305l4.08272,0l0,4.08272l-4.08272,0z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="14.955"
-      android:fillColor="#f67400"
-      android:strokeLineCap="square"/>
-  <path
-      android:pathData="M32.1237,-10.45305l4.08272,0l0,4.08272l-4.08272,0z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="14.955"
-      android:fillColor="#f39c1f"
-      android:strokeLineCap="square"/>
-  <path
-      android:pathData="M15.79283,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="14.955"
-      android:fillColor="#1cdc9a"
-      android:strokeLineCap="square"/>
-  <path
-      android:pathData="M19.87555,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="14.955"
-      android:fillColor="#2ecc71"
-      android:strokeLineCap="square"/>
-  <path
-      android:pathData="M23.95827,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="14.955"
-      android:fillColor="#1abc9c"
-      android:strokeLineCap="square"/>
-  <path
-      android:pathData="M28.04098,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="14.955"
-      android:fillColor="#3498db"
-      android:strokeLineCap="square"/>
-  <path
-      android:pathData="M32.1237,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="14.955"
-      android:fillColor="#3daee9"
-      android:strokeLineCap="square"/>
-  <path
-      android:pathData="M15.79283,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="14.955"
-      android:fillColor="#10d116"
-      android:strokeLineCap="square"/>
-  <path
-      android:pathData="M19.87555,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="14.955"
-      android:fillColor="#27ae60"
-      android:strokeLineCap="square"/>
-  <path
-      android:pathData="M23.95827,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="14.955"
-      android:fillColor="#16a085"
-      android:strokeLineCap="square"/>
-  <path
-      android:pathData="M28.04098,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="14.955"
-      android:fillColor="#2980b9"
-      android:strokeLineCap="square"/>
-  <path
-      android:pathData="M32.1237,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="14.955"
-      android:fillColor="#1d99f3"
-      android:strokeLineCap="square"/>
-  <path
-      android:pathData="M36.20642,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="14.955"
-      android:fillColor="#9b59b6"
-      android:strokeLineCap="square"/>
-  <path
-      android:pathData="M36.20642,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="14.955"
-      android:fillColor="#8e44ad"
-      android:strokeLineCap="square"/>
-  <path
-      android:pathData="M15.79284,5.87782l4.08272,0l0,4.08272l-4.08272,0z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="14.955"
-      android:fillColor="#34495e"
-      android:strokeLineCap="square"/>
-  <path
-      android:pathData="M19.87556,5.87782l4.08272,0l0,4.08272l-4.08272,0z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="14.955"
-      android:fillColor="#31363b"
-      android:strokeLineCap="square"/>
-  <path
-      android:pathData="M23.95828,5.87782l4.08272,0l0,4.08272l-4.08272,0z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="14.955"
-      android:fillColor="#7f8c8d"
-      android:strokeLineCap="square"/>
-  <path
-      android:pathData="M28.04099,5.87782l4.08272,0l0,4.08272l-4.08272,0z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="14.955"
-      android:fillColor="#bdc3c7"
-      android:strokeLineCap="square"/>
-  <path
-      android:pathData="M32.12371,5.87782l4.08272,0l0,4.08272l-4.08272,0z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="14.955"
-      android:fillColor="#fcfcfc"
-      android:strokeLineCap="square"/>
-  <path
-      android:pathData="M15.79284,9.96054l4.08272,0l0,4.08272l-4.08272,0z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="14.955"
-      android:fillColor="#2c3e50"
-      android:strokeLineCap="square"/>
-  <path
-      android:pathData="M19.87556,9.96054l4.08272,0l0,4.08272l-4.08272,0z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="14.955"
-      android:fillColor="#232629"
-      android:strokeLineCap="square"/>
-  <path
-      android:pathData="M23.95828,9.96054l4.08272,0l0,4.08272l-4.08272,0z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="14.955"
-      android:fillColor="#4d4d4d"
-      android:strokeLineCap="square"/>
-  <path
-      android:pathData="M28.04099,9.96054l4.08272,0l0,4.08272l-4.08272,0z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="14.955"
-      android:fillColor="#95a5a6"
-      android:strokeLineCap="square"/>
-  <path
-      android:pathData="M32.12371,9.96054l4.08272,0l0,4.08272l-4.08272,0z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="14.955"
-      android:fillColor="#eff0f1"
-      android:strokeLineCap="square"/>
-  <path
-      android:pathData="M3.70262,1.19062A0.13229,0.13229 0,0 0,3.58583 1.26401A0.13229,0.13229 0,0 0,3.64526 1.44126L3.94446,1.59112C4.0556,1.64681 4.13708,1.74801 4.16719,1.86862L4.60127,3.60443C4.06966,3.68012 3.66126,4.09455 3.59875,4.63021L2.22209,4.63021C2.15315,4.03948 1.66802,3.57241 1.05937,3.57187C1.0537,3.57183 1.04798,3.57184 1.04231,3.57187L0.52917,3.57187A0.13229,0.13229 0,0 0,0.39687 3.70417A0.13229,0.13229 0,0 0,0.52917 3.83646L1.04231,3.83646A0.1323,0.1323 0,0 0,1.04335 3.83646C1.04802,3.83642 1.05263,3.83642 1.0573,3.83646A0.1323,0.1323 0,0 0,1.05833 3.83646C1.57134,3.83646 1.98438,4.24949 1.98437,4.7625A0.1323,0.1323 0,0 0,2.11667 4.89479L3.70417,4.89479A0.1323,0.1323 0,0 0,3.83646 4.7625C3.83646,4.24949 4.24949,3.83646 4.7625,3.83646A0.1323,0.1323 0,0 0,4.89066 3.67213L4.4235,1.80454C4.37475,1.60919 4.24332,1.44464 4.06332,1.35444A0.1323,0.1323 0,0 0,4.0628 1.35444L3.76308,1.20458A0.13229,0.13229 0,0 0,3.70262 1.19062z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="1.00157481"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"
-      android:fillType="nonZero"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M4.76172,4.13672C4.42656,4.13672 4.15234,4.41094 4.15234,4.74609C4.15234,5.08125 4.42656,5.35547 4.76172,5.35547C5.09687,5.35547 5.37109,5.08125 5.37109,4.74609C5.37109,4.41094 5.09687,4.13672 4.76172,4.13672zM4.76172,4.33789C4.98794,4.33789 5.16797,4.51987 5.16797,4.74609C5.16797,4.97231 4.98794,5.1543 4.76172,5.1543C4.5355,5.1543 4.35352,4.97231 4.35352,4.74609C4.35352,4.51987 4.5355,4.33789 4.76172,4.33789z"
-      android:strokeAlpha="0.997"
-      android:strokeLineJoin="round"
-      android:strokeWidth="0.201567"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"
-      android:fillType="nonZero"
-      android:fillAlpha="0.997"
-      android:strokeLineCap="butt"/>
-  <path
-      android:pathData="m1.02215,4.13672c-0.33515,0 -0.60938,0.27422 -0.60938,0.60938 0,0.33515 0.27422,0.60937 0.60938,0.60938 0.33515,-0 0.60937,-0.27422 0.60938,-0.60938 -0,-0.33515 -0.27422,-0.60938 -0.60938,-0.60938zM1.02215,4.33789c0.22622,0 0.40625,0.18198 0.40625,0.4082 -0,0.22622 -0.18003,0.4082 -0.40625,0.4082 -0.22622,0 -0.4082,-0.18198 -0.4082,-0.4082 0,-0.22622 0.18198,-0.4082 0.4082,-0.4082z"
-      android:strokeAlpha="0.997"
-      android:strokeLineJoin="round"
-      android:strokeWidth="0.201567"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"
-      android:fillType="nonZero"
-      android:fillAlpha="0.997"
-      android:strokeLineCap="butt"/>
+    <path
+        android:fillColor="#909090"
+        android:fillType="nonZero"
+        android:pathData="M2.36328,1.98438A0.1325,0.1325 0,0 0,2.25 2.13477A0.1325,0.1325 0,0 0,2.39844 2.24805C2.64244,2.2158 2.90617,2.30436 3.08203,2.47656C3.20488,2.59686 3.28941,2.75907 3.30859,2.92578C3.32135,3.03664 3.30546,3.15964 3.29297,3.29492C3.28044,3.43061 3.27019,3.5832 3.31055,3.73828C3.34385,3.86624 3.41023,3.98289 3.50195,4.07813C3.59367,4.17336 3.70932,4.24512 3.83594,4.2832A0.1325,0.1325 0,0 0,4.00195 4.19336A0.1325,0.1325 0,0 0,3.91211 4.0293C3.82972,4.00452 3.75304,3.9565 3.69336,3.89453C3.63368,3.83257 3.59003,3.75318 3.56836,3.66992C3.5418,3.56787 3.54669,3.4492 3.55859,3.32031C3.57054,3.19102 3.58793,3.04763 3.57031,2.89453C3.54353,2.66173 3.43207,2.44818 3.26758,2.28711C3.03092,2.05538 2.69165,1.94099 2.36328,1.98438z"
+        android:strokeWidth="0.264999"
+        android:strokeColor="#00000000"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#909090"
+        android:fillType="nonZero"
+        android:pathData="M1.5875,1.45521A0.13251,0.13251 0,0 0,1.45521 1.5875L1.45521,2.64583A0.13251,0.13251 0,0 0,1.5875 2.77812L1.85208,2.77812C2.21594,2.77812 2.51354,2.48053 2.51354,2.11667C2.51354,1.75281 2.21594,1.45521 1.85208,1.45521L1.5875,1.45521zM1.71979,1.71979L1.85208,1.71979C2.07273,1.71979 2.24896,1.89602 2.24896,2.11667C2.24896,2.33731 2.07273,2.51354 1.85208,2.51354L1.71979,2.51354L1.71979,1.71979z"
+        android:strokeWidth="1.00157"
+        android:strokeColor="#00000000"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#909090"
+        android:fillType="nonZero"
+        android:pathData="M1.05859,1.71875A0.1325,0.1325 0,0 0,0.92578 1.85156A0.1325,0.1325 0,0 0,1.05859 1.98438L1.58789,1.98438A0.1325,0.1325 0,0 0,1.7207 1.85156A0.1325,0.1325 0,0 0,1.58789 1.71875L1.05859,1.71875z"
+        android:strokeWidth="0.264999"
+        android:strokeColor="#00000000"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#909090"
+        android:fillType="nonZero"
+        android:pathData="M1.05859,2.24805A0.1325,0.1325 0,0 0,0.92578 2.38086A0.1325,0.1325 0,0 0,1.05859 2.51367L1.58789,2.51367A0.1325,0.1325 0,0 0,1.7207 2.38086A0.1325,0.1325 0,0 0,1.58789 2.24805L1.05859,2.24805z"
+        android:strokeWidth="0.264999"
+        android:strokeColor="#00000000"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#fdbc4b"
+        android:pathData="m-1.32529,1.50326 l-0.41007,0.68344a0.12846,0.12846 60.48187,0 0,0.11015 0.19455l0.24958,-0 -0.11002,0.54956a0.08983,0.08983 21.14222,0 0,0.1651 0.06385L-0.91048,2.31121A0.12846,0.12846 60.48188,0 0,-1.02063 2.11667H-1.27021L-1.16019,1.56711a0.08983,0.08983 21.14223,0 0,-0.1651 -0.06385z"
+        android:strokeWidth="0.264583"
+        android:strokeColor="#00000000"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#cacaca"
+        android:pathData="M14.77216,-15.55645l26.53766,0l0,30.62037l-26.53766,0z"
+        android:strokeWidth="14.6855"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#e74c3c"
+        android:pathData="M15.79283,-14.53577l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#ed1515"
+        android:pathData="M19.87555,-14.53577l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#f47750"
+        android:pathData="M23.95827,-14.53577l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#fdbc4b"
+        android:pathData="M28.04098,-14.53577l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#c9ce3b"
+        android:pathData="M32.1237,-14.53577l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#da4453"
+        android:pathData="M15.79283,-10.45305l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#c0392b"
+        android:pathData="M19.87555,-10.45305l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#d35400"
+        android:pathData="M23.95827,-10.45305l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#f67400"
+        android:pathData="M28.04098,-10.45305l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#f39c1f"
+        android:pathData="M32.1237,-10.45305l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#1cdc9a"
+        android:pathData="M15.79283,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#2ecc71"
+        android:pathData="M19.87555,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#1abc9c"
+        android:pathData="M23.95827,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#3498db"
+        android:pathData="M28.04098,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#3daee9"
+        android:pathData="M32.1237,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#10d116"
+        android:pathData="M15.79283,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#27ae60"
+        android:pathData="M19.87555,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#16a085"
+        android:pathData="M23.95827,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#2980b9"
+        android:pathData="M28.04098,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#1d99f3"
+        android:pathData="M32.1237,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#9b59b6"
+        android:pathData="M36.20642,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#8e44ad"
+        android:pathData="M36.20642,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#34495e"
+        android:pathData="M15.79284,5.87782l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#31363b"
+        android:pathData="M19.87556,5.87782l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#7f8c8d"
+        android:pathData="M23.95828,5.87782l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#bdc3c7"
+        android:pathData="M28.04099,5.87782l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#fcfcfc"
+        android:pathData="M32.12371,5.87782l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#2c3e50"
+        android:pathData="M15.79284,9.96054l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#232629"
+        android:pathData="M19.87556,9.96054l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#4d4d4d"
+        android:pathData="M23.95828,9.96054l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#95a5a6"
+        android:pathData="M28.04099,9.96054l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#eff0f1"
+        android:pathData="M32.12371,9.96054l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="nonZero"
+        android:pathData="M3.70262,1.19062A0.13229,0.13229 0,0 0,3.58583 1.26401A0.13229,0.13229 0,0 0,3.64526 1.44126L3.94446,1.59112C4.0556,1.64681 4.13708,1.74801 4.16719,1.86862L4.60127,3.60443C4.06966,3.68012 3.66126,4.09455 3.59875,4.63021L2.22209,4.63021C2.15315,4.03948 1.66802,3.57241 1.05937,3.57187C1.0537,3.57183 1.04798,3.57184 1.04231,3.57187L0.52917,3.57187A0.13229,0.13229 0,0 0,0.39687 3.70417A0.13229,0.13229 0,0 0,0.52917 3.83646L1.04231,3.83646A0.1323,0.1323 0,0 0,1.04335 3.83646C1.04802,3.83642 1.05263,3.83642 1.0573,3.83646A0.1323,0.1323 0,0 0,1.05833 3.83646C1.57134,3.83646 1.98438,4.24949 1.98437,4.7625A0.1323,0.1323 0,0 0,2.11667 4.89479L3.70417,4.89479A0.1323,0.1323 0,0 0,3.83646 4.7625C3.83646,4.24949 4.24949,3.83646 4.7625,3.83646A0.1323,0.1323 0,0 0,4.89066 3.67213L4.4235,1.80454C4.37475,1.60919 4.24332,1.44464 4.06332,1.35444A0.1323,0.1323 0,0 0,4.0628 1.35444L3.76308,1.20458A0.13229,0.13229 0,0 0,3.70262 1.19062z"
+        android:strokeWidth="1.00157481"
+        android:strokeColor="#00000000"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillAlpha="0.997"
+        android:fillColor="#ffffff"
+        android:fillType="nonZero"
+        android:pathData="M4.76172,4.13672C4.42656,4.13672 4.15234,4.41094 4.15234,4.74609C4.15234,5.08125 4.42656,5.35547 4.76172,5.35547C5.09687,5.35547 5.37109,5.08125 5.37109,4.74609C5.37109,4.41094 5.09687,4.13672 4.76172,4.13672zM4.76172,4.33789C4.98794,4.33789 5.16797,4.51987 5.16797,4.74609C5.16797,4.97231 4.98794,5.1543 4.76172,5.1543C4.5355,5.1543 4.35352,4.97231 4.35352,4.74609C4.35352,4.51987 4.5355,4.33789 4.76172,4.33789z"
+        android:strokeWidth="0.201567"
+        android:strokeAlpha="0.997"
+        android:strokeColor="#00000000"
+        android:strokeLineCap="butt"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillAlpha="0.997"
+        android:fillColor="#ffffff"
+        android:fillType="nonZero"
+        android:pathData="m1.02215,4.13672c-0.33515,0 -0.60938,0.27422 -0.60938,0.60938 0,0.33515 0.27422,0.60937 0.60938,0.60938 0.33515,-0 0.60937,-0.27422 0.60938,-0.60938 -0,-0.33515 -0.27422,-0.60938 -0.60938,-0.60938zM1.02215,4.33789c0.22622,0 0.40625,0.18198 0.40625,0.4082 -0,0.22622 -0.18003,0.4082 -0.40625,0.4082 -0.22622,0 -0.4082,-0.18198 -0.4082,-0.4082 0,-0.22622 0.18198,-0.4082 0.4082,-0.4082z"
+        android:strokeWidth="0.201567"
+        android:strokeAlpha="0.997"
+        android:strokeColor="#00000000"
+        android:strokeLineCap="butt"
+        android:strokeLineJoin="round" />
 </vector>
diff --git a/src/main/res/drawable/ic_activity_flight_24dp.xml b/src/main/res/drawable/ic_activity_flight_24dp.xml
index 5c656403e..ed89038d2 100644
--- a/src/main/res/drawable/ic_activity_flight_24dp.xml
+++ b/src/main/res/drawable/ic_activity_flight_24dp.xml
@@ -1,6 +1,13 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M10.18,9"/>
-    <path android:fillColor="#FF000000" android:pathData="M21,16v-2l-8,-5V3.5c0,-0.83 -0.67,-1.5 -1.5,-1.5S10,2.67 10,3.5V9l-8,5v2l8,-2.5V19l-2,1.5V22l3.5,-1 3.5,1v-1.5L13,19v-5.5l8,2.5z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M10.18,9" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M21,16v-2l-8,-5V3.5c0,-0.83 -0.67,-1.5 -1.5,-1.5S10,2.67 10,3.5V9l-8,5v2l8,-2.5V19l-2,1.5V22l3.5,-1 3.5,1v-1.5L13,19v-5.5l8,2.5z" />
 </vector>
diff --git a/src/main/res/drawable/ic_activity_inline_skating_24dp.xml b/src/main/res/drawable/ic_activity_inline_skating_24dp.xml
index 6e863d841..799fdf43e 100644
--- a/src/main/res/drawable/ic_activity_inline_skating_24dp.xml
+++ b/src/main/res/drawable/ic_activity_inline_skating_24dp.xml
@@ -1,137 +1,273 @@
-<vector android:height="24dp" android:viewportHeight="5.820833"
-    android:viewportWidth="5.820833" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#ffffff"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="5.820833"
+    android:viewportHeight="5.820833">
+    <path
+        android:fillColor="#ffffff"
         android:pathData="m3.37221,1.25278c0.24151,0 0.4391,-0.1976 0.4391,-0.4391 0,-0.24151 -0.1976,-0.4391 -0.4391,-0.4391 -0.24151,0 -0.4391,0.1976 -0.4391,0.4391 0,0.24151 0.1976,0.4391 0.4391,0.4391zM2.58182,4.30455 L2.80137,3.33852 3.26243,3.77763V5.09494H3.70154V3.4483L3.24048,3.0092 3.37221,2.35054c0.28542,0.32933 0.72452,0.54888 1.20753,0.54888V2.46032c-0.41715,0 -0.76843,-0.21955 -0.94407,-0.52692L3.41612,1.58211C3.3283,1.45038 3.19657,1.36256 3.04288,1.36256c-0.06587,0 -0.10978,0.02196 -0.17564,0.02196L1.72557,1.86753V2.89942H2.16468V2.15294L2.55987,1.99926 2.20859,3.77763 1.13278,3.55808 1.04496,3.99718Z"
-        android:strokeColor="#00000000" android:strokeWidth="0.219552"/>
-    <path android:fillColor="#cacaca"
+        android:strokeWidth="0.219552"
+        android:strokeColor="#00000000" />
+    <path
+        android:fillColor="#cacaca"
         android:pathData="M14.77216,-15.55645l26.53766,0l0,30.62037l-26.53766,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.6855"/>
-    <path android:fillColor="#e74c3c"
+        android:strokeWidth="14.6855"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#e74c3c"
         android:pathData="M15.79283,-14.53577l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#ed1515"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#ed1515"
         android:pathData="M19.87555,-14.53577l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#f47750"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#f47750"
         android:pathData="M23.95827,-14.53577l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#fdbc4b"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#fdbc4b"
         android:pathData="M28.04098,-14.53577l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#c9ce3b"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#c9ce3b"
         android:pathData="M32.1237,-14.53577l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#da4453"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#da4453"
         android:pathData="M15.79283,-10.45305l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#c0392b"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#c0392b"
         android:pathData="M19.87555,-10.45305l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#d35400"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#d35400"
         android:pathData="M23.95827,-10.45305l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#f67400"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#f67400"
         android:pathData="M28.04098,-10.45305l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#f39c1f"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#f39c1f"
         android:pathData="M32.1237,-10.45305l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#1cdc9a"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#1cdc9a"
         android:pathData="M15.79283,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#2ecc71"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#2ecc71"
         android:pathData="M19.87555,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#1abc9c"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#1abc9c"
         android:pathData="M23.95827,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#3498db"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#3498db"
         android:pathData="M28.04098,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#3daee9"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#3daee9"
         android:pathData="M32.1237,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#10d116"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#10d116"
         android:pathData="M15.79283,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#27ae60"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#27ae60"
         android:pathData="M19.87555,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#16a085"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#16a085"
         android:pathData="M23.95827,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#2980b9"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#2980b9"
         android:pathData="M28.04098,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#1d99f3"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#1d99f3"
         android:pathData="M32.1237,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#9b59b6"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#9b59b6"
         android:pathData="M36.20642,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#8e44ad"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#8e44ad"
         android:pathData="M36.20642,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#34495e"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#34495e"
         android:pathData="M15.79284,5.87782l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#31363b"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#31363b"
         android:pathData="M19.87556,5.87782l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#7f8c8d"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#7f8c8d"
         android:pathData="M23.95828,5.87782l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#bdc3c7"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#bdc3c7"
         android:pathData="M28.04099,5.87782l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#fcfcfc"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#fcfcfc"
         android:pathData="M32.12371,5.87782l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#2c3e50"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#2c3e50"
         android:pathData="M15.79284,9.96054l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#232629"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#232629"
         android:pathData="M19.87556,9.96054l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#4d4d4d"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#4d4d4d"
         android:pathData="M23.95828,9.96054l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#95a5a6"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#95a5a6"
         android:pathData="M28.04099,9.96054l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#eff0f1"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#eff0f1"
         android:pathData="M32.12371,9.96054l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillAlpha="0.997" android:fillColor="#ffffff"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillAlpha="0.997"
+        android:fillColor="#ffffff"
         android:pathData="M0.86526,2.98747m0.03886,-0.20311a0.20679,0.20679 55.83268,1 1,-0.07773 0.40621a0.20679,0.20679 55.83267,1 1,0.07773 -0.40621"
-        android:strokeAlpha="0.997" android:strokeColor="#00000000"
-        android:strokeLineJoin="round" android:strokeWidth="0.264999"/>
-    <path android:fillAlpha="0.997" android:fillColor="#ffffff"
+        android:strokeWidth="0.264999"
+        android:strokeAlpha="0.997"
+        android:strokeColor="#00000000"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillAlpha="0.997"
+        android:fillColor="#ffffff"
         android:pathData="M0.77727,3.44729m0.03886,-0.20311a0.20679,0.20679 55.83268,1 1,-0.07773 0.40621a0.20679,0.20679 55.83267,1 1,0.07773 -0.40621"
-        android:strokeAlpha="0.997" android:strokeColor="#00000000"
-        android:strokeLineJoin="round" android:strokeWidth="0.264999"/>
-    <path android:fillAlpha="0.997" android:fillColor="#ffffff"
+        android:strokeWidth="0.264999"
+        android:strokeAlpha="0.997"
+        android:strokeColor="#00000000"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillAlpha="0.997"
+        android:fillColor="#ffffff"
         android:pathData="M0.68928,3.9071m0.03886,-0.20311a0.20679,0.20679 55.83268,1 1,-0.07773 0.40621a0.20679,0.20679 55.83268,1 1,0.07773 -0.40621"
-        android:strokeAlpha="0.997" android:strokeColor="#00000000"
-        android:strokeLineJoin="round" android:strokeWidth="0.264999"/>
-    <path android:fillAlpha="0.997" android:fillColor="#ffffff"
+        android:strokeWidth="0.264999"
+        android:strokeAlpha="0.997"
+        android:strokeColor="#00000000"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillAlpha="0.997"
+        android:fillColor="#ffffff"
         android:pathData="M0.6013,4.36692m0.03886,-0.20311a0.20679,0.20679 55.83268,1 1,-0.07773 0.40621a0.20679,0.20679 55.83268,1 1,0.07773 -0.40621"
-        android:strokeAlpha="0.997" android:strokeColor="#00000000"
-        android:strokeLineJoin="round" android:strokeWidth="0.264999"/>
-    <path android:fillAlpha="0.997" android:fillColor="#ffffff"
+        android:strokeWidth="0.264999"
+        android:strokeAlpha="0.997"
+        android:strokeColor="#00000000"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillAlpha="0.997"
+        android:fillColor="#ffffff"
         android:pathData="M2.8026,5.44778m-0.20678,0.00257a0.20679,0.20679 134.28799,1 1,0.41355 -0.00514a0.20679,0.20679 134.28799,1 1,-0.41355 0.00514"
-        android:strokeAlpha="0.997" android:strokeColor="#00000000"
-        android:strokeLineJoin="round" android:strokeWidth="0.264999"/>
-    <path android:fillAlpha="0.997" android:fillColor="#ffffff"
+        android:strokeWidth="0.264999"
+        android:strokeAlpha="0.997"
+        android:strokeColor="#00000000"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillAlpha="0.997"
+        android:fillColor="#ffffff"
         android:pathData="M3.27072,5.44197m-0.20678,0.00257a0.20679,0.20679 134.28799,1 1,0.41355 -0.00514a0.20679,0.20679 134.28799,1 1,-0.41355 0.00514"
-        android:strokeAlpha="0.997" android:strokeColor="#00000000"
-        android:strokeLineJoin="round" android:strokeWidth="0.264999"/>
-    <path android:fillAlpha="0.997" android:fillColor="#ffffff"
+        android:strokeWidth="0.264999"
+        android:strokeAlpha="0.997"
+        android:strokeColor="#00000000"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillAlpha="0.997"
+        android:fillColor="#ffffff"
         android:pathData="M3.73884,5.43615m-0.20678,0.00257a0.20679,0.20679 134.28799,1 1,0.41355 -0.00514a0.20679,0.20679 134.28799,1 1,-0.41355 0.00514"
-        android:strokeAlpha="0.997" android:strokeColor="#00000000"
-        android:strokeLineJoin="round" android:strokeWidth="0.264999"/>
-    <path android:fillAlpha="0.997" android:fillColor="#ffffff"
+        android:strokeWidth="0.264999"
+        android:strokeAlpha="0.997"
+        android:strokeColor="#00000000"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillAlpha="0.997"
+        android:fillColor="#ffffff"
         android:pathData="M4.20697,5.43033m-0.20678,0.00257a0.20679,0.20679 134.28799,1 1,0.41355 -0.00514a0.20679,0.20679 134.28799,1 1,-0.41355 0.00514"
-        android:strokeAlpha="0.997" android:strokeColor="#00000000"
-        android:strokeLineJoin="round" android:strokeWidth="0.264999"/>
+        android:strokeWidth="0.264999"
+        android:strokeAlpha="0.997"
+        android:strokeColor="#00000000"
+        android:strokeLineJoin="round" />
 </vector>
diff --git a/src/main/res/drawable/ic_activity_motorbike_24dp.xml b/src/main/res/drawable/ic_activity_motorbike_24dp.xml
index 22faa4fe1..f0ef5ace2 100644
--- a/src/main/res/drawable/ic_activity_motorbike_24dp.xml
+++ b/src/main/res/drawable/ic_activity_motorbike_24dp.xml
@@ -1,145 +1,290 @@
-<vector android:height="24dp" android:viewportHeight="5.820833"
-    android:viewportWidth="5.820833" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#cacaca"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="5.820833"
+    android:viewportHeight="5.820833">
+    <path
+        android:fillColor="#cacaca"
         android:pathData="M14.77216,-15.55645l26.53766,0l0,30.62037l-26.53766,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.6855"/>
-    <path android:fillColor="#e74c3c"
+        android:strokeWidth="14.6855"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#e74c3c"
         android:pathData="M15.79283,-14.53577l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#ed1515"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#ed1515"
         android:pathData="M19.87555,-14.53577l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#f47750"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#f47750"
         android:pathData="M23.95827,-14.53577l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#fdbc4b"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#fdbc4b"
         android:pathData="M28.04098,-14.53577l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#c9ce3b"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#c9ce3b"
         android:pathData="M32.1237,-14.53577l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#da4453"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#da4453"
         android:pathData="M15.79283,-10.45305l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#c0392b"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#c0392b"
         android:pathData="M19.87555,-10.45305l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#d35400"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#d35400"
         android:pathData="M23.95827,-10.45305l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#f67400"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#f67400"
         android:pathData="M28.04098,-10.45305l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#f39c1f"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#f39c1f"
         android:pathData="M32.1237,-10.45305l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#1cdc9a"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#1cdc9a"
         android:pathData="M15.79283,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#2ecc71"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#2ecc71"
         android:pathData="M19.87555,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#1abc9c"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#1abc9c"
         android:pathData="M23.95827,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#3498db"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#3498db"
         android:pathData="M28.04098,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#3daee9"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#3daee9"
         android:pathData="M32.1237,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#10d116"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#10d116"
         android:pathData="M15.79283,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#27ae60"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#27ae60"
         android:pathData="M19.87555,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#16a085"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#16a085"
         android:pathData="M23.95827,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#2980b9"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#2980b9"
         android:pathData="M28.04098,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#1d99f3"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#1d99f3"
         android:pathData="M32.1237,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#9b59b6"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#9b59b6"
         android:pathData="M36.20642,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#8e44ad"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#8e44ad"
         android:pathData="M36.20642,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#34495e"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#34495e"
         android:pathData="M15.79284,5.87782l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#31363b"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#31363b"
         android:pathData="M19.87556,5.87782l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#7f8c8d"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#7f8c8d"
         android:pathData="M23.95828,5.87782l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#bdc3c7"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#bdc3c7"
         android:pathData="M28.04099,5.87782l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#fcfcfc"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#fcfcfc"
         android:pathData="M32.12371,5.87782l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#2c3e50"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#2c3e50"
         android:pathData="M15.79284,9.96054l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#232629"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#232629"
         android:pathData="M19.87556,9.96054l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#4d4d4d"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#4d4d4d"
         android:pathData="M23.95828,9.96054l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#95a5a6"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#95a5a6"
         android:pathData="M28.04099,9.96054l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#eff0f1"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#eff0f1"
         android:pathData="M32.12371,9.96054l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#ffffff" android:fillType="nonZero"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="nonZero"
         android:pathData="M1.85742,3.30664A0.13229,0.13229 0,0 0,1.73633 3.375L1.07422,4.56641A0.1323,0.1323 0,0 0,1.20508 4.76172L2.39648,4.62891A0.13229,0.13229 0,0 0,2.51367 4.48242A0.13229,0.13229 0,0 0,2.36719 4.36719L1.43164,4.4707L1.9668,3.50391A0.13229,0.13229 0,0 0,1.91602 3.32422A0.13229,0.13229 0,0 0,1.85742 3.30664z"
-        android:strokeColor="#00000000" android:strokeLineCap="round"
-        android:strokeLineJoin="round" android:strokeWidth="0.264583"/>
-    <path android:fillColor="#ffffff" android:fillType="nonZero"
+        android:strokeWidth="0.264583"
+        android:strokeColor="#00000000"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="nonZero"
         android:pathData="M3.17578,1.98438A0.13229,0.13229 0,0 0,3.04297 2.11719A0.13229,0.13229 0,0 0,3.17578 2.24805L3.61133,2.24805L4.50586,4.67578A0.13229,0.13229 0,0 0,4.67578 4.75391A0.13229,0.13229 0,0 0,4.75391 4.58398L3.82813,2.07031A0.1323,0.1323 0,0 0,3.70508 1.98438L3.17578,1.98438z"
-        android:strokeColor="#00000000" android:strokeLineCap="round"
-        android:strokeLineJoin="round" android:strokeWidth="0.264583"/>
-    <path android:fillColor="#ffffff" android:fillType="nonZero"
+        android:strokeWidth="0.264583"
+        android:strokeColor="#00000000"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="nonZero"
         android:pathData="M1.31672,3.04271A0.1323,0.1323 0,0 0,1.19062 3.175L1.19062,3.43958A0.1323,0.1323 0,0 0,1.32292 3.57187L2.11667,3.57187A0.1323,0.1323 45,0 0,2.24586 3.45664A0.1323,0.1323 0,0 0,2.24689 3.44113A0.1323,0.1323 0,0 0,2.19263 3.33261A0.1323,0.1323 0,0 0,2.17971 3.32434A0.1323,0.1323 45,0 0,2.13527 3.30884A0.1323,0.1323 0,0 0,2.11977 3.30729A0.1323,0.1323 0,0 0,2.11667 3.30729C1.87413,3.30729 1.69678,3.24721 1.58027,3.18895C1.46375,3.1307 1.41645,3.08147 1.41645,3.08147A0.1323,0.1323 0,0 0,1.31672 3.04271z"
-        android:strokeColor="#00000000" android:strokeLineCap="round"
-        android:strokeLineJoin="round" android:strokeWidth="0.999999"/>
-    <path android:fillColor="#ffffff" android:fillType="nonZero"
+        android:strokeWidth="0.999999"
+        android:strokeColor="#00000000"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="nonZero"
         android:pathData="M2.77734,4.10156A0.1325,0.1325 0,0 0,2.64648 4.23242A0.1325,0.1325 0,0 0,2.77734 4.36523L3.04297,4.36523A0.1325,0.1325 0,0 0,3.17578 4.23242A0.1325,0.1325 0,0 0,3.04297 4.10156L2.77734,4.10156z"
-        android:strokeColor="#00000000" android:strokeLineCap="round"
-        android:strokeLineJoin="miter" android:strokeWidth="0.265"/>
-    <path android:fillColor="#000000" android:fillType="nonZero"
+        android:strokeWidth="0.265"
+        android:strokeColor="#00000000"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="miter" />
+    <path
+        android:fillColor="#000000"
+        android:fillType="nonZero"
         android:pathData="m4.36562,2.77812c-0.07185,0.00167 -0.13231,0.06042 -0.13229,0.13229 0,0.07306 0.05923,0.13229 0.13229,0.13229z"
-        android:strokeColor="#00000000" android:strokeLineCap="round"
-        android:strokeLineJoin="round" android:strokeWidth="1.00157"/>
-    <path android:fillColor="#ffffff" android:fillType="nonZero"
+        android:strokeWidth="1.00157"
+        android:strokeColor="#00000000"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="nonZero"
         android:pathData="M4.36252,2.64583C4.22022,2.64913 4.101,2.76421 4.10104,2.91042C4.10104,3.05509 4.22095,3.175 4.36562,3.175A0.13251,0.13251 0,0 0,4.49792 3.04271L4.49792,2.77812A0.13251,0.13251 0,0 0,4.36252 2.64583z"
-        android:strokeColor="#00000000" android:strokeLineCap="round"
-        android:strokeLineJoin="round" android:strokeWidth="1.00157"/>
-    <path android:fillAlpha="0.994135" android:fillColor="#ffffff"
+        android:strokeWidth="1.00157"
+        android:strokeColor="#00000000"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillAlpha="0.994135"
+        android:fillColor="#ffffff"
         android:fillType="nonZero"
         android:pathData="M2.91042,3.04271C2.74421,3.04271 2.62752,3.16093 2.56884,3.30729L2.11667,3.30729A0.1323,0.1323 0,0 0,1.99058 3.47989L2.41381,4.80281A0.1323,0.1323 0,0 0,2.5399 4.89479L3.43958,4.89479A0.1323,0.1323 0,0 0,3.57187 4.7625C3.57187,4.70364 3.57183,4.67513 3.57187,4.63021C3.5719,4.18629 3.84776,3.79035 4.26434,3.63699A0.1323,0.1323 0,0 0,4.34289 3.46697L4.21835,3.12901A0.1323,0.1323 0,0 0,4.09432 3.04271L2.91042,3.04271zM2.91042,3.30729L4.00234,3.30729L4.06332,3.47369C3.61802,3.69527 3.30732,4.12482 3.30729,4.63021L2.63653,4.63021L2.29805,3.57187L2.64583,3.57187A0.1323,0.1323 0,0 0,2.77812 3.43958C2.77812,3.36495 2.83579,3.30729 2.91042,3.30729z"
-        android:strokeAlpha="0.994135" android:strokeColor="#00000000"
-        android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="0.999999"/>
-    <path android:fillColor="#ffffff" android:fillType="nonZero"
+        android:strokeWidth="0.999999"
+        android:strokeAlpha="0.994135"
+        android:strokeColor="#00000000"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="nonZero"
         android:pathData="M2.77734,3.70313A0.1325,0.1325 0,0 0,2.64648 3.83594A0.1325,0.1325 0,0 0,2.77734 3.96875L3.04297,3.96875A0.1325,0.1325 0,0 0,3.17578 3.83594A0.1325,0.1325 0,0 0,3.04297 3.70313L2.77734,3.70313z"
-        android:strokeColor="#00000000" android:strokeLineCap="round"
-        android:strokeLineJoin="miter" android:strokeWidth="0.265"/>
-    <path android:fillAlpha="0.997" android:fillColor="#ffffff"
+        android:strokeWidth="0.265"
+        android:strokeColor="#00000000"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="miter" />
+    <path
+        android:fillAlpha="0.997"
+        android:fillColor="#ffffff"
         android:fillType="nonZero"
         android:pathData="m4.62582,3.82507c-0.43457,0 -0.79012,0.35556 -0.79012,0.79012 0,0.43457 0.35556,0.79012 0.79012,0.79012 0.43457,-0 0.79012,-0.35556 0.79012,-0.79012 0,-0.43457 -0.35556,-0.79012 -0.79012,-0.79012zM4.62582,4.08592c0.29332,0 0.52675,0.23596 0.52675,0.52928 0,0.29332 -0.23343,0.52928 -0.52675,0.52928 -0.29332,0 -0.52928,-0.23596 -0.52928,-0.52928 0,-0.29332 0.23596,-0.52928 0.52928,-0.52928z"
-        android:strokeAlpha="0.997" android:strokeColor="#00000000"
-        android:strokeLineCap="butt" android:strokeLineJoin="round" android:strokeWidth="0.261354"/>
-    <path android:fillAlpha="0.997" android:fillColor="#ffffff"
+        android:strokeWidth="0.261354"
+        android:strokeAlpha="0.997"
+        android:strokeColor="#00000000"
+        android:strokeLineCap="butt"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillAlpha="0.997"
+        android:fillColor="#ffffff"
         android:fillType="nonZero"
         android:pathData="m1.2138,3.82507c-0.43457,0 -0.79012,0.35556 -0.79012,0.79012 0,0.43457 0.35556,0.79012 0.79012,0.79012 0.43457,-0 0.79012,-0.35556 0.79012,-0.79012 0,-0.43457 -0.35556,-0.79012 -0.79012,-0.79012zM1.2138,4.08592c0.29332,0 0.52675,0.23596 0.52675,0.52928 0,0.29332 -0.23343,0.52928 -0.52675,0.52928 -0.29332,0 -0.52928,-0.23596 -0.52928,-0.52928 0,-0.29332 0.23596,-0.52928 0.52928,-0.52928z"
-        android:strokeAlpha="0.997" android:strokeColor="#00000000"
-        android:strokeLineCap="butt" android:strokeLineJoin="round" android:strokeWidth="0.261354"/>
+        android:strokeWidth="0.261354"
+        android:strokeAlpha="0.997"
+        android:strokeColor="#00000000"
+        android:strokeLineCap="butt"
+        android:strokeLineJoin="round" />
 </vector>
diff --git a/src/main/res/drawable/ic_activity_mtb_24dp.xml b/src/main/res/drawable/ic_activity_mtb_24dp.xml
index 852249130..0132d47d5 100644
--- a/src/main/res/drawable/ic_activity_mtb_24dp.xml
+++ b/src/main/res/drawable/ic_activity_mtb_24dp.xml
@@ -1,108 +1,216 @@
-<vector android:height="24dp" android:viewportHeight="5.820833"
-    android:viewportWidth="5.820833" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#cacaca"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="5.820833"
+    android:viewportHeight="5.820833">
+    <path
+        android:fillColor="#cacaca"
         android:pathData="M14.77216,-15.55645l26.53766,0l0,30.62037l-26.53766,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.6855"/>
-    <path android:fillColor="#e74c3c"
+        android:strokeWidth="14.6855"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#e74c3c"
         android:pathData="M15.79283,-14.53577l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#ed1515"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#ed1515"
         android:pathData="M19.87555,-14.53577l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#f47750"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#f47750"
         android:pathData="M23.95827,-14.53577l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#fdbc4b"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#fdbc4b"
         android:pathData="M28.04098,-14.53577l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#c9ce3b"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#c9ce3b"
         android:pathData="M32.1237,-14.53577l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#da4453"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#da4453"
         android:pathData="M15.79283,-10.45305l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#c0392b"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#c0392b"
         android:pathData="M19.87555,-10.45305l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#d35400"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#d35400"
         android:pathData="M23.95827,-10.45305l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#f67400"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#f67400"
         android:pathData="M28.04098,-10.45305l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#f39c1f"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#f39c1f"
         android:pathData="M32.1237,-10.45305l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#1cdc9a"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#1cdc9a"
         android:pathData="M15.79283,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#2ecc71"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#2ecc71"
         android:pathData="M19.87555,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#1abc9c"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#1abc9c"
         android:pathData="M23.95827,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#3498db"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#3498db"
         android:pathData="M28.04098,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#3daee9"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#3daee9"
         android:pathData="M32.1237,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#10d116"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#10d116"
         android:pathData="M15.79283,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#27ae60"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#27ae60"
         android:pathData="M19.87555,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#16a085"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#16a085"
         android:pathData="M23.95827,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#2980b9"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#2980b9"
         android:pathData="M28.04098,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#1d99f3"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#1d99f3"
         android:pathData="M32.1237,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#9b59b6"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#9b59b6"
         android:pathData="M36.20642,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#8e44ad"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#8e44ad"
         android:pathData="M36.20642,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#34495e"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#34495e"
         android:pathData="M15.79284,5.87782l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#31363b"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#31363b"
         android:pathData="M19.87556,5.87782l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#7f8c8d"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#7f8c8d"
         android:pathData="M23.95828,5.87782l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#bdc3c7"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#bdc3c7"
         android:pathData="M28.04099,5.87782l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#fcfcfc"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#fcfcfc"
         android:pathData="M32.12371,5.87782l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#2c3e50"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#2c3e50"
         android:pathData="M15.79284,9.96054l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#232629"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#232629"
         android:pathData="M19.87556,9.96054l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#4d4d4d"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#4d4d4d"
         android:pathData="M23.95828,9.96054l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#95a5a6"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#95a5a6"
         android:pathData="M28.04099,9.96054l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#eff0f1"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#eff0f1"
         android:pathData="M32.12371,9.96054l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#ffffff"
-        android:pathData="M1.80421,1.07094C1.97839,0.94323 2.0164,0.69622 1.88869,0.52205 1.76097,0.34787 1.51397,0.30985 1.33979,0.43757 1.16561,0.56528 1.1276,0.81229 1.25531,0.98647 1.38303,1.16064 1.63003,1.19866 1.80421,1.07094ZM0.89628,3.31928C0.45292,3.64437 0.36,4.24816 0.68509,4.69152 1.01019,5.13488 1.61397,5.2278 2.05733,4.90271 2.50069,4.57762 2.59362,3.97383 2.26853,3.53047 1.94343,3.08711 1.33965,2.99418 0.89628,3.31928ZM1.88318,4.66519C1.58232,4.88579 1.14321,4.81821 0.92261,4.51736 0.70201,4.21651 0.76959,3.77739 1.07044,3.55679 1.37129,3.33619 1.81041,3.40377 2.03101,3.70463 2.25161,4.00548 2.18403,4.4446 1.88318,4.66519ZM1.64052,2.40835 L1.74189,1.74968 1.96145,1.78347c0.35678,0.05491 0.71885,-0.01579 1.05137,-0.25961L2.78061,1.20717C2.5431,1.38132 2.28342,1.42564 2.03642,1.38763L1.51497,1.30738C1.38935,1.30209 1.28696,1.32847 1.19195,1.39814 1.09695,1.4678 1.041,1.55752 1.03994,1.65569L0.92167,2.42415c-0.0169,0.10978 0.00949,0.21217 0.06754,0.29134 0.06966,0.09501 0.15938,0.15096 0.25755,0.15202L2.07855,2.93933 2.65908,3.73105 2.97577,3.49884 2.25592,2.51711ZM3.11309,1.69381C2.66973,2.0189 2.57681,2.62269 2.9019,3.06605 3.22699,3.50941 3.83078,3.60233 4.27414,3.27724 4.7175,2.95215 4.81043,2.34836 4.48533,1.905 4.16024,1.46164 3.55645,1.36871 3.11309,1.69381ZM4.09998,3.03973C3.79913,3.26033 3.36001,3.19274 3.13941,2.89189 2.91882,2.59104 2.9864,2.15192 3.28725,1.93132 3.5881,1.71072 4.02722,1.77831 4.24782,2.07916 4.46842,2.38001 4.40084,2.81913 4.09998,3.03973Z" android:strokeWidth="0.196349"/>
-    <path android:fillColor="#ffffff" android:fillType="nonZero"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M1.80421,1.07094C1.97839,0.94323 2.0164,0.69622 1.88869,0.52205 1.76097,0.34787 1.51397,0.30985 1.33979,0.43757 1.16561,0.56528 1.1276,0.81229 1.25531,0.98647 1.38303,1.16064 1.63003,1.19866 1.80421,1.07094ZM0.89628,3.31928C0.45292,3.64437 0.36,4.24816 0.68509,4.69152 1.01019,5.13488 1.61397,5.2278 2.05733,4.90271 2.50069,4.57762 2.59362,3.97383 2.26853,3.53047 1.94343,3.08711 1.33965,2.99418 0.89628,3.31928ZM1.88318,4.66519C1.58232,4.88579 1.14321,4.81821 0.92261,4.51736 0.70201,4.21651 0.76959,3.77739 1.07044,3.55679 1.37129,3.33619 1.81041,3.40377 2.03101,3.70463 2.25161,4.00548 2.18403,4.4446 1.88318,4.66519ZM1.64052,2.40835 L1.74189,1.74968 1.96145,1.78347c0.35678,0.05491 0.71885,-0.01579 1.05137,-0.25961L2.78061,1.20717C2.5431,1.38132 2.28342,1.42564 2.03642,1.38763L1.51497,1.30738C1.38935,1.30209 1.28696,1.32847 1.19195,1.39814 1.09695,1.4678 1.041,1.55752 1.03994,1.65569L0.92167,2.42415c-0.0169,0.10978 0.00949,0.21217 0.06754,0.29134 0.06966,0.09501 0.15938,0.15096 0.25755,0.15202L2.07855,2.93933 2.65908,3.73105 2.97577,3.49884 2.25592,2.51711ZM3.11309,1.69381C2.66973,2.0189 2.57681,2.62269 2.9019,3.06605 3.22699,3.50941 3.83078,3.60233 4.27414,3.27724 4.7175,2.95215 4.81043,2.34836 4.48533,1.905 4.16024,1.46164 3.55645,1.36871 3.11309,1.69381ZM4.09998,3.03973C3.79913,3.26033 3.36001,3.19274 3.13941,2.89189 2.91882,2.59104 2.9864,2.15192 3.28725,1.93132 3.5881,1.71072 4.02722,1.77831 4.24782,2.07916 4.46842,2.38001 4.40084,2.81913 4.09998,3.03973Z"
+        android:strokeWidth="0.196349" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="nonZero"
         android:pathData="M6.23559,2.34583 L4.36649,3.42253 3.0293,4.91211 2.09994,5.06574 1.53711,5.45703 -0.22656,5.81836 -0.17383,6.07617 1.7207,5.69141 2.27962,5.30597 3.21875,5.15039 4.56375,3.63933 6.44848,2.55872Z"
-        android:strokeColor="#00000000" android:strokeLineCap="butt"
-        android:strokeLineJoin="miter" android:strokeWidth="0.264583"/>
+        android:strokeWidth="0.264583"
+        android:strokeColor="#00000000"
+        android:strokeLineCap="butt"
+        android:strokeLineJoin="miter" />
 </vector>
diff --git a/src/main/res/drawable/ic_activity_run_24dp.xml b/src/main/res/drawable/ic_activity_run_24dp.xml
index 2fb069d1a..f22116361 100644
--- a/src/main/res/drawable/ic_activity_run_24dp.xml
+++ b/src/main/res/drawable/ic_activity_run_24dp.xml
@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M13.49,5.48c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM9.89,19.38l1,-4.4 2.1,2v6h2v-7.5l-2.1,-2 0.6,-3c1.3,1.5 3.3,2.5 5.5,2.5v-2c-1.9,0 -3.5,-1 -4.3,-2.4l-1,-1.6c-0.4,-0.6 -1,-1 -1.7,-1 -0.3,0 -0.5,0.1 -0.8,0.1l-5.2,2.2v4.7h2v-3.4l1.8,-0.7 -1.6,8.1 -4.9,-1 -0.4,2 7,1.4z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M13.49,5.48c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM9.89,19.38l1,-4.4 2.1,2v6h2v-7.5l-2.1,-2 0.6,-3c1.3,1.5 3.3,2.5 5.5,2.5v-2c-1.9,0 -3.5,-1 -4.3,-2.4l-1,-1.6c-0.4,-0.6 -1,-1 -1.7,-1 -0.3,0 -0.5,0.1 -0.8,0.1l-5.2,2.2v4.7h2v-3.4l1.8,-0.7 -1.6,8.1 -4.9,-1 -0.4,2 7,1.4z" />
 </vector>
diff --git a/src/main/res/drawable/ic_activity_sailing_24dp.xml b/src/main/res/drawable/ic_activity_sailing_24dp.xml
index e2cdf8cb7..7ee6d81f6 100644
--- a/src/main/res/drawable/ic_activity_sailing_24dp.xml
+++ b/src/main/res/drawable/ic_activity_sailing_24dp.xml
@@ -1,122 +1,239 @@
-<vector android:height="24dp" android:viewportHeight="5.820833"
-    android:viewportWidth="5.820833" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#cacaca"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="5.820833"
+    android:viewportHeight="5.820833">
+    <path
+        android:fillColor="#cacaca"
         android:pathData="M14.77216,-15.55645l26.53766,0l0,30.62037l-26.53766,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.6855"/>
-    <path android:fillColor="#e74c3c"
+        android:strokeWidth="14.6855"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#e74c3c"
         android:pathData="M15.79283,-14.53577l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#ed1515"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#ed1515"
         android:pathData="M19.87555,-14.53577l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#f47750"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#f47750"
         android:pathData="M23.95827,-14.53577l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#fdbc4b"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#fdbc4b"
         android:pathData="M28.04098,-14.53577l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#c9ce3b"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#c9ce3b"
         android:pathData="M32.1237,-14.53577l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#da4453"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#da4453"
         android:pathData="M15.79283,-10.45305l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#c0392b"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#c0392b"
         android:pathData="M19.87555,-10.45305l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#d35400"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#d35400"
         android:pathData="M23.95827,-10.45305l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#f67400"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#f67400"
         android:pathData="M28.04098,-10.45305l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#f39c1f"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#f39c1f"
         android:pathData="M32.1237,-10.45305l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#1cdc9a"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#1cdc9a"
         android:pathData="M15.79283,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#2ecc71"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#2ecc71"
         android:pathData="M19.87555,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#1abc9c"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#1abc9c"
         android:pathData="M23.95827,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#3498db"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#3498db"
         android:pathData="M28.04098,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#3daee9"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#3daee9"
         android:pathData="M32.1237,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#10d116"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#10d116"
         android:pathData="M15.79283,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#27ae60"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#27ae60"
         android:pathData="M19.87555,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#16a085"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#16a085"
         android:pathData="M23.95827,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#2980b9"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#2980b9"
         android:pathData="M28.04098,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#1d99f3"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#1d99f3"
         android:pathData="M32.1237,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#9b59b6"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#9b59b6"
         android:pathData="M36.20642,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#8e44ad"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#8e44ad"
         android:pathData="M36.20642,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#34495e"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#34495e"
         android:pathData="M15.79284,5.87782l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#31363b"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#31363b"
         android:pathData="M19.87556,5.87782l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#7f8c8d"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#7f8c8d"
         android:pathData="M23.95828,5.87782l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#bdc3c7"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#bdc3c7"
         android:pathData="M28.04099,5.87782l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#fcfcfc"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#fcfcfc"
         android:pathData="M32.12371,5.87782l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#2c3e50"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#2c3e50"
         android:pathData="M15.79284,9.96054l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#232629"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#232629"
         android:pathData="M19.87556,9.96054l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#4d4d4d"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#4d4d4d"
         android:pathData="M23.95828,9.96054l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#95a5a6"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#95a5a6"
         android:pathData="M28.04099,9.96054l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#eff0f1"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#eff0f1"
         android:pathData="M32.12371,9.96054l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#ffffff"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#ffffff"
         android:pathData="M0.56042,4.47083 L1.16042,5.4h3.5l0.6,-0.92917z"
-        android:strokeColor="#00000000" android:strokeLineCap="butt"
-        android:strokeLineJoin="miter" android:strokeWidth="0.264583"/>
-    <path android:fillColor="#ffffff"
+        android:strokeWidth="0.264583"
+        android:strokeColor="#00000000"
+        android:strokeLineCap="butt"
+        android:strokeLineJoin="miter" />
+    <path
+        android:fillColor="#ffffff"
         android:pathData="M2.80243,0.32721V4.5H3.0184V0.32721Z"
-        android:strokeColor="#00000000" android:strokeLineCap="butt"
-        android:strokeLineJoin="miter" android:strokeWidth="0.244823"/>
-    <path android:fillColor="#ffffff"
+        android:strokeWidth="0.244823"
+        android:strokeColor="#00000000"
+        android:strokeLineCap="butt"
+        android:strokeLineJoin="miter" />
+    <path
+        android:fillColor="#ffffff"
         android:pathData="M2.65279,1.00669 L2.64597,4.19281 0.73849,4.20353Z"
-        android:strokeColor="#00000000" android:strokeLineCap="butt"
-        android:strokeLineJoin="miter" android:strokeWidth="0.257218"/>
-    <path android:fillColor="#ffffff"
+        android:strokeWidth="0.257218"
+        android:strokeColor="#00000000"
+        android:strokeLineCap="butt"
+        android:strokeLineJoin="miter" />
+    <path
+        android:fillColor="#ffffff"
         android:pathData="m3.16167,0.35464 l0.00682,3.82765 1.90748,0.01288z"
-        android:strokeColor="#00000000" android:strokeLineCap="butt"
-        android:strokeLineJoin="miter" android:strokeWidth="0.281927"/>
-    <path android:fillColor="#ffffff"
+        android:strokeWidth="0.281927"
+        android:strokeColor="#00000000"
+        android:strokeLineCap="butt"
+        android:strokeLineJoin="miter" />
+    <path
+        android:fillColor="#ffffff"
         android:pathData="M2.81055,0.32721V0.7545L2.03249,0.57664Z"
-        android:strokeColor="#00000000" android:strokeLineCap="butt"
-        android:strokeLineJoin="miter" android:strokeWidth="0.286457"/>
+        android:strokeWidth="0.286457"
+        android:strokeColor="#00000000"
+        android:strokeLineCap="butt"
+        android:strokeLineJoin="miter" />
 </vector>
diff --git a/src/main/res/drawable/ic_activity_skateboarding_24dp.xml b/src/main/res/drawable/ic_activity_skateboarding_24dp.xml
index 87d07167f..9c930ae44 100644
--- a/src/main/res/drawable/ic_activity_skateboarding_24dp.xml
+++ b/src/main/res/drawable/ic_activity_skateboarding_24dp.xml
@@ -1,117 +1,233 @@
-<vector android:height="24dp" android:viewportHeight="5.820833"
-    android:viewportWidth="5.820833" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#ffffff"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="5.820833"
+    android:viewportHeight="5.820833">
+    <path
+        android:fillColor="#ffffff"
         android:pathData="M3.44976,1.2724C3.71883,1.26759 3.93505,1.0435 3.93023,0.77443 3.92542,0.50536 3.70134,0.28914 3.43226,0.29396 3.16319,0.29877 2.94698,0.52285 2.95179,0.79193 2.9566,1.061 3.18069,1.27721 3.44976,1.2724ZM3.06374,4.33101 L2.84991,3.46541 3.50506,3.73772 4.03189,5.10783 4.48859,4.93222 3.83005,3.21959 3.1749,2.94728 3.37709,2.42128C3.70165,2.78251 4.18343,3.04528 4.72158,3.03566L4.71283,2.54644C4.24807,2.55475 3.95867,2.3644 3.75685,2.02545L3.50524,1.63844C3.40477,1.49342 3.25626,1.3982 3.08503,1.40127c-0.07338,0.00131 -0.12187,0.02665 -0.19525,0.02796L1.62742,1.99012 1.24713,3.02657 1.65384,3.24232 2.0692,2.30711 2.55957,2.12026 2.10811,3.25241 2.40897,4.15919 1.31643,4.85786 1.94801,4.97164Z"
-        android:strokeColor="#00000000" android:strokeWidth="0.244651"/>
-    <path android:fillColor="#cacaca"
+        android:strokeWidth="0.244651"
+        android:strokeColor="#00000000" />
+    <path
+        android:fillColor="#cacaca"
         android:pathData="M14.77216,-15.55645l26.53766,0l0,30.62037l-26.53766,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.6855"/>
-    <path android:fillColor="#e74c3c"
+        android:strokeWidth="14.6855"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#e74c3c"
         android:pathData="M15.79283,-14.53577l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#ed1515"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#ed1515"
         android:pathData="M19.87555,-14.53577l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#f47750"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#f47750"
         android:pathData="M23.95827,-14.53577l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#fdbc4b"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#fdbc4b"
         android:pathData="M28.04098,-14.53577l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#c9ce3b"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#c9ce3b"
         android:pathData="M32.1237,-14.53577l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#da4453"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#da4453"
         android:pathData="M15.79283,-10.45305l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#c0392b"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#c0392b"
         android:pathData="M19.87555,-10.45305l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#d35400"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#d35400"
         android:pathData="M23.95827,-10.45305l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#f67400"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#f67400"
         android:pathData="M28.04098,-10.45305l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#f39c1f"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#f39c1f"
         android:pathData="M32.1237,-10.45305l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#1cdc9a"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#1cdc9a"
         android:pathData="M15.79283,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#2ecc71"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#2ecc71"
         android:pathData="M19.87555,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#1abc9c"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#1abc9c"
         android:pathData="M23.95827,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#3498db"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#3498db"
         android:pathData="M28.04098,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#3daee9"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#3daee9"
         android:pathData="M32.1237,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#10d116"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#10d116"
         android:pathData="M15.79283,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#27ae60"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#27ae60"
         android:pathData="M19.87555,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#16a085"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#16a085"
         android:pathData="M23.95827,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#2980b9"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#2980b9"
         android:pathData="M28.04098,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#1d99f3"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#1d99f3"
         android:pathData="M32.1237,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#9b59b6"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#9b59b6"
         android:pathData="M36.20642,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#8e44ad"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#8e44ad"
         android:pathData="M36.20642,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#34495e"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#34495e"
         android:pathData="M15.79284,5.87782l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#31363b"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#31363b"
         android:pathData="M19.87556,5.87782l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#7f8c8d"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#7f8c8d"
         android:pathData="M23.95828,5.87782l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#bdc3c7"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#bdc3c7"
         android:pathData="M28.04099,5.87782l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#fcfcfc"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#fcfcfc"
         android:pathData="M32.12371,5.87782l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#2c3e50"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#2c3e50"
         android:pathData="M15.79284,9.96054l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#232629"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#232629"
         android:pathData="M19.87556,9.96054l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#4d4d4d"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#4d4d4d"
         android:pathData="M23.95828,9.96054l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#95a5a6"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#95a5a6"
         android:pathData="M28.04099,9.96054l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#eff0f1"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#eff0f1"
         android:pathData="M32.12371,9.96054l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#ffffff" android:fillType="nonZero"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="nonZero"
         android:pathData="M0.70721,4.61894 L0.5052,4.88718c-0,0 0.19155,0.15437 0.2935,0.22688 0.04087,0.02235 0.02971,0.02814 0.10131,0.03513l2.08763,-0.0023 2.08763,0.0023c0.0716,-0.00699 0.06106,-0.01277 0.10193,-0.03513C5.27913,5.04155 5.47006,4.88718 5.47006,4.88718L5.26805,4.61894 5.01815,4.81242 3.13561,4.81127H2.83965l-1.88193,0.00115z"
-        android:strokeColor="#00000000" android:strokeLineCap="butt"
-        android:strokeLineJoin="miter" android:strokeWidth="0.304444"/>
-    <path android:fillAlpha="0.997" android:fillColor="#ffffff"
+        android:strokeWidth="0.304444"
+        android:strokeColor="#00000000"
+        android:strokeLineCap="butt"
+        android:strokeLineJoin="miter" />
+    <path
+        android:fillAlpha="0.997"
+        android:fillColor="#ffffff"
         android:pathData="M1.42826,5.41433m-0.11492,0a0.11492,0.11492 0,1 1,0.22984 0a0.11492,0.11492 0,1 1,-0.22984 0"
-        android:strokeAlpha="0.997" android:strokeColor="#ffffff"
-        android:strokeLineJoin="round" android:strokeWidth="0.264999"/>
-    <path android:fillAlpha="0.997" android:fillColor="#ffffff"
+        android:strokeWidth="0.264999"
+        android:strokeAlpha="0.997"
+        android:strokeColor="#ffffff"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillAlpha="0.997"
+        android:fillColor="#ffffff"
         android:pathData="M4.43871,5.41433m-0.11492,0a0.11492,0.11492 0,1 1,0.22984 0a0.11492,0.11492 0,1 1,-0.22984 0"
-        android:strokeAlpha="0.997" android:strokeColor="#ffffff"
-        android:strokeLineJoin="round" android:strokeWidth="0.264999"/>
+        android:strokeWidth="0.264999"
+        android:strokeAlpha="0.997"
+        android:strokeColor="#ffffff"
+        android:strokeLineJoin="round" />
 </vector>
diff --git a/src/main/res/drawable/ic_activity_skiing_24dp.xml b/src/main/res/drawable/ic_activity_skiing_24dp.xml
index 585f28363..2c8b51b0a 100644
--- a/src/main/res/drawable/ic_activity_skiing_24dp.xml
+++ b/src/main/res/drawable/ic_activity_skiing_24dp.xml
@@ -1,113 +1,225 @@
-<vector android:height="24dp" android:viewportHeight="5.820833"
-    android:viewportWidth="5.820833" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#ffffff"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="5.820833"
+    android:viewportHeight="5.820833">
+    <path
+        android:fillColor="#ffffff"
         android:pathData="M4.55855,1.86825C4.73058,2.03776 5.01001,2.0357 5.17952,1.86368 5.34903,1.69166 5.34698,1.41222 5.17496,1.24271 5.00294,1.0732 4.7235,1.07526 4.55399,1.24728 4.38448,1.4193 4.38653,1.69874 4.55855,1.86825ZM2.56165,2.88954 L2.98181,3.74127 2.16278,4.15659 2.48907,4.51596 3.66441,3.97834 3.33242,3.2071 3.78805,2.65016C3.76019,3.08507 3.91886,3.54966 4.2629,3.88868L4.5711,3.57591C4.27398,3.28312 4.17786,2.88018 4.2685,2.53796L4.35868,2.13364C4.38859,1.97817 4.3564,1.82316 4.24693,1.71529 4.20001,1.66906 4.04313,1.53101 3.91715,1.48529 3.61094,1.37416 2.94362,1.40009 2.94362,1.40009L1.98176,1.99171 2.29453,2.29992 3.06663,1.81548 3.45599,1.82977Z"
-        android:strokeColor="#00000000" android:strokeWidth="0.219552"/>
-    <path android:fillColor="#cacaca"
+        android:strokeWidth="0.219552"
+        android:strokeColor="#00000000" />
+    <path
+        android:fillColor="#cacaca"
         android:pathData="M15.18314,-15.55645l26.53766,0l0,30.62037l-26.53766,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.6855"/>
-    <path android:fillColor="#e74c3c"
+        android:strokeWidth="14.6855"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#e74c3c"
         android:pathData="M16.20381,-14.53577l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#ed1515"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#ed1515"
         android:pathData="M20.28653,-14.53577l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#f47750"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#f47750"
         android:pathData="M24.36925,-14.53577l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#fdbc4b"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#fdbc4b"
         android:pathData="M28.45196,-14.53577l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#c9ce3b"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#c9ce3b"
         android:pathData="M32.53468,-14.53577l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#da4453"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#da4453"
         android:pathData="M16.20381,-10.45305l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#c0392b"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#c0392b"
         android:pathData="M20.28653,-10.45305l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#d35400"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#d35400"
         android:pathData="M24.36925,-10.45305l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#f67400"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#f67400"
         android:pathData="M28.45196,-10.45305l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#f39c1f"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#f39c1f"
         android:pathData="M32.53468,-10.45305l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#1cdc9a"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#1cdc9a"
         android:pathData="M16.20381,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#2ecc71"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#2ecc71"
         android:pathData="M20.28653,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#1abc9c"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#1abc9c"
         android:pathData="M24.36925,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#3498db"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#3498db"
         android:pathData="M28.45196,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#3daee9"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#3daee9"
         android:pathData="M32.53468,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#10d116"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#10d116"
         android:pathData="M16.20381,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#27ae60"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#27ae60"
         android:pathData="M20.28653,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#16a085"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#16a085"
         android:pathData="M24.36925,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#2980b9"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#2980b9"
         android:pathData="M28.45196,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#1d99f3"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#1d99f3"
         android:pathData="M32.53468,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#9b59b6"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#9b59b6"
         android:pathData="M36.6174,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#8e44ad"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#8e44ad"
         android:pathData="M36.6174,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#34495e"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#34495e"
         android:pathData="M16.20382,5.87782l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#31363b"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#31363b"
         android:pathData="M20.28654,5.87782l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#7f8c8d"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#7f8c8d"
         android:pathData="M24.36926,5.87782l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#bdc3c7"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#bdc3c7"
         android:pathData="M28.45197,5.87782l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#fcfcfc"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#fcfcfc"
         android:pathData="M32.53469,5.87782l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#2c3e50"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#2c3e50"
         android:pathData="M16.20382,9.96054l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#232629"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#232629"
         android:pathData="M20.28654,9.96054l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#4d4d4d"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#4d4d4d"
         android:pathData="M24.36926,9.96054l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#95a5a6"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#95a5a6"
         android:pathData="M28.45197,9.96054l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#eff0f1"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#eff0f1"
         android:pathData="M32.53469,9.96054l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#ffffff" android:fillType="nonZero"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="nonZero"
         android:pathData="m0.42966,3.41244 l3.27272,1.98984c0.10372,0.05566 0.09127,0.04209 0.15902,0.05977 0.17682,0.03126 0.46866,-0.03088 0.46866,-0.03088L4.25347,5.18327 3.8764,5.18921 0.56601,3.18641Z"
-        android:strokeColor="#00000000" android:strokeLineCap="butt"
-        android:strokeLineJoin="miter" android:strokeWidth="0.369514"/>
-    <path android:fillColor="#ffffff" android:fillType="nonZero"
+        android:strokeWidth="0.369514"
+        android:strokeColor="#00000000"
+        android:strokeLineCap="butt"
+        android:strokeLineJoin="miter" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="nonZero"
         android:pathData="M1.36507,1.26653 L1.23479,1.43565 1.05419,1.31077 0.93976,1.45155 1.12466,1.57807 0.9935,1.74818 1.11148,1.83902 1.24794,1.66257 4.36217,3.7944 4.47184,3.67019 1.3576,1.52018 1.48305,1.35737Z"
-        android:strokeColor="#00000000" android:strokeLineCap="butt"
-        android:strokeLineJoin="miter" android:strokeWidth="0.238916"/>
+        android:strokeWidth="0.238916"
+        android:strokeColor="#00000000"
+        android:strokeLineCap="butt"
+        android:strokeLineJoin="miter" />
 </vector>
diff --git a/src/main/res/drawable/ic_activity_snowboarding_24dp.xml b/src/main/res/drawable/ic_activity_snowboarding_24dp.xml
index cddbe1c69..7c3755275 100644
--- a/src/main/res/drawable/ic_activity_snowboarding_24dp.xml
+++ b/src/main/res/drawable/ic_activity_snowboarding_24dp.xml
@@ -1,109 +1,217 @@
-<vector android:height="24dp" android:viewportHeight="5.820833"
-    android:viewportWidth="5.820833" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#ffffff"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="5.820833"
+    android:viewportHeight="5.820833">
+    <path
+        android:fillColor="#ffffff"
         android:pathData="M3.44976,1.66236C3.71883,1.65755 3.93505,1.43346 3.93023,1.16439 3.92542,0.89531 3.70134,0.6791 3.43226,0.68391 3.16319,0.68872 2.94698,0.91281 2.95179,1.18188 2.9566,1.45096 3.18069,1.66717 3.44976,1.66236ZM3.06374,4.72097 L2.84991,3.85537 3.50506,4.12768 4.03189,5.49779 4.48859,5.32218 3.83005,3.60955 3.1749,3.33723 3.37709,2.81124C3.70165,3.17247 4.18343,3.43524 4.72158,3.42562L4.71283,2.93639C4.24807,2.94471 3.95867,2.75436 3.75685,2.4154L3.50524,2.0284C3.40477,1.88338 3.25626,1.78816 3.08503,1.79122 3.01165,1.79254 2.96316,1.81787 2.88978,1.81919L1.62742,2.38008 1.24713,3.41652 1.65384,3.63228 2.0692,2.69706 2.55957,2.51022 2.10811,3.64237 2.40897,4.54915 1.31643,5.24782 1.94801,5.3616Z"
-        android:strokeColor="#00000000" android:strokeWidth="0.244651"/>
-    <path android:fillColor="#cacaca"
+        android:strokeWidth="0.244651"
+        android:strokeColor="#00000000" />
+    <path
+        android:fillColor="#cacaca"
         android:pathData="M14.77216,-15.55645l26.53766,0l0,30.62037l-26.53766,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.6855"/>
-    <path android:fillColor="#e74c3c"
+        android:strokeWidth="14.6855"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#e74c3c"
         android:pathData="M15.79283,-14.53577l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#ed1515"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#ed1515"
         android:pathData="M19.87555,-14.53577l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#f47750"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#f47750"
         android:pathData="M23.95827,-14.53577l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#fdbc4b"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#fdbc4b"
         android:pathData="M28.04098,-14.53577l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#c9ce3b"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#c9ce3b"
         android:pathData="M32.1237,-14.53577l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#da4453"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#da4453"
         android:pathData="M15.79283,-10.45305l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#c0392b"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#c0392b"
         android:pathData="M19.87555,-10.45305l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#d35400"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#d35400"
         android:pathData="M23.95827,-10.45305l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#f67400"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#f67400"
         android:pathData="M28.04098,-10.45305l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#f39c1f"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#f39c1f"
         android:pathData="M32.1237,-10.45305l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#1cdc9a"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#1cdc9a"
         android:pathData="M15.79283,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#2ecc71"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#2ecc71"
         android:pathData="M19.87555,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#1abc9c"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#1abc9c"
         android:pathData="M23.95827,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#3498db"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#3498db"
         android:pathData="M28.04098,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#3daee9"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#3daee9"
         android:pathData="M32.1237,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#10d116"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#10d116"
         android:pathData="M15.79283,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#27ae60"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#27ae60"
         android:pathData="M19.87555,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#16a085"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#16a085"
         android:pathData="M23.95827,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#2980b9"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#2980b9"
         android:pathData="M28.04098,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#1d99f3"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#1d99f3"
         android:pathData="M32.1237,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#9b59b6"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#9b59b6"
         android:pathData="M36.20642,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#8e44ad"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#8e44ad"
         android:pathData="M36.20642,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#34495e"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#34495e"
         android:pathData="M15.79284,5.87782l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#31363b"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#31363b"
         android:pathData="M19.87556,5.87782l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#7f8c8d"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#7f8c8d"
         android:pathData="M23.95828,5.87782l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#bdc3c7"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#bdc3c7"
         android:pathData="M28.04099,5.87782l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#fcfcfc"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#fcfcfc"
         android:pathData="M32.12371,5.87782l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#2c3e50"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#2c3e50"
         android:pathData="M15.79284,9.96054l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#232629"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#232629"
         android:pathData="M19.87556,9.96054l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#4d4d4d"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#4d4d4d"
         android:pathData="M23.95828,9.96054l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#95a5a6"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#95a5a6"
         android:pathData="M28.04099,9.96054l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#eff0f1"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#eff0f1"
         android:pathData="M32.12371,9.96054l4.08272,0l0,4.08272l-4.08272,0z"
-        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="14.955"/>
-    <path android:fillColor="#ffffff" android:fillType="nonZero"
+        android:strokeWidth="14.955"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="nonZero"
         android:pathData="M0.70721,5.0089 L0.5052,5.27714c-0,0 0.19155,0.15437 0.2935,0.22688 0.04087,0.02235 0.02971,0.02814 0.10131,0.03513l2.08763,-0.0023 2.08763,0.0023c0.0716,-0.00699 0.06106,-0.01277 0.10193,-0.03513C5.27913,5.43151 5.47006,5.27714 5.47006,5.27714L5.26805,5.0089 5.01815,5.20238 3.13561,5.20123H2.83965l-1.88193,0.00115z"
-        android:strokeColor="#00000000" android:strokeLineCap="butt"
-        android:strokeLineJoin="miter" android:strokeWidth="0.304444"/>
+        android:strokeWidth="0.304444"
+        android:strokeColor="#00000000"
+        android:strokeLineCap="butt"
+        android:strokeLineJoin="miter" />
 </vector>
diff --git a/src/main/res/drawable/ic_activity_walk_24dp.xml b/src/main/res/drawable/ic_activity_walk_24dp.xml
index 1e2de9195..93ecbe827 100644
--- a/src/main/res/drawable/ic_activity_walk_24dp.xml
+++ b/src/main/res/drawable/ic_activity_walk_24dp.xml
@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M13.5,5.5c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM9.8,8.9L7,23h2.1l1.8,-8 2.1,2v6h2v-7.5l-2.1,-2 0.6,-3C14.8,12 16.8,13 19,13v-2c-1.9,0 -3.5,-1 -4.3,-2.4l-1,-1.6c-0.4,-0.6 -1,-1 -1.7,-1 -0.3,0 -0.5,0.1 -0.8,0.1L6,8.3V13h2V9.6l1.8,-0.7"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M13.5,5.5c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM9.8,8.9L7,23h2.1l1.8,-8 2.1,2v6h2v-7.5l-2.1,-2 0.6,-3C14.8,12 16.8,13 19,13v-2c-1.9,0 -3.5,-1 -4.3,-2.4l-1,-1.6c-0.4,-0.6 -1,-1 -1.7,-1 -0.3,0 -0.5,0.1 -0.8,0.1L6,8.3V13h2V9.6l1.8,-0.7" />
 </vector>
diff --git a/src/main/res/drawable/ic_add_a_photo_24dp.xml b/src/main/res/drawable/ic_add_a_photo_24dp.xml
index e519d26c9..375995c69 100644
--- a/src/main/res/drawable/ic_add_a_photo_24dp.xml
+++ b/src/main/res/drawable/ic_add_a_photo_24dp.xml
@@ -4,7 +4,7 @@
     android:tint="@android:color/white"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M3,4V1h2v3h3v2H5v3H3V6H0V4H3zM6,10V7h3V4h7l1.83,2H21c1.1,0 2,0.9 2,2v12c0,1.1 -0.9,2 -2,2H5c-1.1,0 -2,-0.9 -2,-2V10H6zM13,19c2.76,0 5,-2.24 5,-5s-2.24,-5 -5,-5s-5,2.24 -5,5S10.24,19 13,19zM9.8,14c0,1.77 1.43,3.2 3.2,3.2s3.2,-1.43 3.2,-3.2s-1.43,-3.2 -3.2,-3.2S9.8,12.23 9.8,14z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M3,4V1h2v3h3v2H5v3H3V6H0V4H3zM6,10V7h3V4h7l1.83,2H21c1.1,0 2,0.9 2,2v12c0,1.1 -0.9,2 -2,2H5c-1.1,0 -2,-0.9 -2,-2V10H6zM13,19c2.76,0 5,-2.24 5,-5s-2.24,-5 -5,-5s-5,2.24 -5,5S10.24,19 13,19zM9.8,14c0,1.77 1.43,3.2 3.2,3.2s3.2,-1.43 3.2,-3.2s-1.43,-3.2 -3.2,-3.2S9.8,12.23 9.8,14z" />
 </vector>
diff --git a/src/main/res/drawable/ic_add_photo_alternate_24dp.xml b/src/main/res/drawable/ic_add_photo_alternate_24dp.xml
index a63ecb49c..ad610fa67 100644
--- a/src/main/res/drawable/ic_add_photo_alternate_24dp.xml
+++ b/src/main/res/drawable/ic_add_photo_alternate_24dp.xml
@@ -4,7 +4,7 @@
     android:tint="@android:color/white"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M19,7v2.99s-1.99,0.01 -2,0L17,7h-3s0.01,-1.99 0,-2h3L17,2h2v3h3v2h-3zM16,11L16,8h-3L13,5L5,5c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2v-8h-3zM5,19l3,-4 2,3 3,-4 4,5L5,19z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M19,7v2.99s-1.99,0.01 -2,0L17,7h-3s0.01,-1.99 0,-2h3L17,2h2v3h3v2h-3zM16,11L16,8h-3L13,5L5,5c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2v-8h-3zM5,19l3,-4 2,3 3,-4 4,5L5,19z" />
 </vector>
diff --git a/src/main/res/drawable/ic_bluetooth_searching_24dp.xml b/src/main/res/drawable/ic_bluetooth_searching_24dp.xml
index 11d628f14..918521de0 100644
--- a/src/main/res/drawable/ic_bluetooth_searching_24dp.xml
+++ b/src/main/res/drawable/ic_bluetooth_searching_24dp.xml
@@ -1,18 +1,18 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="#FFFFFF"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="#FFFFFF">
-  <path
-      android:name="smallDot"
-      android:pathData="m14.24,12.01 l2.32,2.32C16.84,13.61 17,12.82 17,12 17,11.18 16.84,10.41 16.57,9.69Z"
-      android:fillColor="#000000" />
-  <path
-      android:name="bigDot"
-      android:pathData="m19.53,6.71 l-1.26,1.26c0.63,1.21 0.98,2.57 0.98,4.02 0,1.45 -0.36,2.82 -0.98,4.02l1.2,1.2C20.44,15.67 21.01,13.85 21.01,11.9 21,10.01 20.46,8.23 19.53,6.71Z"
-      android:fillColor="#000000" />
-  <path
-      android:pathData="M12.88,16.29 L11,18.17V14.41ZM11,5.83 L12.88,7.71 11,9.59ZM15.71,7.71 L10,2H9V9.59L4.41,5 3,6.41 8.59,12 3,17.59 4.41,19 9,14.41V22h1L15.71,16.29 11.41,12Z"
-      android:fillColor="#000000" />
+    android:viewportHeight="24">
+    <path
+        android:name="smallDot"
+        android:fillColor="#000000"
+        android:pathData="m14.24,12.01 l2.32,2.32C16.84,13.61 17,12.82 17,12 17,11.18 16.84,10.41 16.57,9.69Z" />
+    <path
+        android:name="bigDot"
+        android:fillColor="#000000"
+        android:pathData="m19.53,6.71 l-1.26,1.26c0.63,1.21 0.98,2.57 0.98,4.02 0,1.45 -0.36,2.82 -0.98,4.02l1.2,1.2C20.44,15.67 21.01,13.85 21.01,11.9 21,10.01 20.46,8.23 19.53,6.71Z" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M12.88,16.29 L11,18.17V14.41ZM11,5.83 L12.88,7.71 11,9.59ZM15.71,7.71 L10,2H9V9.59L4.41,5 3,6.41 8.59,12 3,17.59 4.41,19 9,14.41V22h1L15.71,16.29 11.41,12Z" />
 </vector>
diff --git a/src/main/res/drawable/ic_button_pause.xml b/src/main/res/drawable/ic_button_pause.xml
index 3dc7e0814..0bcf0da0e 100644
--- a/src/main/res/drawable/ic_button_pause.xml
+++ b/src/main/res/drawable/ic_button_pause.xml
@@ -24,9 +24,9 @@
         android:strokeWidth="4.82273865"
         android:strokeAlpha="1"
         android:strokeColor="#00000000" />
-    <path android:name="fade_out_circle"
-        android:pathData="M62.5,62.5m-0,-62a50,50 0,1 1,-0 123a50,50 0,1 1,-0 -123"
+    <path
+        android:name="fade_out_circle"
         android:fillAlpha="0.0"
-        android:fillColor="#a31a1f">
-    </path>
+        android:fillColor="#a31a1f"
+        android:pathData="M62.5,62.5m-0,-62a50,50 0,1 1,-0 123a50,50 0,1 1,-0 -123"></path>
 </vector>
diff --git a/src/main/res/drawable/ic_button_pause_anim.xml b/src/main/res/drawable/ic_button_pause_anim.xml
index 87e111c08..16851e029 100644
--- a/src/main/res/drawable/ic_button_pause_anim.xml
+++ b/src/main/res/drawable/ic_button_pause_anim.xml
@@ -1,5 +1,5 @@
 <animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:drawable="@drawable/ic_button_pause" >
+    android:drawable="@drawable/ic_button_pause">
     <target
         android:name="fade_out_circle"
         android:animation="@animator/button_animator" />
diff --git a/src/main/res/drawable/ic_button_stop.xml b/src/main/res/drawable/ic_button_stop.xml
index 4937530c7..702df6135 100644
--- a/src/main/res/drawable/ic_button_stop.xml
+++ b/src/main/res/drawable/ic_button_stop.xml
@@ -25,9 +25,9 @@
         android:strokeWidth="1.04023623"
         android:strokeAlpha="1"
         android:strokeColor="#414141" />
-    <path android:name="fade_out_circle"
-        android:pathData="M62.5,62.5m-0,-62a50,50 0,1 1,-0 123a50,50 0,1 1,-0 -123"
+    <path
+        android:name="fade_out_circle"
         android:fillAlpha="0.0"
-        android:fillColor="#a31a1f">
-    </path>
+        android:fillColor="#a31a1f"
+        android:pathData="M62.5,62.5m-0,-62a50,50 0,1 1,-0 123a50,50 0,1 1,-0 -123"></path>
 </vector>
diff --git a/src/main/res/drawable/ic_button_stop_anim.xml b/src/main/res/drawable/ic_button_stop_anim.xml
index be687f36e..22e792815 100644
--- a/src/main/res/drawable/ic_button_stop_anim.xml
+++ b/src/main/res/drawable/ic_button_stop_anim.xml
@@ -28,11 +28,11 @@
                 android:strokeWidth="1.04023623"
                 android:strokeAlpha="1"
                 android:strokeColor="#414141" />
-            <path android:name="fade_out_circle"
-                android:pathData="M62.5,62.5m-0,-62a50,50 0,1 1,-0 123a50,50 0,1 1,-0 -123"
+            <path
+                android:name="fade_out_circle"
                 android:fillAlpha="0.0"
-                android:fillColor="#a31a1f">
-            </path>
+                android:fillColor="#a31a1f"
+                android:pathData="M62.5,62.5m-0,-62a50,50 0,1 1,-0 123a50,50 0,1 1,-0 -123"></path>
         </vector>
     </aapt:attr>
     <target
diff --git a/src/main/res/drawable/ic_delete_forever_24dp.xml b/src/main/res/drawable/ic_delete_forever_24dp.xml
index 0d6fef810..cd7e70a6a 100644
--- a/src/main/res/drawable/ic_delete_forever_24dp.xml
+++ b/src/main/res/drawable/ic_delete_forever_24dp.xml
@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2L18,7L6,7v12zM8.46,11.88l1.41,-1.41L12,12.59l2.12,-2.12 1.41,1.41L13.41,14l2.12,2.12 -1.41,1.41L12,15.41l-2.12,2.12 -1.41,-1.41L10.59,14l-2.13,-2.12zM15.5,4l-1,-1h-5l-1,1L5,4v2h14L19,4z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2L18,7L6,7v12zM8.46,11.88l1.41,-1.41L12,12.59l2.12,-2.12 1.41,1.41L13.41,14l2.12,2.12 -1.41,1.41L12,15.41l-2.12,2.12 -1.41,-1.41L10.59,14l-2.13,-2.12zM15.5,4l-1,-1h-5l-1,1L5,4v2h14L19,4z" />
 </vector>
diff --git a/src/main/res/drawable/ic_dialog_error_24dp.xml b/src/main/res/drawable/ic_dialog_error_24dp.xml
index d191ba926..1d14bc4ab 100644
--- a/src/main/res/drawable/ic_dialog_error_24dp.xml
+++ b/src/main/res/drawable/ic_dialog_error_24dp.xml
@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-2h2v2zM13,13h-2L11,7h2v6z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-2h2v2zM13,13h-2L11,7h2v6z" />
 </vector>
diff --git a/src/main/res/drawable/ic_dialog_info_24dp.xml b/src/main/res/drawable/ic_dialog_info_24dp.xml
index 7be014728..e5a399d3c 100644
--- a/src/main/res/drawable/ic_dialog_info_24dp.xml
+++ b/src/main/res/drawable/ic_dialog_info_24dp.xml
@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-6h2v6zM13,9h-2L11,7h2v2z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-6h2v6zM13,9h-2L11,7h2v2z" />
 </vector>
diff --git a/src/main/res/drawable/ic_dialog_success_24dp.xml b/src/main/res/drawable/ic_dialog_success_24dp.xml
index 7cdc15de0..313720186 100644
--- a/src/main/res/drawable/ic_dialog_success_24dp.xml
+++ b/src/main/res/drawable/ic_dialog_success_24dp.xml
@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM10,17l-5,-5 1.41,-1.41L10,14.17l7.59,-7.59L19,8l-9,9z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM10,17l-5,-5 1.41,-1.41L10,14.17l7.59,-7.59L19,8l-9,9z" />
 </vector>
diff --git a/src/main/res/drawable/ic_edit_24dp.xml b/src/main/res/drawable/ic_edit_24dp.xml
index 46462b572..ef358ff74 100644
--- a/src/main/res/drawable/ic_edit_24dp.xml
+++ b/src/main/res/drawable/ic_edit_24dp.xml
@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z" />
 </vector>
diff --git a/src/main/res/drawable/ic_gps_fixed_24dp.xml b/src/main/res/drawable/ic_gps_fixed_24dp.xml
index 2ed495236..7224e3584 100644
--- a/src/main/res/drawable/ic_gps_fixed_24dp.xml
+++ b/src/main/res/drawable/ic_gps_fixed_24dp.xml
@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M12,8c-2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM20.94,11c-0.46,-4.17 -3.77,-7.48 -7.94,-7.94L13,1h-2v2.06C6.83,3.52 3.52,6.83 3.06,11L1,11v2h2.06c0.46,4.17 3.77,7.48 7.94,7.94L11,23h2v-2.06c4.17,-0.46 7.48,-3.77 7.94,-7.94L23,13v-2h-2.06zM12,19c-3.87,0 -7,-3.13 -7,-7s3.13,-7 7,-7 7,3.13 7,7 -3.13,7 -7,7z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,8c-2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM20.94,11c-0.46,-4.17 -3.77,-7.48 -7.94,-7.94L13,1h-2v2.06C6.83,3.52 3.52,6.83 3.06,11L1,11v2h2.06c0.46,4.17 3.77,7.48 7.94,7.94L11,23h2v-2.06c4.17,-0.46 7.48,-3.77 7.94,-7.94L23,13v-2h-2.06zM12,19c-3.87,0 -7,-3.13 -7,-7s3.13,-7 7,-7 7,3.13 7,7 -3.13,7 -7,7z" />
 </vector>
diff --git a/src/main/res/drawable/ic_gps_not_fixed_24dp.xml b/src/main/res/drawable/ic_gps_not_fixed_24dp.xml
index 82448cca3..af77dcf23 100644
--- a/src/main/res/drawable/ic_gps_not_fixed_24dp.xml
+++ b/src/main/res/drawable/ic_gps_not_fixed_24dp.xml
@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M20.94,11c-0.46,-4.17 -3.77,-7.48 -7.94,-7.94V1h-2v2.06C6.83,3.52 3.52,6.83 3.06,11H1v2h2.06c0.46,4.17 3.77,7.48 7.94,7.94V23h2v-2.06c4.17,-0.46 7.48,-3.77 7.94,-7.94H23v-2h-2.06zM12,19c-3.87,0 -7,-3.13 -7,-7s3.13,-7 7,-7 7,3.13 7,7 -3.13,7 -7,7z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M20.94,11c-0.46,-4.17 -3.77,-7.48 -7.94,-7.94V1h-2v2.06C6.83,3.52 3.52,6.83 3.06,11H1v2h2.06c0.46,4.17 3.77,7.48 7.94,7.94V23h2v-2.06c4.17,-0.46 7.48,-3.77 7.94,-7.94H23v-2h-2.06zM12,19c-3.87,0 -7,-3.13 -7,-7s3.13,-7 7,-7 7,3.13 7,7 -3.13,7 -7,7z" />
 </vector>
diff --git a/src/main/res/drawable/ic_gps_off_24dp.xml b/src/main/res/drawable/ic_gps_off_24dp.xml
index 973b4cc1e..98ac9b284 100644
--- a/src/main/res/drawable/ic_gps_off_24dp.xml
+++ b/src/main/res/drawable/ic_gps_off_24dp.xml
@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M20.94,11c-0.46,-4.17 -3.77,-7.48 -7.94,-7.94L13,1h-2v2.06c-1.13,0.12 -2.19,0.46 -3.16,0.97l1.5,1.5C10.16,5.19 11.06,5 12,5c3.87,0 7,3.13 7,7 0,0.94 -0.19,1.84 -0.52,2.65l1.5,1.5c0.5,-0.96 0.84,-2.02 0.97,-3.15L23,13v-2h-2.06zM3,4.27l2.04,2.04C3.97,7.62 3.25,9.23 3.06,11L1,11v2h2.06c0.46,4.17 3.77,7.48 7.94,7.94L11,23h2v-2.06c1.77,-0.2 3.38,-0.91 4.69,-1.98L19.73,21 21,19.73 4.27,3 3,4.27zM16.27,17.54C15.09,18.45 13.61,19 12,19c-3.87,0 -7,-3.13 -7,-7 0,-1.61 0.55,-3.09 1.46,-4.27l9.81,9.81z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M20.94,11c-0.46,-4.17 -3.77,-7.48 -7.94,-7.94L13,1h-2v2.06c-1.13,0.12 -2.19,0.46 -3.16,0.97l1.5,1.5C10.16,5.19 11.06,5 12,5c3.87,0 7,3.13 7,7 0,0.94 -0.19,1.84 -0.52,2.65l1.5,1.5c0.5,-0.96 0.84,-2.02 0.97,-3.15L23,13v-2h-2.06zM3,4.27l2.04,2.04C3.97,7.62 3.25,9.23 3.06,11L1,11v2h2.06c0.46,4.17 3.77,7.48 7.94,7.94L11,23h2v-2.06c1.77,-0.2 3.38,-0.91 4.69,-1.98L19.73,21 21,19.73 4.27,3 3,4.27zM16.27,17.54C15.09,18.45 13.61,19 12,19c-3.87,0 -7,-3.13 -7,-7 0,-1.61 0.55,-3.09 1.46,-4.27l9.81,9.81z" />
 </vector>
diff --git a/src/main/res/drawable/ic_gps_ready_animation.xml b/src/main/res/drawable/ic_gps_ready_animation.xml
index a0cc60b41..0b9054fb7 100644
--- a/src/main/res/drawable/ic_gps_ready_animation.xml
+++ b/src/main/res/drawable/ic_gps_ready_animation.xml
@@ -1,37 +1,36 @@
-<animated-vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:aapt="http://schemas.android.com/aapt">
     <aapt:attr name="android:drawable">
         <vector
             android:name="vector"
             android:width="24dp"
             android:height="24dp"
+            android:tint="#FFFFFF"
             android:viewportWidth="24"
-            android:viewportHeight="24"
-            android:tint="#FFFFFF">
+            android:viewportHeight="24">
             <path
                 android:name="path"
-                android:pathData="M 20.94 11 C 20.48 6.83 17.17 3.52 13 3.06 L 13 1 L 11 1 L 11 3.06 C 6.83 3.52 3.52 6.83 3.06 11 L 1 11 L 1 13 L 3.06 13 C 3.52 17.17 6.83 20.48 11 20.94 L 11 23 L 13 23 L 13 20.94 C 17.17 20.48 20.48 17.17 20.94 13 L 23 13 L 23 11 L 20.94 11 Z M 12 19 C 8.13 19 5 15.87 5 12 C 5 8.13 8.13 5 12 5 C 15.87 5 19 8.13 19 12 C 19 15.87 15.87 19 12 19 Z"
                 android:fillColor="#000"
-                android:strokeWidth="1"/>
+                android:pathData="M 20.94 11 C 20.48 6.83 17.17 3.52 13 3.06 L 13 1 L 11 1 L 11 3.06 C 6.83 3.52 3.52 6.83 3.06 11 L 1 11 L 1 13 L 3.06 13 C 3.52 17.17 6.83 20.48 11 20.94 L 11 23 L 13 23 L 13 20.94 C 17.17 20.48 20.48 17.17 20.94 13 L 23 13 L 23 11 L 20.94 11 Z M 12 19 C 8.13 19 5 15.87 5 12 C 5 8.13 8.13 5 12 5 C 15.87 5 19 8.13 19 12 C 19 15.87 15.87 19 12 19 Z"
+                android:strokeWidth="1" />
             <path
                 android:name="path_1"
-                android:pathData="M 12 8 C 10.94 8 9.921 8.422 9.172 9.172 C 8.422 9.921 8 10.94 8 12 C 8 13.06 8.422 14.079 9.172 14.828 C 9.921 15.578 10.94 16 12 16 C 13.06 16 14.079 15.578 14.828 14.828 C 15.578 14.079 16 13.06 16 12 C 16 10.94 15.578 9.921 14.828 9.172 C 14.079 8.422 13.06 8 12 8 Z"
                 android:fillColor="#000001"
-                android:strokeWidth="1"/>
+                android:pathData="M 12 8 C 10.94 8 9.921 8.422 9.172 9.172 C 8.422 9.921 8 10.94 8 12 C 8 13.06 8.422 14.079 9.172 14.828 C 9.921 15.578 10.94 16 12 16 C 13.06 16 14.079 15.578 14.828 14.828 C 15.578 14.079 16 13.06 16 12 C 16 10.94 15.578 9.921 14.828 9.172 C 14.079 8.422 13.06 8 12 8 Z"
+                android:strokeWidth="1" />
         </vector>
     </aapt:attr>
     <target android:name="path_1">
         <aapt:attr name="android:animation">
             <objectAnimator
-                android:propertyName="fillAlpha"
                 android:duration="2000"
+                android:interpolator="@android:anim/linear_interpolator"
+                android:propertyName="fillAlpha"
+                android:repeatCount="infinite"
+                android:repeatMode="restart"
                 android:valueFrom="1"
                 android:valueTo="0"
-                android:valueType="floatType"
-                android:interpolator="@android:anim/linear_interpolator"
-                android:repeatCount="infinite"
-                android:repeatMode="restart"/>
+                android:valueType="floatType" />
         </aapt:attr>
     </target>
 </animated-vector>
diff --git a/src/main/res/drawable/ic_logo_color_108dp.xml b/src/main/res/drawable/ic_logo_color_108dp.xml
index eede2ad48..705909e0d 100644
--- a/src/main/res/drawable/ic_logo_color_108dp.xml
+++ b/src/main/res/drawable/ic_logo_color_108dp.xml
@@ -4,30 +4,30 @@
     android:height="108dp"
     android:viewportWidth="108"
     android:viewportHeight="108">
-  <group
-      android:scaleX="0.56"
-      android:scaleY="0.56"
-      android:translateX="21.50"
-      android:translateY="24.00">
-    <path
-        android:strokeWidth="1"
-        android:pathData="M85.133,20.59C85.731,18.546 84.756,17.817 82.965,18.968L23.874,56.967c-1.791,1.152 -1.519,2.224 0.604,2.382L49.019,61.18c2.124,0.159 4.477,1.918 5.229,3.91l8.7,23.021c0.753,1.992 1.857,1.949 2.455,-0.094z"
-        android:strokeColor="#f69123">
-      <aapt:attr name="android:fillColor">
-        <gradient
-            android:startY="80.33152"
-            android:startX="38.773293"
-            android:endY="19.211866"
-            android:endX="84.4913"
-            android:type="linear">
-          <item
-              android:offset="0"
-              android:color="#FFFBB22F" />
-          <item
-              android:offset="1"
-              android:color="#FFF58820" />
-        </gradient>
-      </aapt:attr>
-    </path>
-  </group>
+    <group
+        android:scaleX="0.56"
+        android:scaleY="0.56"
+        android:translateX="21.50"
+        android:translateY="24.00">
+        <path
+            android:pathData="M85.133,20.59C85.731,18.546 84.756,17.817 82.965,18.968L23.874,56.967c-1.791,1.152 -1.519,2.224 0.604,2.382L49.019,61.18c2.124,0.159 4.477,1.918 5.229,3.91l8.7,23.021c0.753,1.992 1.857,1.949 2.455,-0.094z"
+            android:strokeWidth="1"
+            android:strokeColor="#f69123">
+            <aapt:attr name="android:fillColor">
+                <gradient
+                    android:endX="84.4913"
+                    android:endY="19.211866"
+                    android:startX="38.773293"
+                    android:startY="80.33152"
+                    android:type="linear">
+                    <item
+                        android:color="#FFFBB22F"
+                        android:offset="0" />
+                    <item
+                        android:color="#FFF58820"
+                        android:offset="1" />
+                </gradient>
+            </aapt:attr>
+        </path>
+    </group>
 </vector>
diff --git a/src/main/res/drawable/ic_map_24dp.xml b/src/main/res/drawable/ic_map_24dp.xml
index 4cb341e6e..4c033df9b 100644
--- a/src/main/res/drawable/ic_map_24dp.xml
+++ b/src/main/res/drawable/ic_map_24dp.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M20.5,3l-0.16,0.03L15,5.1 9,3 3.36,4.9c-0.21,0.07 -0.36,0.25 -0.36,0.48V20.5c0,0.28 0.22,0.5 0.5,0.5l0.16,-0.03L9,18.9l6,2.1 5.64,-1.9c0.21,-0.07 0.36,-0.25 0.36,-0.48V3.5c0,-0.28 -0.22,-0.5 -0.5,-0.5zM15,19l-6,-2.11V5l6,2.11V19z"/>
+        android:pathData="M20.5,3l-0.16,0.03L15,5.1 9,3 3.36,4.9c-0.21,0.07 -0.36,0.25 -0.36,0.48V20.5c0,0.28 0.22,0.5 0.5,0.5l0.16,-0.03L9,18.9l6,2.1 5.64,-1.9c0.21,-0.07 0.36,-0.25 0.36,-0.48V3.5c0,-0.28 -0.22,-0.5 -0.5,-0.5zM15,19l-6,-2.11V5l6,2.11V19z" />
 </vector>
diff --git a/src/main/res/drawable/ic_marker_add_24dp.xml b/src/main/res/drawable/ic_marker_add_24dp.xml
index 8b7200f0a..47a5500e5 100644
--- a/src/main/res/drawable/ic_marker_add_24dp.xml
+++ b/src/main/res/drawable/ic_marker_add_24dp.xml
@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M12,2C8.14,2 5,5.14 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13c0,-3.86 -3.14,-7 -7,-7zM16,10h-3v3h-2v-3L8,10L8,8h3L11,5h2v3h3v2z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,2C8.14,2 5,5.14 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13c0,-3.86 -3.14,-7 -7,-7zM16,10h-3v3h-2v-3L8,10L8,8h3L11,5h2v3h3v2z" />
 </vector>
diff --git a/src/main/res/drawable/ic_marker_orange_pushpin_with_shadow.xml b/src/main/res/drawable/ic_marker_orange_pushpin_with_shadow.xml
index f0f594e54..4cc987c00 100644
--- a/src/main/res/drawable/ic_marker_orange_pushpin_with_shadow.xml
+++ b/src/main/res/drawable/ic_marker_orange_pushpin_with_shadow.xml
@@ -1,25 +1,25 @@
-<vector android:height="34dp"
-    android:viewportHeight="297"
-    android:viewportWidth="210"
-    android:width="24.040403dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:aapt="http://schemas.android.com/aapt"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="24.040403dp"
+    android:height="34dp"
+    android:viewportWidth="210"
+    android:viewportHeight="297">
     <path
         android:fillAlpha="0.49421525"
         android:fillColor="#333333"
         android:pathData="m108.528,213.298a56.035,7.006 5.281,0 0,-22.426 2.532,56.035 7.006,5.281 0,0 -0.234,0.177l-0.207,-0.024c-0.045,0.116 -0.075,0.231 -0.096,0.348a56.035,7.006 5.281,0 0,0.338 1.582c0.981,1.709 3.761,3.463 6.584,5.219l-22.744,15.5a67.065,11.557 4.228,0 0,-39.968 5.269,67.065 11.557,4.228 0,0 -0.729,0.576 67.065,11.557 4.228,0 0,-2.754 1.364,67.065 11.557,4.228 0,0 38.909,16.043l-32.177,27.065 52.228,-24.746a67.065,11.557 4.228,0 0,71.411 -3.819,67.065 11.557,4.228 0,0 0.728,-0.575 67.065,11.557 4.228,0 0,2.755 -1.364,67.065 11.557,4.228 0,0 -12.384,-10.598 40.034,5.073 5.25,0 0,0.056 -0.037,40.034 5.073,5.25 0,0 0.377,-0.343l22.452,-15.301c8.236,-0.652 17.656,-1.478 22.944,-3.01a56.035,7.006 5.281,0 0,2.655 -1.038,56.035 7.006,5.281 0,0 -46.084,-12.27 56.035,7.006 5.281,0 0,-41.636 -2.55z"
+        android:strokeWidth="0.138931"
         android:strokeAlpha="0.265501"
         android:strokeColor="#000000"
         android:strokeLineCap="butt"
-        android:strokeLineJoin="miter"
-        android:strokeWidth="0.138931" />
+        android:strokeLineJoin="miter" />
     <path
         android:pathData="M70.603,174.308 L33.024,288.947 94.567,183.195Z"
+        android:strokeWidth="0.264583"
         android:strokeAlpha="0.265501"
         android:strokeColor="#000000"
         android:strokeLineCap="butt"
-        android:strokeLineJoin="miter"
-        android:strokeWidth="0.264583">
+        android:strokeLineJoin="miter">
         <aapt:attr name="android:fillColor">
             <gradient
                 android:endX="67.193245"
diff --git a/src/main/res/drawable/ic_marker_show_24dp.xml b/src/main/res/drawable/ic_marker_show_24dp.xml
index aea56cb5a..9455792b3 100644
--- a/src/main/res/drawable/ic_marker_show_24dp.xml
+++ b/src/main/res/drawable/ic_marker_show_24dp.xml
@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13c0,-3.87 -3.13,-7 -7,-7zM12,11.5c-1.38,0 -2.5,-1.12 -2.5,-2.5s1.12,-2.5 2.5,-2.5 2.5,1.12 2.5,2.5 -1.12,2.5 -2.5,2.5z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13c0,-3.87 -3.13,-7 -7,-7zM12,11.5c-1.38,0 -2.5,-1.12 -2.5,-2.5s1.12,-2.5 2.5,-2.5 2.5,1.12 2.5,2.5 -1.12,2.5 -2.5,2.5z" />
 </vector>
diff --git a/src/main/res/drawable/ic_play_circle_24dp.xml b/src/main/res/drawable/ic_play_circle_24dp.xml
index 930ee0ed5..140cd484d 100644
--- a/src/main/res/drawable/ic_play_circle_24dp.xml
+++ b/src/main/res/drawable/ic_play_circle_24dp.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM10,16.5v-9l6,4.5 -6,4.5z"
-      android:fillColor="#ffffff"/>
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM10,16.5v-9l6,4.5 -6,4.5z" />
 </vector>
diff --git a/src/main/res/drawable/ic_select_all_24dp.xml b/src/main/res/drawable/ic_select_all_24dp.xml
index bc75904c3..61f46ee8f 100644
--- a/src/main/res/drawable/ic_select_all_24dp.xml
+++ b/src/main/res/drawable/ic_select_all_24dp.xml
@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M3,5h2L5,3c-1.1,0 -2,0.9 -2,2zM3,13h2v-2L3,11v2zM7,21h2v-2L7,19v2zM3,9h2L5,7L3,7v2zM13,3h-2v2h2L13,3zM19,3v2h2c0,-1.1 -0.9,-2 -2,-2zM5,21v-2L3,19c0,1.1 0.9,2 2,2zM3,17h2v-2L3,15v2zM9,3L7,3v2h2L9,3zM11,21h2v-2h-2v2zM19,13h2v-2h-2v2zM19,21c1.1,0 2,-0.9 2,-2h-2v2zM19,9h2L21,7h-2v2zM19,17h2v-2h-2v2zM15,21h2v-2h-2v2zM15,5h2L17,3h-2v2zM7,17h10L17,7L7,7v10zM9,9h6v6L9,15L9,9z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M3,5h2L5,3c-1.1,0 -2,0.9 -2,2zM3,13h2v-2L3,11v2zM7,21h2v-2L7,19v2zM3,9h2L5,7L3,7v2zM13,3h-2v2h2L13,3zM19,3v2h2c0,-1.1 -0.9,-2 -2,-2zM5,21v-2L3,19c0,1.1 0.9,2 2,2zM3,17h2v-2L3,15v2zM9,3L7,3v2h2L9,3zM11,21h2v-2h-2v2zM19,13h2v-2h-2v2zM19,21c1.1,0 2,-0.9 2,-2h-2v2zM19,9h2L21,7h-2v2zM19,17h2v-2h-2v2zM15,21h2v-2h-2v2zM15,5h2L17,3h-2v2zM7,17h10L17,7L7,7v10zM9,9h6v6L9,15L9,9z" />
 </vector>
diff --git a/src/main/res/drawable/ic_settings_24dp.xml b/src/main/res/drawable/ic_settings_24dp.xml
index 1397d370e..bc30c52d8 100644
--- a/src/main/res/drawable/ic_settings_24dp.xml
+++ b/src/main/res/drawable/ic_settings_24dp.xml
@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M19.1,12.9a2.8,2.8 0,0 0,0.1 -0.9,2.8 2.8,0 0,0 -0.1,-0.9l2.1,-1.6a0.7,0.7 0,0 0,0.1 -0.6L19.4,5.5a0.7,0.7 0,0 0,-0.6 -0.2l-2.4,1a6.5,6.5 0,0 0,-1.6 -0.9l-0.4,-2.6a0.5,0.5 0,0 0,-0.5 -0.4H10.1a0.5,0.5 0,0 0,-0.5 0.4L9.3,5.4a5.6,5.6 0,0 0,-1.7 0.9l-2.4,-1a0.4,0.4 0,0 0,-0.5 0.2l-2,3.4c-0.1,0.2 0,0.4 0.2,0.6l2,1.6a2.8,2.8 0,0 0,-0.1 0.9,2.8 2.8,0 0,0 0.1,0.9L2.8,14.5a0.7,0.7 0,0 0,-0.1 0.6l1.9,3.4a0.7,0.7 0,0 0,0.6 0.2l2.4,-1a6.5,6.5 0,0 0,1.6 0.9l0.4,2.6a0.5,0.5 0,0 0,0.5 0.4h3.8a0.5,0.5 0,0 0,0.5 -0.4l0.3,-2.6a5.6,5.6 0,0 0,1.7 -0.9l2.4,1a0.4,0.4 0,0 0,0.5 -0.2l2,-3.4c0.1,-0.2 0,-0.4 -0.2,-0.6ZM12,15.6A3.6,3.6 0,1 1,15.6 12,3.6 3.6,0 0,1 12,15.6Z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M19.1,12.9a2.8,2.8 0,0 0,0.1 -0.9,2.8 2.8,0 0,0 -0.1,-0.9l2.1,-1.6a0.7,0.7 0,0 0,0.1 -0.6L19.4,5.5a0.7,0.7 0,0 0,-0.6 -0.2l-2.4,1a6.5,6.5 0,0 0,-1.6 -0.9l-0.4,-2.6a0.5,0.5 0,0 0,-0.5 -0.4H10.1a0.5,0.5 0,0 0,-0.5 0.4L9.3,5.4a5.6,5.6 0,0 0,-1.7 0.9l-2.4,-1a0.4,0.4 0,0 0,-0.5 0.2l-2,3.4c-0.1,0.2 0,0.4 0.2,0.6l2,1.6a2.8,2.8 0,0 0,-0.1 0.9,2.8 2.8,0 0,0 0.1,0.9L2.8,14.5a0.7,0.7 0,0 0,-0.1 0.6l1.9,3.4a0.7,0.7 0,0 0,0.6 0.2l2.4,-1a6.5,6.5 0,0 0,1.6 0.9l0.4,2.6a0.5,0.5 0,0 0,0.5 0.4h3.8a0.5,0.5 0,0 0,0.5 -0.4l0.3,-2.6a5.6,5.6 0,0 0,1.7 -0.9l2.4,1a0.4,0.4 0,0 0,0.5 -0.2l2,-3.4c0.1,-0.2 0,-0.4 -0.2,-0.6ZM12,15.6A3.6,3.6 0,1 1,15.6 12,3.6 3.6,0 0,1 12,15.6Z" />
 </vector>
diff --git a/src/main/res/drawable/ic_statistics_24dp.xml b/src/main/res/drawable/ic_statistics_24dp.xml
index 13cfc8fad..4c391a389 100644
--- a/src/main/res/drawable/ic_statistics_24dp.xml
+++ b/src/main/res/drawable/ic_statistics_24dp.xml
@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M19,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM9,17L7,17v-7h2v7zM13,17h-2L11,7h2v10zM17,17h-2v-4h2v4z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M19,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM9,17L7,17v-7h2v7zM13,17h-2L11,7h2v10zM17,17h-2v-4h2v4z" />
 </vector>
diff --git a/src/main/res/drawable/shape_circle_darkgray.xml b/src/main/res/drawable/shape_circle_darkgray.xml
index f864113b4..12cc846a6 100644
--- a/src/main/res/drawable/shape_circle_darkgray.xml
+++ b/src/main/res/drawable/shape_circle_darkgray.xml
@@ -1,5 +1,4 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
-    <solid
-        android:color="@color/text_gradient_center"/>
+    <solid android:color="@color/text_gradient_center" />
 </shape>
\ No newline at end of file