diff --git a/app/src/main/res/drawable/fa_anchor.xml b/app/src/main/res/drawable/fa_anchor.xml
index d4c71aa43..c246d7cb2 100644
--- a/app/src/main/res/drawable/fa_anchor.xml
+++ b/app/src/main/res/drawable/fa_anchor.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="512">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M12.97 352h32.4C67.16 454.74 181.94 512 288 512c106.23 0 220.85-57.38 242.63-160h32.4c10.69 0 16.04-12.93 8.48-20.48l-67.02-67.03c-4.7-4.69-12.29-4.69-16.98 0L420.5 331.5c-7.56 7.56-2.21 20.49 8.48 20.49h35.15c-20.3 54.32-84.97 86.59-144.12 94.02V256h52c6.63 0 12-5.37 12-12v-40c0-6.63-5.37-12-12-12h-52v-5.47c37.28-13.18 64-48.73 64-90.52 0-52.24-42.4-95.27-94.63-96C235.72-0.74 192 42.53 192 96c0 41.8 26.72 77.35 64 90.53V192h-52c-6.63 0-12 5.37-12 12v40c0 6.63 5.37 12 12 12h52v190.01c-58.94-7.4-123.82-39.67-144.12-94.01h35.15c10.69 0 16.04-12.93 8.48-20.48L88.5 264.49c-4.7-4.69-12.29-4.69-16.98 0L4.48 331.5c-7.55 7.56-2.2 20.49 8.5 20.49zM288 64c17.64 0 32 14.36 32 32s-14.36 32-32 32-32-14.36-32-32 14.36-32 32-32z"/>
+        android:pathData="M320 96a32 32 0 1 1-64 0 32 32 0 1 1 64 0z m21.1 80C367 158.8 384 129.4 384 96c0-53-43-96-96-96s-96 43-96 96c0 33.4 17 62.8 42.9 80H224c-17.7 0-32 14.3-32 32s14.3 32 32 32h32v208h-48c-53 0-96-43-96-96v-6.1l7 7c9.4 9.4 24.6 9.4 33.9 0s9.4-24.6 0-33.9L97 263c-9.4-9.4-24.6-9.4-33.9 0L7 319c-9.4 9.4-9.4 24.6 0 33.9s24.6 9.4 33.9 0l7-7v6.1c0 88.4 71.6 160 160 160h80 80c88.4 0 160-71.6 160-160v-6.1l7 7c9.4 9.4 24.6 9.4 33.9 0s9.4-24.6 0-33.9l-56-56c-9.4-9.4-24.6-9.4-33.9 0l-56 56c-9.4 9.4-9.4 24.6 0 33.9s24.6 9.4 33.9 0l7-7v6.1c0 53-43 96-96 96H320V240h32c17.7 0 32-14.3 32-32s-14.3-32-32-32h-10.9z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_award.xml b/app/src/main/res/drawable/fa_award.xml
index 81260d336..40037b39b 100644
--- a/app/src/main/res/drawable/fa_award.xml
+++ b/app/src/main/res/drawable/fa_award.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="512">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M97.12 362.63c-8.69-8.69-4.16-6.24-25.12-11.85-9.51-2.55-17.87-7.45-25.43-13.32L1.2 448.7c-4.39 10.77 3.81 22.47 15.43 22.03l52.69-2.01L105.56 507c8 8.44 22.04 5.81 26.43-4.96l52.05-127.62c-10.84 6.04-22.87 9.58-35.31 9.58-19.5 0-37.82-7.59-51.61-21.37zM382.8 448.7l-45.37-111.24c-7.56 5.88-15.92 10.77-25.43 13.32-21.07 5.64-16.45 3.18-25.12 11.85-13.79 13.78-32.12 21.37-51.62 21.37-12.44 0-24.47-3.55-35.31-9.58L252 502.04c4.39 10.77 18.44 13.4 26.43 4.96l36.25-38.28 52.69 2.01c11.62 0.44 19.82-11.27 15.43-22.03zM263 340c15.28-15.55 17.03-14.21 38.79-20.14 13.89-3.79 24.75-14.84 28.47-28.98 7.48-28.4 5.54-24.97 25.95-45.75 10.17-10.35 14.14-25.44 10.42-39.58-7.47-28.38-7.48-24.42 0-52.83 3.72-14.14-0.25-29.23-10.42-39.58-20.41-20.78-18.47-17.36-25.95-45.75-3.72-14.14-14.58-25.19-28.47-28.98-27.88-7.61-24.52-5.62-44.95-26.41-10.17-10.35-25-14.4-38.89-10.61-27.87 7.6-23.98 7.61-51.9 0C152.16-2.4 137.33 1.64 127.16 12c-20.41 20.78-17.05 18.8-44.94 26.41-13.89 3.79-24.75 14.84-28.47 28.98-7.47 28.39-5.54 24.97-25.95 45.75-10.17 10.35-14.15 25.44-10.42 39.58 7.47 28.36 7.48 24.4 0 52.82-3.72 14.14 0.25 29.23 10.42 39.59 20.41 20.78 18.47 17.35 25.95 45.75 3.72 14.14 14.58 25.19 28.47 28.98C104.6 325.96 106.27 325 121 340c13.23 13.47 33.84 15.88 49.74 5.82a39.68 39.68 0 0 1 42.53 0c15.89 10.06 36.5 7.65 49.73-5.82zM97.66 175.96c0-53.03 42.24-96.02 94.34-96.02s94.34 42.99 94.34 96.02-42.24 96.02-94.34 96.02-94.34-42.99-94.34-96.02z"/>
+        android:pathData="M173.8 5.5c11-7.3 25.4-7.3 36.4 0L228 17.2c6 3.9 13 5.8 20.1 5.4l21.3-1.3c13.2-0.8 25.6 6.4 31.5 18.2l9.6 19.1c3.2 6.4 8.4 11.5 14.7 14.7l19.3 9.7c11.8 5.9 19 18.3 18.2 31.5l-1.3 21.3c-0.4 7.1 1.5 14.2 5.4 20.1l11.8 17.8c7.3 11 7.3 25.4 0 36.4L366.8 228c-3.9 6-5.8 13-5.4 20.1l1.3 21.3c0.8 13.2-6.4 25.6-18.2 31.5l-19.1 9.6c-6.4 3.2-11.5 8.4-14.7 14.7l-9.7 19.3c-5.9 11.8-18.3 19-31.5 18.2l-21.3-1.3c-7.1-0.4-14.2 1.5-20.1 5.4l-17.8 11.8c-11 7.3-25.4 7.3-36.4 0L156 366.8c-6-3.9-13-5.8-20.1-5.4l-21.3 1.3c-13.2 0.8-25.6-6.4-31.5-18.2l-9.6-19.1c-3.2-6.4-8.4-11.5-14.7-14.7L39.5 301c-11.8-5.9-19-18.3-18.2-31.5l1.3-21.3c0.4-7.1-1.5-14.2-5.4-20.1L5.5 210.2c-7.3-11-7.3-25.4 0-36.4L17.2 156c3.9-6 5.8-13 5.4-20.1l-1.3-21.3c-0.8-13.2 6.4-25.6 18.2-31.5l19.1-9.6C65 70.2 70.2 65 73.4 58.6L83 39.5c5.9-11.8 18.3-19 31.5-18.2l21.3 1.3c7.1 0.4 14.2-1.5 20.1-5.4l17.9-11.7zM272 192a80 80 0 1 0-160 0 80 80 0 1 0 160 0zM1.3 441.8l43.1-102.5c0.2 0.1 0.3 0.2 0.4 0.4l9.6 19.1c11.7 23.2 36 37.3 62 35.8l21.3-1.3c0.2 0 0.5 0 0.7 0.2l17.8 11.8c5.1 3.3 10.5 5.9 16.1 7.7l-37.6 89.3c-2.3 5.5-7.4 9.2-13.3 9.7s-11.6-2.2-14.8-7.2l-32.2-49.3-56.1 8.3c-5.7 0.8-11.4-1.5-15-6s-4.3-10.7-2.1-16z m248 60.4L211.7 413c5.6-1.8 11-4.3 16.1-7.7l17.8-11.8c0.2-0.1 0.4-0.2 0.7-0.2l21.3 1.3c26 1.5 50.3-12.6 62-35.8l9.6-19.1c0.1-0.2 0.2-0.3 0.4-0.4l43.2 102.5c2.2 5.3 1.4 11.4-2.1 16s-9.3 6.9-15 6l-56.1-8.3-32.2 49.2c-3.2 5-8.9 7.7-14.8 7.2s-11-4.3-13.3-9.7z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_bed.xml b/app/src/main/res/drawable/fa_bed.xml
index 45b7c6ebb..96809744d 100644
--- a/app/src/main/res/drawable/fa_bed.xml
+++ b/app/src/main/res/drawable/fa_bed.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="512">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M176 256c44.11 0 80-35.89 80-80s-35.89-80-80-80-80 35.89-80 80 35.89 80 80 80z m352-128H304c-8.84 0-16 7.16-16 16v144H64V80c0-8.84-7.16-16-16-16H16C7.16 64 0 71.16 0 80v352c0 8.84 7.16 16 16 16h32c8.84 0 16-7.16 16-16v-48h512v48c0 8.84 7.16 16 16 16h32c8.84 0 16-7.16 16-16V240c0-61.86-50.14-112-112-112z"/>
+        android:pathData="M32 32c17.7 0 32 14.3 32 32v256h224V160c0-17.7 14.3-32 32-32h224c53 0 96 43 96 96v224c0 17.7-14.3 32-32 32s-32-14.3-32-32v-32H352h-32H64v32c0 17.7-14.3 32-32 32S0 465.7 0 448V64c0-17.7 14.3-32 32-32z m144 96a80 80 0 1 1 0 160 80 80 0 1 1 0-160z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_bolt.xml b/app/src/main/res/drawable/fa_bolt.xml
new file mode 100644
index 000000000..e0269207c
--- /dev/null
+++ b/app/src/main/res/drawable/fa_bolt.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="448dp"
+    android:height="512dp"
+    android:viewportWidth="448"
+    android:viewportHeight="512">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M349.4 44.6c5.9-13.7 1.5-29.7-10.6-38.5s-28.6-8-39.9 1.8l-256 224c-10 8.8-13.6 22.9-8.9 35.3S50.7 288 64 288h111.5L98.6 467.4c-5.9 13.7-1.5 29.7 10.6 38.5s28.6 8 39.9-1.8l256-224c10-8.8 13.6-22.9 8.9-35.3s-16.6-20.7-30-20.7H272.5l76.9-179.5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/fa_bone.xml b/app/src/main/res/drawable/fa_bone.xml
index dae5e661d..c58c27121 100644
--- a/app/src/main/res/drawable/fa_bone.xml
+++ b/app/src/main/res/drawable/fa_bone.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="640dp"
+    android:width="576dp"
     android:height="512dp"
-    android:viewportWidth="640"
+    android:viewportWidth="576"
     android:viewportHeight="512">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M598.88 244.56c25.2-12.6 41.12-38.36 41.12-66.53v-7.64C640 129.3 606.7 96 565.61 96c-32.02 0-60.44 20.49-70.57 50.86-7.68 23.03-11.6 45.14-38.11 45.14H183.06c-27.38 0-31.58-25.54-38.11-45.14C134.83 116.49 106.4 96 74.39 96 33.3 96 0 129.3 0 170.39v7.64c0 28.17 15.92 53.93 41.12 66.53 9.43 4.71 9.43 18.17 0 22.88C15.92 280.04 0 305.8 0 333.97v7.64C0 382.7 33.3 416 74.38 416c32.02 0 60.44-20.49 70.57-50.86 7.68-23.03 11.6-45.14 38.11-45.14h273.87c27.38 0 31.58 25.54 38.11 45.14C505.17 395.51 533.6 416 565.61 416c41.08 0 74.38-33.3 74.38-74.39v-7.64c0-28.18-15.92-53.93-41.12-66.53-9.42-4.71-9.42-18.17 0.01-22.88z"/>
+        android:pathData="M153.7 144.8c6.9 16.3 20.6 31.2 38.3 31.2h192c17.7 0 31.4-14.9 38.3-31.2C434.4 116.1 462.9 96 496 96c44.2 0 80 35.8 80 80 0 30.4-17 56.9-42 70.4-3.6 1.9-6 5.5-6 9.6s2.4 7.7 6 9.6c25 13.5 42 40 42 70.4 0 44.2-35.8 80-80 80-33.1 0-61.6-20.1-73.7-48.8-6.9-16.3-20.6-31.2-38.3-31.2H192c-17.7 0-31.4 14.9-38.3 31.2C141.6 395.9 113.1 416 80 416c-44.2 0-80-35.8-80-80 0-30.4 17-56.9 42-70.4 3.6-1.9 6-5.5 6-9.6s-2.4-7.7-6-9.6c-25-13.5-42-40-42-70.4 0-44.2 35.8-80 80-80 33.1 0 61.6 20.1 73.7 48.8z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_book_open_reader.xml b/app/src/main/res/drawable/fa_book_open_reader.xml
new file mode 100644
index 000000000..03aa1c353
--- /dev/null
+++ b/app/src/main/res/drawable/fa_book_open_reader.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="512dp"
+    android:height="512dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M160 96a96 96 0 1 1 192 0 96 96 0 1 1-192 0z m80 152v264l-48.4-24.2c-20.9-10.4-43.5-17-66.8-19.3l-96-9.6C12.5 457.2 0 443.5 0 427V224c0-17.7 14.3-32 32-32h30.3c63.6 0 125.6 19.6 177.7 56z m32 264V248c52.1-36.4 114.1-56 177.7-56H480c17.7 0 32 14.3 32 32v203c0 16.4-12.5 30.2-28.8 31.8l-96 9.6c-23.2 2.3-45.9 8.9-66.8 19.3L272 512z"/>
+</vector>
diff --git a/app/src/main/res/drawable/fa_book_reader.xml b/app/src/main/res/drawable/fa_book_reader.xml
deleted file mode 100644
index 1f17693a4..000000000
--- a/app/src/main/res/drawable/fa_book_reader.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="512dp"
-    android:height="512dp"
-    android:viewportWidth="512"
-    android:viewportHeight="512">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M352 96c0-53.02-42.98-96-96-96s-96 42.98-96 96 42.98 96 96 96 96-42.98 96-96zM233.59 241.1c-59.33-36.32-155.43-46.3-203.79-49.05C13.55 191.13 0 203.51 0 219.14v222.8c0 14.33 11.59 26.28 26.49 27.05 43.66 2.29 131.99 10.68 193.04 41.43 9.37 4.72 20.48-1.71 20.48-11.87V252.56c-0.01-4.67-2.32-8.95-6.42-11.46z m248.61-49.05c-48.35 2.74-144.46 12.73-203.78 49.05-4.1 2.51-6.41 6.96-6.41 11.63v245.79c0 10.19 11.14 16.63 20.54 11.9 61.04-30.72 149.32-39.11 192.97-41.4 14.9-0.78 26.49-12.73 26.49-27.06V219.14c-0.01-15.63-13.56-28.01-29.81-27.09z"/>
-</vector>
diff --git a/app/src/main/res/drawable/fa_brush.xml b/app/src/main/res/drawable/fa_brush.xml
index 47a019528..1c96b3d48 100644
--- a/app/src/main/res/drawable/fa_brush.xml
+++ b/app/src/main/res/drawable/fa_brush.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="512">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M352 0H32C14.33 0 0 14.33 0 32v224h384V32c0-17.67-14.33-32-32-32zM0 320c0 35.35 28.66 64 64 64h64v64c0 35.35 28.66 64 64 64s64-28.65 64-64v-64h64c35.34 0 64-28.65 64-64v-32H0v32z m192 104c13.25 0 24 10.74 24 24 0 13.25-10.75 24-24 24s-24-10.75-24-24c0-13.26 10.75-24 24-24z"/>
+        android:pathData="M162.4 6c-1.5-3.6-5-6-8.9-6h-19c-3.9 0-7.5 2.4-8.9 6l-20.7 51.7c-3.2 8-14.6 8-17.8 0L66.4 6c-1.5-3.6-5-6-8.9-6H48C21.5 0 0 21.5 0 48v176 22.4 9.6h9.6 364.8 9.6v-9.6V224 48c0-26.5-21.5-48-48-48H230.5c-3.9 0-7.5 2.4-8.9 6l-20.7 51.7c-3.2 8-14.6 8-17.8 0L162.4 6zM0 288v32c0 35.3 28.7 64 64 64h64v64c0 35.3 28.7 64 64 64s64-28.7 64-64v-64h64c35.3 0 64-28.7 64-64v-32H0z m192 144a16 16 0 1 1 0 32 16 16 0 1 1 0-32z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_building.xml b/app/src/main/res/drawable/fa_building.xml
index 4254f9646..9c60ced5d 100644
--- a/app/src/main/res/drawable/fa_building.xml
+++ b/app/src/main/res/drawable/fa_building.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="448dp"
+    android:width="384dp"
     android:height="512dp"
-    android:viewportWidth="448"
+    android:viewportWidth="384"
     android:viewportHeight="512">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M436 480h-20V24c0-13.26-10.74-24-24-24H56C42.74 0 32 10.74 32 24v456H12c-6.63 0-12 5.37-12 12v20h448v-20c0-6.63-5.37-12-12-12zM128 76c0-6.63 5.37-12 12-12h40c6.63 0 12 5.37 12 12v40c0 6.63-5.37 12-12 12h-40c-6.63 0-12-5.37-12-12V76z m0 96c0-6.63 5.37-12 12-12h40c6.63 0 12 5.37 12 12v40c0 6.63-5.37 12-12 12h-40c-6.63 0-12-5.37-12-12v-40z m52 148h-40c-6.63 0-12-5.37-12-12v-40c0-6.63 5.37-12 12-12h40c6.63 0 12 5.37 12 12v40c0 6.63-5.37 12-12 12z m76 160h-64v-84c0-6.63 5.37-12 12-12h40c6.63 0 12 5.37 12 12v84z m64-172c0 6.63-5.37 12-12 12h-40c-6.63 0-12-5.37-12-12v-40c0-6.63 5.37-12 12-12h40c6.63 0 12 5.37 12 12v40z m0-96c0 6.63-5.37 12-12 12h-40c-6.63 0-12-5.37-12-12v-40c0-6.63 5.37-12 12-12h40c6.63 0 12 5.37 12 12v40z m0-96c0 6.63-5.37 12-12 12h-40c-6.63 0-12-5.37-12-12V76c0-6.63 5.37-12 12-12h40c6.63 0 12 5.37 12 12v40z"/>
+        android:pathData="M48 0C21.5 0 0 21.5 0 48v416c0 26.5 21.5 48 48 48h96v-80c0-26.5 21.5-48 48-48s48 21.5 48 48v80h96c26.5 0 48-21.5 48-48V48c0-26.5-21.5-48-48-48H48z m16 240c0-8.8 7.2-16 16-16h32c8.8 0 16 7.2 16 16v32c0 8.8-7.2 16-16 16H80c-8.8 0-16-7.2-16-16v-32z m112-16h32c8.8 0 16 7.2 16 16v32c0 8.8-7.2 16-16 16h-32c-8.8 0-16-7.2-16-16v-32c0-8.8 7.2-16 16-16z m80 16c0-8.8 7.2-16 16-16h32c8.8 0 16 7.2 16 16v32c0 8.8-7.2 16-16 16h-32c-8.8 0-16-7.2-16-16v-32zM80 96h32c8.8 0 16 7.2 16 16v32c0 8.8-7.2 16-16 16H80c-8.8 0-16-7.2-16-16v-32c0-8.8 7.2-16 16-16z m80 16c0-8.8 7.2-16 16-16h32c8.8 0 16 7.2 16 16v32c0 8.8-7.2 16-16 16h-32c-8.8 0-16-7.2-16-16v-32z m112-16h32c8.8 0 16 7.2 16 16v32c0 8.8-7.2 16-16 16h-32c-8.8 0-16-7.2-16-16v-32c0-8.8 7.2-16 16-16z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_cake_candles.xml b/app/src/main/res/drawable/fa_cake_candles.xml
index b31b7f87f..cadfe7632 100644
--- a/app/src/main/res/drawable/fa_cake_candles.xml
+++ b/app/src/main/res/drawable/fa_cake_candles.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="512dp"
+    android:width="448dp"
     android:height="512dp"
-    android:viewportWidth="512"
+    android:viewportWidth="448"
     android:viewportHeight="512">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M86.4,5.5L61.8,47.6C58,54.1 56,61.6 56,69.2L56,72c0,22.1 17.9,40 40,40s40,-17.9 40,-40L136,69.2c0,-7.6 -2,-15 -5.8,-21.6L105.6,5.5C103.6,2.1 100,0 96,0s-7.6,2.1 -9.6,5.5zM214.4,5.5L189.8,47.6c-3.8,6.5 -5.8,14 -5.8,21.6L184,72c0,22.1 17.9,40 40,40s40,-17.9 40,-40L264,69.2c0,-7.6 -2,-15 -5.8,-21.6L233.6,5.5C231.6,2.1 228,0 224,0s-7.6,2.1 -9.6,5.5zM317.8,47.6c-3.8,6.5 -5.8,14 -5.8,21.6L312,72c0,22.1 17.9,40 40,40s40,-17.9 40,-40L392,69.2c0,-7.6 -2,-15 -5.8,-21.6L361.6,5.5C359.6,2.1 356,0 352,0s-7.6,2.1 -9.6,5.5L317.8,47.6zM128,176c0,-17.7 -14.3,-32 -32,-32s-32,14.3 -32,32v48c-35.3,0 -64,28.7 -64,64v71c8.3,5.2 18.1,9 28.8,9c13.5,0 27.2,-6.1 38.4,-13.4c5.4,-3.5 9.9,-7.1 13,-9.7c1.5,-1.3 2.7,-2.4 3.5,-3.1c0.4,-0.4 0.7,-0.6 0.8,-0.8l0.1,-0.1 0,0 0,0s0,0 0,0s0,0 0,0c3.1,-3.2 7.4,-4.9 11.9,-4.8s8.6,2.1 11.6,5.4l0,0 0,0 0.1,0.1c0.1,0.1 0.4,0.4 0.7,0.7c0.7,0.7 1.7,1.7 3.1,3c2.8,2.6 6.8,6.1 11.8,9.5c10.2,7.1 23,13.1 36.3,13.1s26.1,-6 36.3,-13.1c5,-3.5 9,-6.9 11.8,-9.5c1.4,-1.3 2.4,-2.3 3.1,-3c0.3,-0.3 0.6,-0.6 0.7,-0.7l0.1,-0.1c3,-3.5 7.4,-5.4 12,-5.4s9,2 12,5.4l0.1,0.1c0.1,0.1 0.4,0.4 0.7,0.7c0.7,0.7 1.7,1.7 3.1,3c2.8,2.6 6.8,6.1 11.8,9.5c10.2,7.1 23,13.1 36.3,13.1s26.1,-6 36.3,-13.1c5,-3.5 9,-6.9 11.8,-9.5c1.4,-1.3 2.4,-2.3 3.1,-3c0.3,-0.3 0.6,-0.6 0.7,-0.7l0.1,-0.1c2.9,-3.4 7.1,-5.3 11.6,-5.4s8.7,1.6 11.9,4.8l0,0 0,0 0,0 0.1,0.1c0.2,0.2 0.4,0.4 0.8,0.8c0.8,0.7 1.9,1.8 3.5,3.1c3.1,2.6 7.5,6.2 13,9.7c11.2,7.3 24.9,13.4 38.4,13.4c10.7,0 20.5,-3.9 28.8,-9L448.2,288c0,-35.3 -28.7,-64 -64,-64L384.2,176c0,-17.7 -14.3,-32 -32,-32s-32,14.3 -32,32v48L256,224L256,176c0,-17.7 -14.3,-32 -32,-32s-32,14.3 -32,32v48L128,224L128,176zM448,394.6c-8.5,3.3 -18.2,5.4 -28.8,5.4c-22.5,0 -42.4,-9.9 -55.8,-18.6c-4.1,-2.7 -7.8,-5.4 -10.9,-7.8c-2.8,2.4 -6.1,5 -9.8,7.5C329.8,390 310.6,400 288,400s-41.8,-10 -54.6,-18.9c-3.5,-2.4 -6.7,-4.9 -9.4,-7.2c-2.7,2.3 -5.9,4.7 -9.4,7.2C201.8,390 182.6,400 160,400s-41.8,-10 -54.6,-18.9c-3.7,-2.6 -7,-5.2 -9.8,-7.5c-3.1,2.4 -6.8,5.1 -10.9,7.8C71.2,390.1 51.3,400 28.8,400c-10.6,0 -20.3,-2.2 -28.8,-5.4L0,480c0,17.7 14.3,32 32,32L416,512c17.7,0 32,-14.3 32,-32L448,394.6z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M86.4 5.5L61.8 47.6C58 54.1 56 61.6 56 69.2V72c0 22.1 17.9 40 40 40s40-17.9 40-40v-2.8c0-7.6-2-15-5.8-21.6L105.6 5.5C103.6 2.1 100 0 96 0s-7.6 2.1-9.6 5.5z m128 0l-24.6 42.1c-3.8 6.5-5.8 14-5.8 21.6V72c0 22.1 17.9 40 40 40s40-17.9 40-40v-2.8c0-7.6-2-15-5.8-21.6L233.6 5.5C231.6 2.1 228 0 224 0s-7.6 2.1-9.6 5.5z m103.4 42.1c-3.8 6.5-5.8 14-5.8 21.6V72c0 22.1 17.9 40 40 40s40-17.9 40-40v-2.8c0-7.6-2-15-5.8-21.6L361.6 5.5C359.6 2.1 356 0 352 0s-7.6 2.1-9.6 5.5l-24.6 42.1zM128 176c0-17.7-14.3-32-32-32s-32 14.3-32 32v48c-35.3 0-64 28.7-64 64v71c8.3 5.2 18.1 9 28.8 9 13.5 0 27.2-6.1 38.4-13.4 5.4-3.5 9.9-7.1 13-9.7 1.5-1.3 2.7-2.4 3.5-3.1 0.4-0.4 0.7-0.6 0.8-0.8l0.1-0.1c3.1-3.2 7.4-4.9 11.9-4.8s8.6 2.1 11.6 5.4l0.1 0.1 0.7 0.7c0.7 0.7 1.7 1.7 3.1 3 2.8 2.6 6.8 6.1 11.8 9.5 10.2 7.1 23 13.1 36.3 13.1s26.1-6 36.3-13.1c5-3.5 9-6.9 11.8-9.5 1.4-1.3 2.4-2.3 3.1-3l0.7-0.7 0.1-0.1c3-3.5 7.4-5.4 12-5.4s9 2 12 5.4l0.1 0.1 0.7 0.7c0.7 0.7 1.7 1.7 3.1 3 2.8 2.6 6.8 6.1 11.8 9.5 10.2 7.1 23 13.1 36.3 13.1s26.1-6 36.3-13.1c5-3.5 9-6.9 11.8-9.5 1.4-1.3 2.4-2.3 3.1-3l0.7-0.7 0.1-0.1c2.9-3.4 7.1-5.3 11.6-5.4s8.7 1.6 11.9 4.8l0.1 0.1 0.8 0.8c0.8 0.7 1.9 1.8 3.5 3.1 3.1 2.6 7.5 6.2 13 9.7 11.2 7.3 24.9 13.4 38.4 13.4 10.7 0 20.5-3.9 28.8-9v-71c0-35.3-28.7-64-64-64v-48c0-17.7-14.3-32-32-32s-32 14.3-32 32v48H256v-48c0-17.7-14.3-32-32-32s-32 14.3-32 32v48h-64v-48z m320 218.6c-8.5 3.3-18.2 5.4-28.8 5.4-22.5 0-42.4-9.9-55.8-18.6-4.1-2.7-7.8-5.4-10.9-7.8-2.8 2.4-6.1 5-9.8 7.5C329.8 390 310.6 400 288 400s-41.8-10-54.6-18.9c-3.5-2.4-6.7-4.9-9.4-7.2-2.7 2.3-5.9 4.7-9.4 7.2-12.8 8.9-32 18.9-54.6 18.9s-41.8-10-54.6-18.9c-3.7-2.6-7-5.2-9.8-7.5-3.1 2.4-6.8 5.1-10.9 7.8-13.5 8.7-33.4 18.6-55.9 18.6-10.6 0-20.3-2.2-28.8-5.4V480c0 17.7 14.3 32 32 32h384c17.7 0 32-14.3 32-32v-85.4z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_car.xml b/app/src/main/res/drawable/fa_car.xml
index bfcc15eb6..14e2bc433 100644
--- a/app/src/main/res/drawable/fa_car.xml
+++ b/app/src/main/res/drawable/fa_car.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="512">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M499.99 176h-59.87l-16.64-41.6C406.38 91.63 365.57 64 319.5 64h-127c-46.06 0-86.88 27.63-103.99 70.4L71.87 176H12.01c-7.81 0-13.54 7.34-11.64 14.91l6 24C7.7 220.25 12.5 224 18.01 224h20.07C24.65 235.73 16 252.78 16 272v48c0 16.12 6.16 30.67 16 41.93V416c0 17.67 14.33 32 32 32h32c17.67 0 32-14.33 32-32v-32h256v32c0 17.67 14.33 32 32 32h32c17.67 0 32-14.33 32-32v-54.07c9.84-11.25 16-25.8 16-41.93v-48c0-19.22-8.65-36.27-22.07-48H494c5.51 0 10.31-3.75 11.64-9.09l6-24c1.89-7.57-3.84-14.91-11.65-14.91z m-352.06-17.83c7.29-18.22 24.94-30.17 44.57-30.17h127c19.63 0 37.28 11.95 44.57 30.17L384 208H128l19.93-49.83zM96 319.8c-19.2 0-32-12.76-32-31.9S76.8 256 96 256s48 28.71 48 47.85-28.8 15.95-48 15.95z m320 0c-19.2 0-48 3.19-48-15.95S396.8 256 416 256s32 12.76 32 31.9-12.8 31.9-32 31.9z"/>
+        android:pathData="M135.2 117.4L109.1 192h293.8l-26.1-74.6c-4.5-12.8-16.6-21.4-30.2-21.4H165.4c-13.6 0-25.7 8.6-30.2 21.4z m-95.6 79.4L74.8 96.3C88.3 57.8 124.6 32 165.4 32h181.2c40.8 0 77.1 25.8 90.6 64.3l35.2 100.5c23.2 9.6 39.6 32.5 39.6 59.2v144 48c0 17.7-14.3 32-32 32h-32c-17.7 0-32-14.3-32-32v-48H96v48c0 17.7-14.3 32-32 32H32c-17.7 0-32-14.3-32-32v-48-144c0-26.7 16.4-49.6 39.6-59.2zM128 288a32 32 0 1 0-64 0 32 32 0 1 0 64 0z m288 32a32 32 0 1 0 0-64 32 32 0 1 0 0 64z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_carrot.xml b/app/src/main/res/drawable/fa_carrot.xml
index 4b4321cf8..78e0bb6d6 100644
--- a/app/src/main/res/drawable/fa_carrot.xml
+++ b/app/src/main/res/drawable/fa_carrot.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="512">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M298.2 156.6c-52.7-25.7-114.5-10.5-150.2 32.8l55.2 55.2c6.3 6.3 6.3 16.4 0 22.6-3.1 3.1-7.2 4.7-11.3 4.7s-8.2-1.6-11.3-4.7L130.4 217 2.3 479.7c-2.9 6-3.1 13.3 0 19.7 5.4 11.1 18.9 15.7 30 10.3l133.6-65.2-49.2-49.2c-6.3-6.2-6.3-16.4 0-22.6 6.3-6.2 16.4-6.2 22.6 0l57 57 102-49.8c24-11.7 44.5-31.3 57.1-57.1 30.1-61.7 4.5-136.1-57.2-166.2z m92.1-34.9C409.8 81 399.7 32.9 360 0c-50.3 41.7-52.5 107.5-7.9 151.9l8 8c44.4 44.6 110.3 42.4 151.9-7.9-32.9-39.7-81-49.8-121.7-30.3z"/>
+        android:pathData="M346.7 6C337.6 17 320 42.3 320 72c0 40 15.3 55.3 40 80s40 40 80 40c29.7 0 55-17.6 66-26.7 4-3.3 6-8.2 6-13.3s-2-10-6-13.2c-11.4-9.1-38.3-26.8-74-26.8-32 0-40 8-40 8s8-8 8-40c0-35.7-17.7-62.6-26.8-74-3.2-4-8.1-6-13.2-6s-10 2-13.3 6zM244.6 136c-40 0-77.1 18.1-101.7 48.2l60.5 60.5c6.2 6.2 6.2 16.4 0 22.6s-16.4 6.2-22.6 0L125.5 212v0.1L2.2 477.9C-2 487-0.1 497.8 7 505s17.9 9 27.1 4.8l134.7-62.4-52.1-52.1c-6.2-6.2-6.2-16.4 0-22.6s16.4-6.2 22.6 0l60.4 60.3 100.2-46.4c46.4-21.5 76.2-68 76.2-119.2C376 194.8 317.2 136 244.6 136z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_cloud_rain.xml b/app/src/main/res/drawable/fa_cloud_rain.xml
new file mode 100644
index 000000000..3c8c7b9f9
--- /dev/null
+++ b/app/src/main/res/drawable/fa_cloud_rain.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="512dp"
+    android:height="512dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M96 320c-53 0-96-43-96-96 0-42.5 27.6-78.6 65.9-91.2-1.2-6.7-1.9-13.7-1.9-20.8C64 50.1 114.1 0 176 0c43.1 0 80.5 24.3 99.2 60 14.7-17.1 36.5-28 60.8-28 44.2 0 80 35.8 80 80 0 5.5-0.6 10.8-1.6 16h1.6c53 0 96 43 96 96s-43 96-96 96H96z m-6.8 52c1.3-2.5 3.9-4 6.8-4s5.4 1.5 6.8 4l35.1 64.6c4.1 7.5 6.2 15.8 6.2 24.3v3c0 26.5-21.5 48-48 48s-48-21.5-48-48v-3c0-8.5 2.1-16.9 6.2-24.3L89.2 372z m160 0c1.3-2.5 3.9-4 6.8-4s5.4 1.5 6.8 4l35.1 64.6c4.1 7.5 6.2 15.8 6.2 24.3v3c0 26.5-21.5 48-48 48s-48-21.5-48-48v-3c0-8.5 2.1-16.9 6.2-24.3l34.9-64.6z m124.9 64.6l35.1-64.6c1.3-2.5 3.9-4 6.8-4s5.4 1.5 6.8 4l35.1 64.6c4.1 7.5 6.2 15.8 6.2 24.3v3c0 26.5-21.5 48-48 48s-48-21.5-48-48v-3c0-8.5 2.1-16.9 6.2-24.3z"/>
+</vector>
diff --git a/app/src/main/res/drawable/fa_cloud_showers_heavy.xml b/app/src/main/res/drawable/fa_cloud_showers_heavy.xml
deleted file mode 100644
index c6b759dd3..000000000
--- a/app/src/main/res/drawable/fa_cloud_showers_heavy.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="512dp"
-    android:height="512dp"
-    android:viewportWidth="512"
-    android:viewportHeight="512">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M96,320c-53,0 -96,-43 -96,-96c0,-42.5 27.6,-78.6 65.9,-91.2C64.7,126.1 64,119.1 64,112C64,50.1 114.1,0 176,0c43.1,0 80.5,24.3 99.2,60c14.7,-17.1 36.5,-28 60.8,-28c44.2,0 80,35.8 80,80c0,5.5 -0.6,10.8 -1.6,16c0.5,0 1.1,0 1.6,0c53,0 96,43 96,96s-43,96 -96,96L96,320zM81.5,353.9c12.2,5.2 17.8,19.3 12.6,31.5l-48,112c-5.2,12.2 -19.3,17.8 -31.5,12.6S-3.3,490.7 1.9,478.5l48,-112c5.2,-12.2 19.3,-17.8 31.5,-12.6zM201.5,353.9c12.2,5.2 17.8,19.3 12.6,31.5l-48,112c-5.2,12.2 -19.3,17.8 -31.5,12.6s-17.8,-19.3 -12.6,-31.5l48,-112c5.2,-12.2 19.3,-17.8 31.5,-12.6zM446.1,385.4l-48,112c-5.2,12.2 -19.3,17.8 -31.5,12.6s-17.8,-19.3 -12.6,-31.5l48,-112c5.2,-12.2 19.3,-17.8 31.5,-12.6s17.8,19.3 12.6,31.5zM313.5,353.9c12.2,5.2 17.8,19.3 12.6,31.5l-48,112c-5.2,12.2 -19.3,17.8 -31.5,12.6s-17.8,-19.3 -12.6,-31.5l48,-112c5.2,-12.2 19.3,-17.8 31.5,-12.6z"/>
-</vector>
diff --git a/app/src/main/res/drawable/fa_cloud_sun.xml b/app/src/main/res/drawable/fa_cloud_sun.xml
index 51055dad4..09741a0b3 100644
--- a/app/src/main/res/drawable/fa_cloud_sun.xml
+++ b/app/src/main/res/drawable/fa_cloud_sun.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="512">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M575.2 325.7c0.2-1.9 0.8-3.7 0.8-5.6 0-35.3-28.7-64-64-64-12.6 0-24.2 3.8-34.1 10-17.6-38.8-56.5-66-101.9-66-61.8 0-112 50.1-112 112 0 3 0.7 5.8 0.9 8.7-49.6 3.7-88.9 44.7-88.9 95.3 0 53 43 96 96 96h272c53 0 96-43 96-96 0-42.1-27.2-77.4-64.8-90.4z m-430.4-22.6c-43.7-43.7-43.7-114.7 0-158.3 43.7-43.7 114.7-43.7 158.4 0 9.7 9.7 16.9 20.9 22.3 32.7 9.8-3.7 20.1-6 30.7-7.5L386 81.1c4-11.9-7.3-23.1-19.2-19.2L279 91.2 237.5 8.4C232-2.8 216-2.8 210.4 8.4L169 91.2 81.1 61.9C69.3 58 58 69.3 61.9 81.1l29.3 87.8-82.8 41.5c-11.2 5.6-11.2 21.5 0 27.1l82.8 41.4-29.3 87.8c-4 11.9 7.3 23.1 19.2 19.2l76.1-25.3c6.1-12.4 14-23.7 23.6-33.5-13.1-5.4-25.4-13.4-36-24z m-4.8-79.2c0 40.8 29.3 74.8 67.9 82.3 8-4.7 16.3-8.8 25.2-11.7 5.4-44.3 31-82.5 67.4-105C287.3 160.4 258 140 224 140c-46.3 0-84 37.6-84 83.9z"/>
+        android:pathData="M294.2 1.2c5.1 2.1 8.7 6.7 9.6 12.1L317.9 98l84.7 14.1c5.4 0.9 10 4.5 12.1 9.6s1.5 10.9-1.6 15.4l-38.5 55c-2.2-0.1-4.4-0.2-6.7-0.2-23.3 0-45.1 6.2-64 17.1v-1.1c0-53-43-96-96-96s-96 43-96 96 43 96 96 96c8.1 0 15.9-1 23.4-2.9-36.6 18.1-63.3 53.1-69.8 94.9l-24.4 17c-4.5 3.2-10.3 3.8-15.4 1.6s-8.7-6.7-9.6-12.1l-14-84.5-84.7-14.1c-5.4-0.9-10-4.5-12.1-9.6s-1.5-10.9 1.6-15.4L52.5 208 2.9 137.2c-3.2-4.5-3.8-10.3-1.6-15.4s6.7-8.7 12.1-9.6l84.7-14.1 14.1-84.7c0.9-5.4 4.5-10 9.6-12.1s10.9-1.5 15.4 1.6L208 52.5l70.8-49.6c4.5-3.2 10.3-3.8 15.4-1.6zM144 208a64 64 0 1 1 128 0 64 64 0 1 1-128 0z m495.9 223.9c0 44.2-35.8 80-80 80H288c-53 0-96-43-96-96 0-47.6 34.6-87 80-94.6V320c0-53 43-96 96-96 34.9 0 65.4 18.6 82.2 46.4 13-9.1 28.8-14.4 45.8-14.4 44.2 0 80 35.8 80 80 0 5.9-0.6 11.7-1.9 17.2 37.4 6.7 65.8 39.4 65.8 78.7z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_cloud_sun_rain.xml b/app/src/main/res/drawable/fa_cloud_sun_rain.xml
new file mode 100644
index 000000000..ceef26a69
--- /dev/null
+++ b/app/src/main/res/drawable/fa_cloud_sun_rain.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="640dp"
+    android:height="512dp"
+    android:viewportWidth="640"
+    android:viewportHeight="512">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M294.2 1.2c5.1 2.1 8.7 6.7 9.6 12.1l10.4 62.4c-23.3 10.8-42.9 28.4-56 50.3-14.6-9-31.8-14.1-50.2-14.1-53 0-96 43-96 96 0 35.5 19.3 66.6 48 83.2 0.8 31.8 13.2 60.7 33.1 82.7l-56 39.2c-4.5 3.1-10.3 3.8-15.4 1.6s-8.7-6.7-9.6-12.1l-14-84.6-84.7-14.1c-5.4-0.9-10-4.5-12.1-9.6s-1.5-10.9 1.6-15.4L52.5 208 2.9 137.2c-3.2-4.5-3.8-10.3-1.6-15.4s6.7-8.7 12.1-9.6l84.7-14.1 14.1-84.7c0.9-5.4 4.5-10 9.6-12.1s10.9-1.5 15.4 1.6L208 52.5l70.8-49.6c4.5-3.2 10.3-3.8 15.4-1.6zM208 144c13.8 0 26.7 4.4 37.1 11.9-1.2 4.1-2.2 8.3-3 12.6-37.9 14.6-67.2 46.6-77.8 86.4-12.5-11.8-20.3-28.4-20.3-46.9 0-35.3 28.7-64 64-64z m69.4 276c11 7.4 14 22.3 6.7 33.3l-32 48c-7.4 11-22.3 14-33.3 6.7s-14-22.3-6.7-33.3l32-48c7.4-11 22.3-14 33.3-6.7z m96 0c11 7.4 14 22.3 6.7 33.3l-32 48c-7.4 11-22.3 14-33.3 6.7s-14-22.3-6.7-33.3l32-48c7.4-11 22.3-14 33.3-6.7z m96 0c11 7.4 14 22.3 6.7 33.3l-32 48c-7.4 11-22.3 14-33.3 6.7s-14-22.3-6.7-33.3l32-48c7.4-11 22.3-14 33.3-6.7z m96 0c11 7.4 14 22.3 6.7 33.3l-32 48c-7.4 11-22.3 14-33.3 6.7s-14-22.3-6.7-33.3l32-48c7.4-11 22.3-14 33.3-6.7z m74.5-116.1c0 44.2-35.8 80-80 80H288c-53 0-96-43-96-96 0-47.6 34.6-87 80-94.6V192c0-53 43-96 96-96 34.9 0 65.4 18.6 82.2 46.4 13-9.1 28.8-14.4 45.8-14.4 44.2 0 80 35.8 80 80 0 5.9-0.6 11.7-1.9 17.2 37.4 6.7 65.8 39.4 65.8 78.7z"/>
+</vector>
diff --git a/app/src/main/res/drawable/fa_compass.xml b/app/src/main/res/drawable/fa_compass.xml
index e56c503e9..a8add8ea0 100644
--- a/app/src/main/res/drawable/fa_compass.xml
+++ b/app/src/main/res/drawable/fa_compass.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="496dp"
+    android:width="512dp"
     android:height="512dp"
-    android:viewportWidth="496"
+    android:viewportWidth="512"
     android:viewportHeight="512">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M225.38 233.37c-12.5 12.5-12.5 32.76 0 45.25 12.49 12.5 32.76 12.5 45.25 0 12.5-12.5 12.5-32.76 0-45.25-12.5-12.49-32.76-12.49-45.25 0zM248 8C111.03 8 0 119.03 0 256s111.03 248 248 248 248-111.03 248-248S384.97 8 248 8z m126.14 148.05L308.17 300.4a31.94 31.94 0 0 1-15.77 15.77l-144.34 65.97c-16.65 7.61-33.81-9.55-26.2-26.2l65.98-144.35a31.94 31.94 0 0 1 15.77-15.77l144.34-65.97c16.65-7.6 33.8 9.55 26.19 26.2z"/>
+        android:pathData="M256 512a256 256 0 1 0 0-512 256 256 0 1 0 0 512z m50.7-186.9l-144.3 55.5c-19.4 7.5-38.5-11.6-31-31l55.5-144.3c3.3-8.5 9.9-15.1 18.4-18.4l144.3-55.5c19.4-7.5 38.5 11.6 31 31l-55.5 144.3c-3.2 8.5-9.9 15.1-18.4 18.4zM288 256a32 32 0 1 0-64 0 32 32 0 1 0 64 0z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_computer.xml b/app/src/main/res/drawable/fa_computer.xml
index 20d95ed3e..0877f4258 100644
--- a/app/src/main/res/drawable/fa_computer.xml
+++ b/app/src/main/res/drawable/fa_computer.xml
@@ -3,7 +3,7 @@
     android:height="512dp"
     android:viewportWidth="640"
     android:viewportHeight="512">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M384,96L384,320L64,320L64,96L384,96zM64,32C28.7,32 0,60.7 0,96L0,320c0,35.3 28.7,64 64,64L181.3,384l-10.7,32L96,416c-17.7,0 -32,14.3 -32,32s14.3,32 32,32L352,480c17.7,0 32,-14.3 32,-32s-14.3,-32 -32,-32L277.3,416l-10.7,-32L384,384c35.3,0 64,-28.7 64,-64L448,96c0,-35.3 -28.7,-64 -64,-64L64,32zM528,32c-26.5,0 -48,21.5 -48,48L480,432c0,26.5 21.5,48 48,48h64c26.5,0 48,-21.5 48,-48L640,80c0,-26.5 -21.5,-48 -48,-48L528,32zM544,96h32c8.8,0 16,7.2 16,16s-7.2,16 -16,16L544,128c-8.8,0 -16,-7.2 -16,-16s7.2,-16 16,-16zM528,176c0,-8.8 7.2,-16 16,-16h32c8.8,0 16,7.2 16,16s-7.2,16 -16,16L544,192c-8.8,0 -16,-7.2 -16,-16zM560,336a32,32 0,1 1,0 64,32 32,0 1,1 0,-64z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M384 96v224H64V96h320zM64 32C28.7 32 0 60.7 0 96v224c0 35.3 28.7 64 64 64h117.3l-10.7 32H96c-17.7 0-32 14.3-32 32s14.3 32 32 32h256c17.7 0 32-14.3 32-32s-14.3-32-32-32h-74.7l-10.7-32H384c35.3 0 64-28.7 64-64V96c0-35.3-28.7-64-64-64H64z m464 0c-26.5 0-48 21.5-48 48v352c0 26.5 21.5 48 48 48h64c26.5 0 48-21.5 48-48V80c0-26.5-21.5-48-48-48h-64z m16 64h32c8.8 0 16 7.2 16 16s-7.2 16-16 16h-32c-8.8 0-16-7.2-16-16s7.2-16 16-16z m-16 80c0-8.8 7.2-16 16-16h32c8.8 0 16 7.2 16 16s-7.2 16-16 16h-32c-8.8 0-16-7.2-16-16z m32 160a32 32 0 1 1 0 64 32 32 0 1 1 0-64z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_crown.xml b/app/src/main/res/drawable/fa_crown.xml
index db056c763..906109942 100644
--- a/app/src/main/res/drawable/fa_crown.xml
+++ b/app/src/main/res/drawable/fa_crown.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="640dp"
+    android:width="576dp"
     android:height="512dp"
-    android:viewportWidth="640"
+    android:viewportWidth="576"
     android:viewportHeight="512">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M528 448H112c-8.8 0-16 7.2-16 16v32c0 8.8 7.2 16 16 16h416c8.8 0 16-7.2 16-16v-32c0-8.8-7.2-16-16-16z m64-320c-26.5 0-48 21.5-48 48 0 7.1 1.6 13.7 4.4 19.8L476 239.2c-15.4 9.2-35.3 4-44.2-11.6L350.3 85C361 76.2 368 63 368 48c0-26.5-21.5-48-48-48s-48 21.5-48 48c0 15 7 28.2 17.7 37l-81.5 142.6c-8.9 15.6-28.9 20.8-44.2 11.6l-72.3-43.4c2.7-6 4.4-12.7 4.4-19.8 0-26.5-21.5-48-48-48S0 149.5 0 176s21.5 48 48 48c2.6 0 5.2-0.4 7.7-0.8L128 416h384l72.3-192.8c2.5 0.4 5.1 0.8 7.7 0.8 26.5 0 48-21.5 48-48s-21.5-48-48-48z"/>
+        android:pathData="M309 106c11.4-7 19-19.7 19-34 0-22.1-17.9-40-40-40s-40 17.9-40 40c0 14.4 7.6 27 19 34l-57.3 114.6c-9.1 18.2-32.7 23.4-48.6 10.7L72 160c5-6.7 8-15 8-24 0-22.1-17.9-40-40-40S0 113.9 0 136s17.9 40 40 40h0.7l45.7 251.4c5.5 30.4 32 52.6 63 52.6h277.2c30.9 0 57.4-22.1 63-52.6L535.3 176h0.7c22.1 0 40-17.9 40-40s-17.9-40-40-40-40 17.9-40 40c0 9 3 17.3 8 24l-89.1 71.3c-15.9 12.7-39.5 7.5-48.6-10.7L309 106z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_cube.xml b/app/src/main/res/drawable/fa_cube.xml
index e0dc78136..63d80eda4 100644
--- a/app/src/main/res/drawable/fa_cube.xml
+++ b/app/src/main/res/drawable/fa_cube.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="512">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M239.1 6.3l-208 78c-18.7 7-31.1 25-31.1 45v225.1c0 18.2 10.3 34.8 26.5 42.9l208 104c13.5 6.8 29.4 6.8 42.9 0l208-104c16.3-8.1 26.5-24.8 26.5-42.9V129.3c0-20-12.4-37.9-31.1-44.9l-208-78C262 2.2 250 2.2 239.1 6.3zM256 68.4l192 72v1.1l-192 78-192-78v-1.1l192-72z m32 356V275.5l160-65v133.9l-160 80z"/>
+        android:pathData="M234.5 5.7c13.9-5 29.1-5 43.1 0l192 68.6c25.4 9.1 42.4 33.2 42.4 60.3v242.8c0 27-17 51.2-42.5 60.3l-192 68.6c-13.9 5-29.1 5-43.1 0l-192-68.6C17 428.6 0 404.5 0 377.4V134.6c0-27 17-51.2 42.5-60.3l192-68.6zM256 66L82.3 128 256 190l173.7-62L256 66z m32 368.6l160-57.1v-188l-160 57.1v188z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_dove.xml b/app/src/main/res/drawable/fa_dove.xml
index 02fd67b06..4bd9e5ad1 100644
--- a/app/src/main/res/drawable/fa_dove.xml
+++ b/app/src/main/res/drawable/fa_dove.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="512">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M288 167.2v-28.1c-28.2-36.3-47.1-79.3-54.1-125.2-2.1-13.5-19-18.8-27.8-8.3-21.1 24.9-37.7 54.1-48.9 86.5 34.2 38.3 80 64.6 130.8 75.1zM400 64c-44.2 0-80 35.9-80 80.1v59.4C215.6 197.3 127 133 87 41.8c-5.5-12.5-23.2-13.2-29-0.9C41.4 76 32 115.2 32 156.6c0 70.8 34.1 136.9 85.1 185.9 13.2 12.7 26.1 23.2 38.9 32.8l-143.9 36C1.4 414-3.4 426.4 2.6 435.7 20 462.6 63 508.2 155.8 512c8 0.3 16-2.6 22.1-7.9l65.2-56.1H320c88.4 0 160-71.5 160-159.9V128l32-64H400z m0 96.1c-8.8 0-16-7.2-16-16s7.2-16 16-16 16 7.2 16 16-7.2 16-16 16z"/>
+        android:pathData="M160.8 96.5c14 17 31 30.9 49.5 42.2 25.9 15.8 53.7 25.9 77.7 31.6v-31.5c-22.2-30.3-38-67.3-39.4-110.8-0.4-11.3-7.5-21.5-18.4-24.4-7.6-2-15.8-0.2-21 5.8-13.3 15.4-32.7 44.6-48.4 87.2zM320 144v30.6 1.3V208c-60.8-5.1-185-43.8-219.3-157.2C97.4 40 87.9 32 76.6 32c-7.9 0-15.3 3.9-18.8 11C46.8 65.9 32 112.1 32 176c0 116.9 80.1 180.5 118.4 202.8L11.8 416.6c-5.1 1.4-9.2 5.2-10.9 10.2s-0.8 10.6 2.3 14.8C21.7 466.2 77.3 512 160 512c3.6 0 7.2-1.2 10-3.5l75.6-60.5H320c88.4 0 160-71.6 160-160V128l29.9-44.9c1.3-2 2.1-4.4 2.1-6.8 0-6.8-5.5-12.3-12.3-12.3H400c-44.2 0-80 35.8-80 80z m80-16a16 16 0 1 1 0 32 16 16 0 1 1 0-32z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_dragon.xml b/app/src/main/res/drawable/fa_dragon.xml
deleted file mode 100644
index 523b2add4..000000000
--- a/app/src/main/res/drawable/fa_dragon.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="640dp"
-    android:height="512dp"
-    android:viewportWidth="640"
-    android:viewportHeight="512">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M18.32 255.78L192 223.96l-91.28 68.69c-10.08 10.08-2.94 27.31 11.31 27.31h222.7c-9.44-26.4-14.73-54.47-14.73-83.38v-42.27l-119.73-87.6c-23.82-15.88-55.29-14.01-77.06 4.59L5.81 227.64c-12.38 10.33-3.45 30.42 12.51 28.14z m556.87 34.1l-100.66-50.31A48 48 0 0 1 448 196.65v-36.69h64l28.09 22.63c6 6 14.14 9.37 22.63 9.37h30.97a32 32 0 0 0 28.62-17.69l14.31-28.62a32 32 0 0 0-3.02-33.51l-74.53-99.38C553.02 4.7 543.54 0 533.47 0H296.02c-7.13 0-10.7 8.57-5.66 13.61L352 63.96 292.42 88.8c-5.9 2.95-5.9 11.36 0 14.31L352 127.96v108.62c0 72.08 36.03 139.39 96 179.38-195.59 6.81-344.56 41.01-434.1 60.91C5.78 478.67 0 485.88 0 494.2 0 504 7.95 512 17.76 512h499.08c63.29 0.01 119.61-47.56 122.99-110.76 2.52-47.28-22.73-90.4-64.64-111.36zM489.18 66.25l45.65 11.41c-2.75 10.91-12.47 18.89-24.13 18.26-12.96-0.71-25.85-12.53-21.52-29.67z"/>
-</vector>
diff --git a/app/src/main/res/drawable/fa_droplet.xml b/app/src/main/res/drawable/fa_droplet.xml
index 8fabc656f..56f7399a1 100644
--- a/app/src/main/res/drawable/fa_droplet.xml
+++ b/app/src/main/res/drawable/fa_droplet.xml
@@ -3,7 +3,7 @@
     android:height="512dp"
     android:viewportWidth="384"
     android:viewportHeight="512">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M192,512C86,512 0,426 0,320C0,228.8 130.2,57.7 166.6,11.7C172.6,4.2 181.5,0 191.1,0h1.8c9.6,0 18.5,4.2 24.5,11.7C253.8,57.7 384,228.8 384,320c0,106 -86,192 -192,192zM96,336c0,-8.8 -7.2,-16 -16,-16s-16,7.2 -16,16c0,61.9 50.1,112 112,112c8.8,0 16,-7.2 16,-16s-7.2,-16 -16,-16c-44.2,0 -80,-35.8 -80,-80z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M192 512C86 512 0 426 0 320 0 228.8 130.2 57.7 166.6 11.7c6-7.5 14.9-11.7 24.5-11.7h1.8c9.6 0 18.5 4.2 24.5 11.7C253.8 57.7 384 228.8 384 320c0 106-86 192-192 192zM96 336c0-8.8-7.2-16-16-16s-16 7.2-16 16c0 61.9 50.1 112 112 112 8.8 0 16-7.2 16-16s-7.2-16-16-16c-44.2 0-80-35.8-80-80z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_earth_americas.xml b/app/src/main/res/drawable/fa_earth_americas.xml
new file mode 100644
index 000000000..9695054bf
--- /dev/null
+++ b/app/src/main/res/drawable/fa_earth_americas.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="512dp"
+    android:height="512dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M57.7 193l9.4 16.4c8.3 14.5 21.9 25.2 38 29.8l57.9 16.5c17.2 4.9 29 20.6 29 38.5v39.9c0 11 6.2 21 16 25.9s16 14.9 16 25.9v39c0 15.6 14.9 26.9 29.9 22.6 16.1-4.6 28.6-17.5 32.7-33.8l2.8-11.2c4.2-16.9 15.2-31.4 30.3-40l8.1-4.6c15-8.5 24.2-24.5 24.2-41.7v-8.3c0-12.7-5.1-24.9-14.1-33.9l-3.9-3.9c-9-9-21.2-14.1-33.9-14.1H257c-11.1 0-22.1-2.9-31.8-8.4l-34.5-19.7c-4.3-2.5-7.6-6.5-9.2-11.2-3.2-9.6 1.1-20 10.2-24.5l5.9-3c6.6-3.3 14.3-3.9 21.3-1.5l23.2 7.7c8.2 2.7 17.2-0.4 21.9-7.5 4.7-7 4.2-16.3-1.2-22.8l-13.6-16.3c-10-12-9.9-29.5 0.3-41.3l15.7-18.3c8.8-10.3 10.2-25 3.5-36.7l-2.4-4.2c-3.5-0.2-6.9-0.3-10.4-0.3-92.8 0-171.5 60.9-198.2 145zM464 256c0-36.8-9.6-71.4-26.4-101.5L412 164.8c-15.7 6.3-23.8 23.8-18.5 39.8l16.9 50.7c3.5 10.4 12 18.3 22.6 20.9l29.1 7.3c1.2-9 1.8-18.2 1.8-27.5zM0 256a256 256 0 1 1 512 0 256 256 0 1 1-512 0z"/>
+</vector>
diff --git a/app/src/main/res/drawable/fa_face_smile.xml b/app/src/main/res/drawable/fa_face_smile.xml
new file mode 100644
index 000000000..e5ba210ab
--- /dev/null
+++ b/app/src/main/res/drawable/fa_face_smile.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="512dp"
+    android:height="512dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M256 512a256 256 0 1 0 0-512 256 256 0 1 0 0 512z m-91.9-186.5C182 346.2 212.6 368 256 368s74-21.8 91.9-42.5c5.8-6.7 15.9-7.4 22.6-1.6s7.4 15.9 1.6 22.6c-22.3 25.6-61 53.5-116.1 53.5s-93.8-27.9-116.1-53.5c-5.8-6.7-5.1-16.8 1.6-22.6s16.8-5.1 22.6 1.6zM144.4 208a32 32 0 1 1 64 0 32 32 0 1 1-64 0z m192-32a32 32 0 1 1 0 64 32 32 0 1 1 0-64z"/>
+</vector>
diff --git a/app/src/main/res/drawable/fa_faucet.xml b/app/src/main/res/drawable/fa_faucet.xml
index 31ec4b0da..619c36ac8 100644
--- a/app/src/main/res/drawable/fa_faucet.xml
+++ b/app/src/main/res/drawable/fa_faucet.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="512">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M352 256h-38.61c-15.71-13.44-35.46-23.07-57.39-28v-47.56l-32-3.38-32 3.38V228c-21.93 5-41.68 14.6-57.39 28H16a16 16 0 0 0-16 16v96a16 16 0 0 0 16 16h92.79C129.38 421.73 173 448 224 448s94.62-26.27 115.21-64H352a32 32 0 0 1 32 32 32 32 0 0 0 32 32h64a32 32 0 0 0 32-32 160 160 0 0 0-160-160ZM81.59 159.91l142.41-15 142.41 15c9.42 1 17.59-6.81 17.59-16.8v-30.22c0-10-8.17-17.8-17.59-16.81L256 107.74V80a16 16 0 0 0-16-16h-32a16 16 0 0 0-16 16v27.74L81.59 96.08C72.17 95.09 64 102.9 64 112.89v30.22c0 9.99 8.17 17.8 17.59 16.8Z"/>
+        android:pathData="M192 96v12L96 96c-17.7 0-32 14.3-32 32s14.3 32 32 32l96-12 31-3.9 1-0.1 1 0.1 31 3.9 96 12c17.7 0 32-14.3 32-32s-14.3-32-32-32l-96 12V96c0-17.7-14.3-32-32-32s-32 14.3-32 32zM32 256c-17.7 0-32 14.3-32 32v64c0 17.7 14.3 32 32 32h100.1c20.2 29 53.9 48 91.9 48s71.7-19 91.9-48H352c17.7 0 32 14.3 32 32s14.3 32 32 32h64c17.7 0 32-14.3 32-32 0-88.4-71.6-160-160-160h-32l-22.6-22.6c-6-6-14.1-9.4-22.6-9.4H256v-43.8l-32-4-32 4V224h-18.7c-8.5 0-16.6 3.4-22.6 9.4L128 256H32z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_feather.xml b/app/src/main/res/drawable/fa_feather.xml
deleted file mode 100644
index 43fa96de7..000000000
--- a/app/src/main/res/drawable/fa_feather.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="512dp"
-    android:height="512dp"
-    android:viewportWidth="512"
-    android:viewportHeight="512">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M467.14 44.84c-62.55-62.48-161.67-64.78-252.28 25.73l-85.75 85.66C68.65 216.62 58.72 307.06 65.47 367.4l178.44-178.25c6.26-6.25 16.4-6.25 22.65 0s6.25 16.38 0 22.63L7.04 471.03c-9.38 9.37-9.38 24.57 0 33.94 9.38 9.37 24.6 9.37 33.98 0l66.1-66.03C159.42 454.65 279 457.11 353.95 384h-98.19l147.57-49.14c49.99-49.93 36.38-36.18 46.31-46.86h-97.78l131.54-43.8c45.44-74.46 34.31-148.84-16.26-199.36z"/>
-</vector>
diff --git a/app/src/main/res/drawable/fa_film.xml b/app/src/main/res/drawable/fa_film.xml
index 8611526cb..c83d3b849 100644
--- a/app/src/main/res/drawable/fa_film.xml
+++ b/app/src/main/res/drawable/fa_film.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="512">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M488 64h-8v20c0 6.6-5.4 12-12 12h-40c-6.6 0-12-5.4-12-12V64H96v20c0 6.6-5.4 12-12 12H44c-6.6 0-12-5.4-12-12V64h-8C10.7 64 0 74.7 0 88v336c0 13.3 10.7 24 24 24h8v-20c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v20h320v-20c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v20h8c13.3 0 24-10.7 24-24V88c0-13.3-10.7-24-24-24zM96 372c0 6.6-5.4 12-12 12H44c-6.6 0-12-5.4-12-12v-40c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v40z m0-96c0 6.6-5.4 12-12 12H44c-6.6 0-12-5.4-12-12v-40c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v40z m0-96c0 6.6-5.4 12-12 12H44c-6.6 0-12-5.4-12-12v-40c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v40z m272 208c0 6.6-5.4 12-12 12H156c-6.6 0-12-5.4-12-12v-96c0-6.6 5.4-12 12-12h200c6.6 0 12 5.4 12 12v96z m0-168c0 6.6-5.4 12-12 12H156c-6.6 0-12-5.4-12-12v-96c0-6.6 5.4-12 12-12h200c6.6 0 12 5.4 12 12v96z m112 152c0 6.6-5.4 12-12 12h-40c-6.6 0-12-5.4-12-12v-40c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v40z m0-96c0 6.6-5.4 12-12 12h-40c-6.6 0-12-5.4-12-12v-40c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v40z m0-96c0 6.6-5.4 12-12 12h-40c-6.6 0-12-5.4-12-12v-40c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v40z"/>
+        android:pathData="M0 96c0-35.3 28.7-64 64-64h384c35.3 0 64 28.7 64 64v320c0 35.3-28.7 64-64 64H64c-35.3 0-64-28.7-64-64V96z m48 272v32c0 8.8 7.2 16 16 16h32c8.8 0 16-7.2 16-16v-32c0-8.8-7.2-16-16-16H64c-8.8 0-16 7.2-16 16z m368-16c-8.8 0-16 7.2-16 16v32c0 8.8 7.2 16 16 16h32c8.8 0 16-7.2 16-16v-32c0-8.8-7.2-16-16-16h-32zM48 240v32c0 8.8 7.2 16 16 16h32c8.8 0 16-7.2 16-16v-32c0-8.8-7.2-16-16-16H64c-8.8 0-16 7.2-16 16z m368-16c-8.8 0-16 7.2-16 16v32c0 8.8 7.2 16 16 16h32c8.8 0 16-7.2 16-16v-32c0-8.8-7.2-16-16-16h-32zM48 112v32c0 8.8 7.2 16 16 16h32c8.8 0 16-7.2 16-16v-32c0-8.8-7.2-16-16-16H64c-8.8 0-16 7.2-16 16z m368-16c-8.8 0-16 7.2-16 16v32c0 8.8 7.2 16 16 16h32c8.8 0 16-7.2 16-16v-32c0-8.8-7.2-16-16-16h-32z m-256 32v64c0 17.7 14.3 32 32 32h128c17.7 0 32-14.3 32-32v-64c0-17.7-14.3-32-32-32H192c-17.7 0-32 14.3-32 32z m32 160c-17.7 0-32 14.3-32 32v64c0 17.7 14.3 32 32 32h128c17.7 0 32-14.3 32-32v-64c0-17.7-14.3-32-32-32H192z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_fire.xml b/app/src/main/res/drawable/fa_fire.xml
index 12374376d..820b7a6d0 100644
--- a/app/src/main/res/drawable/fa_fire.xml
+++ b/app/src/main/res/drawable/fa_fire.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="384dp"
+    android:width="448dp"
     android:height="512dp"
-    android:viewportWidth="384"
+    android:viewportWidth="448"
     android:viewportHeight="512">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M216 23.86c0-23.8-30.65-32.77-44.15-13.04C48 191.85 224 200 224 288c0 35.63-29.11 64.46-64.85 63.99C123.98 351.54 96 322.22 96 287.05v-85.51c0-21.7-26.47-32.23-41.43-16.5C27.8 213.16 0 261.33 0 320c0 105.87 86.13 192 192 192s192-86.13 192-192c0-170.29-168-193-168-296.14z"/>
+        android:pathData="M159.3 5.4c7.8-7.3 19.9-7.2 27.7 0.1 27.6 25.9 53.5 53.8 77.7 84 11-14.4 23.5-30.1 37-42.9 7.9-7.4 20.1-7.4 28 0.1 34.6 33 63.9 76.6 84.5 118 20.3 40.8 33.8 82.5 33.8 111.9C448 404.2 348.2 512 224 512 98.4 512 0 404.1 0 276.5c0-38.4 17.8-85.3 45.4-131.7C73.3 97.7 112.7 48.6 159.3 5.4zM225.7 416c25.3 0 47.7-7 68.8-21 42.1-29.4 53.4-88.2 28.1-134.4-4.5-9-16-9.6-22.5-2l-25.2 29.3c-6.6 7.6-18.5 7.4-24.7-0.5-16.5-21-46-58.5-62.8-79.8-6.3-8-18.3-8.1-24.7-0.1-33.8 42.5-50.8 69.3-50.8 99.4C112 375.4 162.6 416 225.7 416z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_fish.xml b/app/src/main/res/drawable/fa_fish.xml
index e6abd769a..515cbe62b 100644
--- a/app/src/main/res/drawable/fa_fish.xml
+++ b/app/src/main/res/drawable/fa_fish.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="512">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M327.1 96c-89.97 0-168.54 54.77-212.27 101.63L27.5 131.58c-12.13-9.18-30.24 0.6-27.14 14.66L24.54 256 0.35 365.77c-3.1 14.06 15.01 23.83 27.14 14.66l87.33-66.05C158.55 361.23 237.13 416 327.1 416 464.56 416 576 288 576 256S464.56 96 327.1 96z m87.43 184c-13.25 0-24-10.75-24-24 0-13.26 10.75-24 24-24 13.26 0 24 10.74 24 24 0 13.25-10.75 24-24 24z"/>
+        android:pathData="M180.5 141.5C219.7 108.5 272.6 80 336 80s116.3 28.5 155.5 61.5c39.1 33 66.9 72.4 81 99.8 4.7 9.2 4.7 20.1 0 29.3-14.1 27.4-41.9 66.8-81 99.8C452.3 403.5 399.4 432 336 432s-116.3-28.5-155.5-61.5c-16.2-13.7-30.5-28.5-42.7-43.1l-89.7 52.2c-12.5 7.3-28.4 5.3-38.7-4.9s-12.4-26-5.2-38.6L50 256 4.2 175.9c-7.2-12.6-5-28.4 5.3-38.6s26.1-12.2 38.7-4.9l89.7 52.3c12.2-14.6 26.5-29.4 42.7-43.1zM448 256a32 32 0 1 0-64 0 32 32 0 1 0 64 0z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_flag_checkered.xml b/app/src/main/res/drawable/fa_flag_checkered.xml
index 29b560fd7..e5e00070f 100644
--- a/app/src/main/res/drawable/fa_flag_checkered.xml
+++ b/app/src/main/res/drawable/fa_flag_checkered.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="512dp"
+    android:width="448dp"
     android:height="512dp"
-    android:viewportWidth="512"
+    android:viewportWidth="448"
     android:viewportHeight="512">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M243.2 189.9V258c26.1 5.9 49.3 15.6 73.6 22.3v-68.2c-26-5.8-49.4-15.5-73.6-22.2z m223.3-123c-34.3 15.9-76.5 31.9-117 31.9C296 98.8 251.7 64 184.3 64c-25 0-47.3 4.4-68 12 2.8-7.3 4.1-15.2 3.6-23.6C118.1 24 94.8 1.2 66.3 0 34.3-1.3 8 24.3 8 56c0 19 9.5 35.8 24 45.9V488c0 13.3 10.7 24 24 24h16c13.3 0 24-10.7 24-24v-94.4c28.3-12.1 63.6-22.1 114.4-22.1 53.6 0 97.8 34.8 165.2 34.8 48.2 0 86.7-16.3 122.5-40.9 8.7-6 13.8-15.8 13.8-26.4V95.9c0.1-23.3-24.2-38.8-45.4-29zM169.6 325.5c-25.8 2.7-50 8.2-73.6 16.6v-70.5c26.2-9.3 47.5-15 73.6-17.4zM464 191c-23.6 9.8-46.3 19.5-73.6 23.9V286c24.8-3.4 51.4-11.8 73.6-26v70.5c-25.1 16.1-48.5 24.7-73.6 27.1V286c-27 3.7-47.9 1.5-73.6-5.6v67.4c-23.9-7.4-47.3-16.7-73.6-21.3V258c-19.7-4.4-40.8-6.8-73.6-3.8v-70c-22.4 3.1-44.6 10.2-73.6 20.9v-70.5c33.2-12.2 50.1-19.8 73.6-22v71.6c27-3.7 48.4-1.3 73.6 5.7v-67.4c23.7 7.4 47.2 16.7 73.6 21.3v68.4c23.7 5.3 47.6 6.9 73.6 2.7V143c27-4.8 52.3-13.6 73.6-22.5z"/>
+        android:pathData="M32 0c17.7 0 32 14.3 32 32v16l69-17.2c38.1-9.5 78.3-5.1 113.5 12.5 46.3 23.2 100.8 23.2 147.1 0l9.6-4.8c20.6-10.4 44.8 4.6 44.8 27.6v279.7c0 13.3-8.3 25.3-20.8 30l-34.7 13c-46.2 17.3-97.6 14.6-141.7-7.4-37.9-19-81.3-23.7-122.5-13.4L64 384v96c0 17.7-14.3 32-32 32S0 497.7 0 480v-80-66V64 32C0 14.3 14.3 0 32 0z m32 187.1l64-13.9v65.5l-64 13.9V318l48.8-12.2c5.1-1.3 10.1-2.4 15.2-3.3v-63.8l38.9-8.4c8.3-1.8 16.7-2.5 25.1-2.1v-64c13.6 0.4 27.2 2.6 40.4 6.4l23.6 6.9v66.7l-41.7-12.3c-7.3-2.1-14.8-3.4-22.3-3.8v71.4c21.8 1.9 43.3 6.7 64 14.4v-69.7l22.7 6.7c13.5 4 27.3 6.4 41.3 7.4V194c-7.8-0.8-15.6-2.3-23.2-4.5l-40.8-12v-62c-13-3.8-25.8-8.8-38.2-15-8.2-4.1-16.9-7-25.8-8.8v72.4c-13-0.4-26 0.8-38.7 3.6l-25.3 5.5V98l-64 16v73.1z m256 148.6c16.8 1.5 33.9-0.7 50-6.8l14-5.2v-71.8l-7.9 1.8c-18.4 4.3-37.3 5.7-56.1 4.5v77.4z m64-149.4v-70.9c-20.9 6.1-42.4 9.1-64 9.1V194c13.9 1.4 28 0.5 41.7-2.6l22.3-5.2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_gauge.xml b/app/src/main/res/drawable/fa_gauge.xml
index 398f619e1..63b6b2f9a 100644
--- a/app/src/main/res/drawable/fa_gauge.xml
+++ b/app/src/main/res/drawable/fa_gauge.xml
@@ -3,7 +3,7 @@
     android:height="512dp"
     android:viewportWidth="512"
     android:viewportHeight="512">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M0,256a256,256 0,1 1,512 0A256,256 0,1 1,0 256zM320,352c0,-26.9 -16.5,-49.9 -40,-59.3L280,88c0,-13.3 -10.7,-24 -24,-24s-24,10.7 -24,24L232,292.7c-23.5,9.5 -40,32.5 -40,59.3c0,35.3 28.7,64 64,64s64,-28.7 64,-64zM144,176a32,32 0,1 0,0 -64,32 32,0 1,0 0,64zM128,256a32,32 0,1 0,-64 0,32 32,0 1,0 64,0zM416,288a32,32 0,1 0,0 -64,32 32,0 1,0 0,64zM400,144a32,32 0,1 0,-64 0,32 32,0 1,0 64,0z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M0 256a256 256 0 1 1 512 0 256 256 0 1 1-512 0z m320 96c0-26.9-16.5-49.9-40-59.3V88c0-13.3-10.7-24-24-24s-24 10.7-24 24v204.7c-23.5 9.5-40 32.5-40 59.3 0 35.3 28.7 64 64 64s64-28.7 64-64zM144 176a32 32 0 1 0 0-64 32 32 0 1 0 0 64z m-16 80a32 32 0 1 0-64 0 32 32 0 1 0 64 0z m288 32a32 32 0 1 0 0-64 32 32 0 1 0 0 64z m-16-144a32 32 0 1 0-64 0 32 32 0 1 0 64 0z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_ghost.xml b/app/src/main/res/drawable/fa_ghost.xml
index e4db79a04..23a75479f 100644
--- a/app/src/main/res/drawable/fa_ghost.xml
+++ b/app/src/main/res/drawable/fa_ghost.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="512">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M186.1 0.09C81.01 3.24 0 94.92 0 200.05v263.92c0 14.26 17.23 21.39 27.31 11.31l24.92-18.53c6.66-4.95 16-3.99 21.51 2.21l42.95 48.35c6.25 6.25 16.38 6.25 22.63 0l40.72-45.85c6.37-7.17 17.56-7.17 23.92 0l40.72 45.85c6.25 6.25 16.38 6.25 22.63 0l42.95-48.35c5.51-6.2 14.85-7.17 21.51-2.21l24.92 18.53c10.08 10.08 27.31 2.94 27.31-11.31V192C384 84 294.83-3.17 186.1 0.09zM128 224c-17.67 0-32-14.33-32-32s14.33-32 32-32 32 14.33 32 32-14.33 32-32 32z m128 0c-17.67 0-32-14.33-32-32s14.33-32 32-32 32 14.33 32 32-14.33 32-32 32z"/>
+        android:pathData="M40.1 467.1l-11.2 9c-3.2 2.5-7.1 3.9-11.1 3.9C8 480 0 472 0 462.2V192C0 86 86 0 192 0s192 86 192 192v270.2c0 9.8-8 17.8-17.8 17.8-4 0-7.9-1.4-11.1-3.9l-11.2-9c-13.4-10.7-32.8-9-44.1 3.9l-30.5 35c-3.3 3.8-8.2 6-13.3 6s-9.9-2.2-13.3-6l-26.6-30.5c-12.7-14.6-35.4-14.6-48.2 0L141.3 506c-3.3 3.8-8.2 6-13.3 6s-9.9-2.2-13.3-6l-30.5-35c-11.3-12.9-30.7-14.6-44.1-3.9zM160 192a32 32 0 1 0-64 0 32 32 0 1 0 64 0z m96 32a32 32 0 1 0 0-64 32 32 0 1 0 0 64z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_gift.xml b/app/src/main/res/drawable/fa_gift.xml
index a403ac6b8..b13e4f48d 100644
--- a/app/src/main/res/drawable/fa_gift.xml
+++ b/app/src/main/res/drawable/fa_gift.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="512">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M32 448c0 17.7 14.3 32 32 32h160V320H32v128z m256 32h160c17.7 0 32-14.3 32-32V320H288v160z m192-320h-42.1c6.2-12.1 10.1-25.5 10.1-40 0-48.5-39.5-88-88-88-41.6 0-68.5 21.3-103 68.3-34.5-47-61.4-68.3-103-68.3-48.5 0-88 39.5-88 88 0 14.5 3.8 27.9 10.1 40H32c-17.7 0-32 14.3-32 32v80c0 8.8 7.2 16 16 16h480c8.8 0 16-7.2 16-16v-80c0-17.7-14.3-32-32-32z m-326.1 0c-22.1 0-40-17.9-40-40s17.9-40 40-40c19.9 0 34.6 3.3 86.1 80h-86.1z m206.1 0h-86.1c51.4-76.5 65.7-80 86.1-80 22.1 0 40 17.9 40 40s-17.9 40-40 40z"/>
+        android:pathData="M190.5 68.8l34.8 59.2H224h-72c-22.1 0-40-17.9-40-40s17.9-40 40-40h2.2c14.9 0 28.8 7.9 36.3 20.8zM64 88c0 14.4 3.5 28 9.6 40H32c-17.7 0-32 14.3-32 32v64c0 17.7 14.3 32 32 32h448c17.7 0 32-14.3 32-32v-64c0-17.7-14.3-32-32-32h-41.6c6.1-12 9.6-25.6 9.6-40 0-48.6-39.4-88-88-88h-2.2c-31.9 0-61.5 16.9-77.7 44.4L256 85.5l-24.1-41C215.7 16.9 186.1 0 154.2 0H152c-48.6 0-88 39.4-88 88z m336 0c0 22.1-17.9 40-40 40h-72-1.3l34.8-59.2c7.6-12.9 21.4-20.8 36.3-20.8h2.2c22.1 0 40 17.9 40 40zM32 288v176c0 26.5 21.5 48 48 48h144V288H32z m256 224h144c26.5 0 48-21.5 48-48V288H288v224z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_glasses.xml b/app/src/main/res/drawable/fa_glasses.xml
index 67e221708..3e6124af7 100644
--- a/app/src/main/res/drawable/fa_glasses.xml
+++ b/app/src/main/res/drawable/fa_glasses.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="512">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M574.1 280.37L528.75 98.66c-5.91-23.7-21.59-44.05-43-55.81-21.44-11.73-46.97-14.11-70.19-6.33l-15.25 5.08c-8.39 2.79-12.92 11.86-10.12 20.24l5.06 15.18c2.79 8.38 11.85 12.91 20.23 10.12l13.18-4.39c10.87-3.62 23-3.57 33.16 1.73 10.29 5.37 17.57 14.56 20.37 25.82l38.46 153.82c-22.19-6.81-49.79-12.46-81.2-12.46-34.77 0-73.98 7.02-114.85 26.74h-73.18c-40.87-19.74-80.08-26.75-114.86-26.75-31.42 0-59.02 5.65-81.21 12.46l38.46-153.83c2.79-11.25 10.09-20.45 20.38-25.81 10.16-5.3 22.28-5.35 33.15-1.73l13.17 4.39c8.38 2.79 17.44-1.74 20.23-10.12l5.06-15.18c2.8-8.38-1.73-17.45-10.12-20.24l-15.25-5.08c-23.22-7.78-48.75-5.41-70.19 6.33-21.41 11.77-37.09 32.11-43 55.8L1.9 280.37A64.22 64.22 0 0 0 0 295.86v70.25C0 429.01 51.58 480 115.2 480h37.12c60.28 0 110.37-45.94 114.88-105.37l2.93-38.63h35.75l2.93 38.63C313.31 434.06 363.4 480 423.68 480h37.12c63.62 0 115.2-50.99 115.2-113.88v-70.25c0-5.23-0.64-10.43-1.9-15.5z m-370.72 89.42c-1.97 25.91-24.4 46.21-51.06 46.21H115.2C86.97 416 64 393.62 64 366.11v-37.54c18.12-6.49 43.42-12.92 72.58-12.92 23.86 0 47.26 4.33 69.93 12.92l-3.13 41.22zM512 366.12c0 27.51-22.97 49.88-51.2 49.88h-37.12c-26.67 0-49.1-20.3-51.06-46.21l-3.13-41.22c22.67-8.59 46.08-12.92 69.95-12.92 29.12 0 54.43 6.44 72.55 12.93v37.54z"/>
+        android:pathData="M118.6 80c-11.5 0-21.4 7.9-24 19.1L57 260.3c20.5-6.2 48.3-12.3 78.7-12.3 32.3 0 61.8 6.9 82.8 13.5 10.6 3.3 19.3 6.7 25.4 9.2 3.1 1.3 5.5 2.4 7.3 3.2 0.9 0.4 1.6 0.7 2.1 1l0.6 0.3 0.2 0.1h0.1l-6.3 12.7 6.3-12.7c5.8 2.9 10.4 7.3 13.5 12.7h40.6c3.1-5.3 7.7-9.8 13.5-12.7l6.3 12.7-6.3-12.7h0.1l0.2-0.1 0.6-0.3c0.5-0.2 1.2-0.6 2.1-1 1.8-0.8 4.2-1.9 7.3-3.2 6.1-2.6 14.8-5.9 25.4-9.2 21-6.6 50.4-13.5 82.8-13.5 30.4 0 58.2 6.1 78.7 12.3L481.4 99.1c-2.6-11.2-12.6-19.1-24-19.1-3.1 0-6.2 0.6-9.2 1.8l-31.3 12.5c-12.3 4.9-26.3-1.1-31.2-13.4s1.1-26.3 13.4-31.2l31.3-12.5c8.6-3.4 17.7-5.2 27-5.2 33.8 0 63.1 23.3 70.8 56.2l43.9 188c1.7 7.3 2.9 14.7 3.5 22.1 0.3 1.9 0.5 3.8 0.5 5.7v6.7V352v16c0 61.9-50.1 112-112 112h-44.4c-59.4 0-108.5-46.4-111.8-105.8l-1.3-22.2h-37.2l-1.2 22.2C264.9 433.6 215.8 480 156.3 480H112C50.1 480 0 429.9 0 368v-16-41.3-6.7c0-1.9 0.2-3.8 0.5-5.7 0.6-7.4 1.8-14.8 3.5-22.1l43.9-188C55.5 55.3 84.8 32 118.6 32c9.2 0 18.4 1.8 27 5.2l31.3 12.5c12.3 4.9 18.3 18.9 13.4 31.2s-18.9 18.3-31.2 13.4l-31.3-12.5c-2.9-1.2-6-1.8-9.2-1.8zM64 325.4V368c0 26.5 21.5 48 48 48h44.3c25.5 0 46.5-19.9 47.9-45.3l2.5-45.6c-2.3-0.8-4.9-1.7-7.5-2.5-17.2-5.4-39.9-10.5-63.6-10.5-23.7 0-46.2 5.1-63.2 10.5-3.1 1-5.9 1.9-8.5 2.9zM512 368v-42.6c-2.6-0.9-5.5-1.9-8.5-2.9-17-5.4-39.5-10.5-63.2-10.5-23.7 0-46.4 5.1-63.6 10.5-2.7 0.8-5.2 1.7-7.5 2.5l2.5 45.6c1.4 25.4 22.5 45.3 47.9 45.3H464c26.5 0 48-21.5 48-48z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_graduation_cap.xml b/app/src/main/res/drawable/fa_graduation_cap.xml
index 4730971eb..8bd624604 100644
--- a/app/src/main/res/drawable/fa_graduation_cap.xml
+++ b/app/src/main/res/drawable/fa_graduation_cap.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="512">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M622.34 153.2L343.4 67.5c-15.2-4.67-31.6-4.67-46.79 0L17.66 153.2c-23.54 7.23-23.54 38.36 0 45.59l48.63 14.94c-10.67 13.19-17.23 29.28-17.88 46.9C38.78 266.15 32 276.11 32 288c0 10.78 5.68 19.85 13.86 25.65L20.33 428.53C18.11 438.52 25.71 448 35.94 448h56.11c10.24 0 17.84-9.48 15.62-19.47L82.14 313.65C90.32 307.85 96 298.78 96 288c0-11.57-6.47-21.25-15.66-26.87 0.76-15.02 8.44-28.3 20.69-36.72L296.6 284.5c9.06 2.78 26.44 6.25 46.79 0l278.95-85.7c23.55-7.24 23.55-38.36 0-45.6zM352.79 315.09c-28.53 8.76-52.84 3.92-65.59 0l-145.02-44.55L128 384c0 35.35 85.96 64 192 64s192-28.65 192-64l-14.18-113.47-145.03 44.56z"/>
+        android:pathData="M320 32c-8.1 0-16.1 1.4-23.7 4.1L15.8 137.4C6.3 140.9 0 149.9 0 160s6.3 19.1 15.8 22.6l57.9 20.9C57.3 229.3 48 259.8 48 291.9V320c0 28.4-10.8 57.7-22.3 80.8-6.5 13-13.9 25.8-22.5 37.6-3.2 4.3-4.1 9.9-2.3 15s6 8.9 11.2 10.2l64 16c4.2 1.1 8.7 0.3 12.4-2s6.3-6.1 7.1-10.4c8.6-42.8 4.3-81.2-2.1-108.7-3.2-14.2-7.5-28.7-13.5-42v-24.6c0-30.2 10.2-58.7 27.9-81.5 12.9-15.5 29.6-28 49.2-35.7l157-61.7c8.2-3.2 17.5 0.8 20.7 9s-0.8 17.5-9 20.7l-157 61.7c-12.4 4.9-23.3 12.4-32.2 21.6l159.6 57.6c7.6 2.7 15.6 4.1 23.7 4.1s16.1-1.4 23.7-4.1l280.6-101c9.5-3.4 15.8-12.5 15.8-22.6s-6.3-19.1-15.8-22.6L343.7 36.1c-7.6-2.7-15.6-4.1-23.7-4.1zM128 408c0 35.3 86 72 192 72s192-36.7 192-72l-15.3-145.4L354.5 314c-11.1 4-22.8 6-34.5 6s-23.5-2-34.5-6l-142.2-51.4L128 408z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_guitar.xml b/app/src/main/res/drawable/fa_guitar.xml
index fe7247ad1..6a9b2effe 100644
--- a/app/src/main/res/drawable/fa_guitar.xml
+++ b/app/src/main/res/drawable/fa_guitar.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="512">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M502.63 39L473 9.37a32 32 0 0 0-45.26 0L381.46 55.7a35.14 35.14 0 0 0-8.53 13.79L360.77 106l-76.26 76.26c-12.16-8.76-25.5-15.74-40.1-19.14-33.45-7.78-67-0.88-89.88 22a82.45 82.45 0 0 0-20.24 33.47c-6 18.56-23.21 32.69-42.15 34.46-23.7 2.27-45.73 11.45-62.61 28.44C-16.11 327-7.9 409 47.58 464.45S185 528 230.56 482.52c17-16.88 26.16-38.9 28.45-62.71 1.76-18.85 15.89-36.13 34.43-42.14a82.6 82.6 0 0 0 33.48-20.25c22.87-22.88 29.74-56.36 22-89.75-3.39-14.64-10.37-28-19.16-40.2L406 151.23l36.48-12.16a35.14 35.14 0 0 0 13.79-8.53l46.33-46.32A32 32 0 0 0 502.63 39zM208 352a48 48 0 1 1 48-48 48 48 0 0 1-48 48z"/>
+        android:pathData="M465 7c-9.4-9.4-24.6-9.4-33.9 0L383 55c-2.4 2.4-4.3 5.3-5.5 8.5l-15.4 41-77.5 77.6c-45.1-29.4-99.3-30.2-131 1.6-11 11-18 24.6-21.4 39.6-3.7 16.6-19.1 30.7-36.1 31.6-25.6 1.3-49.3 10.7-67.3 28.6-44.8 44.9-36.4 125.9 18.7 181s136.1 63.5 180.9 18.7c17.9-17.9 27.4-41.7 28.6-67.3 0.9-17 15-32.3 31.6-36.1 15-3.4 28.6-10.5 39.6-21.4 31.8-31.8 31-85.9 1.6-131l77.6-77.6 41-15.4c3.2-1.2 6.1-3.1 8.5-5.5l48-48c9.4-9.4 9.4-24.6 0-33.9L465 7zM208 256a48 48 0 1 1 0 96 48 48 0 1 1 0-96z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_hammer.xml b/app/src/main/res/drawable/fa_hammer.xml
index 430262cc0..35ab7e5d3 100644
--- a/app/src/main/res/drawable/fa_hammer.xml
+++ b/app/src/main/res/drawable/fa_hammer.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="512">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M571.31 193.94l-22.63-22.63c-6.25-6.25-16.38-6.25-22.63 0l-11.31 11.31-28.9-28.9c5.63-21.31 0.36-44.9-16.35-61.61l-45.25-45.25c-62.48-62.48-163.79-62.48-226.28 0l90.51 45.25v18.75c0 16.97 6.74 33.25 18.75 45.25l49.14 49.14c16.71 16.71 40.3 21.98 61.61 16.35l28.9 28.9-11.31 11.31c-6.25 6.25-6.25 16.38 0 22.63l22.63 22.63c6.25 6.25 16.38 6.25 22.63 0l90.51-90.51c6.23-6.24 6.23-16.37-0.02-22.62z m-286.72-15.2c-3.7-3.7-6.84-7.79-9.85-11.95L19.64 404.96c-25.57 23.88-26.26 64.19-1.53 88.93s65.05 24.05 88.93-1.53l238.13-255.07c-3.96-2.91-7.9-5.87-11.44-9.41l-49.14-49.14z"/>
+        android:pathData="M413.5 237.5c-28.2 4.8-58.2-3.6-80-25.4L295.4 174c-15-15-23.4-35.2-23.4-56.4v-12.1L192.3 62c-5.3-2.9-8.6-8.6-8.3-14.7s3.9-11.5 9.5-14l47.2-21C259.1 4.2 279 0 299.2 0h18.1c36.7 0 72 14 98.7 39.1l44.6 42c24.2 22.8 33.2 55.7 26.6 86L503 183l8-8c9.4-9.4 24.6-9.4 33.9 0l24 24c9.4 9.4 9.4 24.6 0 33.9l-88 88c-9.4 9.4-24.6 9.4-33.9 0l-24-24c-9.4-9.4-9.4-24.6 0-33.9l8-8-17.5-17.5zM27.4 377.1l233.5-194.5c3.5 4.9 7.5 9.6 11.8 14l38.1 38.1c6 6 12.4 11.2 19.2 15.7L134.9 484.6C120.4 502 98.9 512 76.3 512 34.1 512 0 477.8 0 435.7c0-22.6 10.1-44.1 27.4-58.6z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_hand.xml b/app/src/main/res/drawable/fa_hand.xml
index df2d00345..fc4d7deca 100644
--- a/app/src/main/res/drawable/fa_hand.xml
+++ b/app/src/main/res/drawable/fa_hand.xml
@@ -3,7 +3,7 @@
     android:height="512dp"
     android:viewportWidth="512"
     android:viewportHeight="512">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M288,32c0,-17.7 -14.3,-32 -32,-32s-32,14.3 -32,32V240c0,8.8 -7.2,16 -16,16s-16,-7.2 -16,-16V64c0,-17.7 -14.3,-32 -32,-32s-32,14.3 -32,32V336c0,1.5 0,3.1 0.1,4.6L67.6,283c-16,-15.2 -41.3,-14.6 -56.6,1.4s-14.6,41.3 1.4,56.6L124.8,448c43.1,41.1 100.4,64 160,64H304c97.2,0 176,-78.8 176,-176V128c0,-17.7 -14.3,-32 -32,-32s-32,14.3 -32,32V240c0,8.8 -7.2,16 -16,16s-16,-7.2 -16,-16V64c0,-17.7 -14.3,-32 -32,-32s-32,14.3 -32,32V240c0,8.8 -7.2,16 -16,16s-16,-7.2 -16,-16V32z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M288 32c0-17.7-14.3-32-32-32s-32 14.3-32 32v208c0 8.8-7.2 16-16 16s-16-7.2-16-16V64c0-17.7-14.3-32-32-32s-32 14.3-32 32v272c0 1.5 0 3.1 0.1 4.6L67.6 283c-16-15.2-41.3-14.6-56.6 1.4s-14.6 41.3 1.4 56.6l112.4 107c43.1 41.1 100.4 64 160 64H304c97.2 0 176-78.8 176-176V128c0-17.7-14.3-32-32-32s-32 14.3-32 32v112c0 8.8-7.2 16-16 16s-16-7.2-16-16V64c0-17.7-14.3-32-32-32s-32 14.3-32 32v176c0 8.8-7.2 16-16 16s-16-7.2-16-16V32z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_handshake.xml b/app/src/main/res/drawable/fa_handshake.xml
index fc7c60c98..986643d2f 100644
--- a/app/src/main/res/drawable/fa_handshake.xml
+++ b/app/src/main/res/drawable/fa_handshake.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="512">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M434.7 64h-85.9c-8 0-15.7 3-21.6 8.4l-98.3 90c-0.1 0.1-0.2 0.3-0.3 0.4-16.6 15.6-16.3 40.5-2.1 56 12.7 13.9 39.4 17.6 56.1 2.7 0.1-0.1 0.3-0.1 0.4-0.2l79.9-73.2c6.5-5.9 16.7-5.5 22.6 1 6 6.5 5.5 16.6-1 22.6l-26.1 23.9L504 313.8c2.9 2.4 5.5 5 7.9 7.7V128l-54.6-54.6c-5.9-6-14.1-9.4-22.6-9.4zM544 128.2v223.9c0 17.7 14.3 32 32 32h64V128.2h-96z m48 223.9c-8.8 0-16-7.2-16-16s7.2-16 16-16 16 7.2 16 16-7.2 16-16 16zM0 384h64c17.7 0 32-14.3 32-32V128.2H0V384z m48-63.9c8.8 0 16 7.2 16 16s-7.2 16-16 16-16-7.2-16-16c0-8.9 7.2-16 16-16z m435.9 18.6L334.6 217.5l-30 27.5c-29.7 27.1-75.2 24.5-101.7-4.4-26.9-29.4-24.8-74.9 4.4-101.7L289.1 64h-83.8c-8.5 0-16.6 3.4-22.6 9.4L128 128v223.9h18.3l90.5 81.9c27.4 22.3 67.7 18.1 90-9.3l0.2-0.2 17.9 15.5c15.9 13 39.4 10.5 52.3-5.4l31.4-38.6 5.4 4.4c13.7 11.1 33.9 9.1 45-4.7l9.5-11.7c11.2-13.8 9.1-33.9-4.6-45.1z"/>
+        android:pathData="M323.4 85.2l-96.8 78.4c-16.1 13-19.2 36.4-7 53.1 12.9 17.8 38 21.3 55.3 7.8l99.3-77.2c7-5.4 17-4.2 22.5 2.8s4.2 17-2.8 22.5L373 188.8l139 128V128h-0.7l-3.9-2.5L434.8 79c-15.3-9.8-33.2-15-51.4-15-21.8 0-43 7.5-60 21.2z m22.8 124.4l-51.7 40.2c-31.5 24.6-77.2 18.2-100.8-14.2-22.2-30.5-16.6-73.1 12.7-96.8l83.2-67.3c-11.6-4.9-24.1-7.4-36.8-7.4C234 64 215.7 69.6 200 80l-72 48v224h28.2l91.4 83.4c19.6 17.9 49.9 16.5 67.8-3.1 5.5-6.1 9.2-13.2 11.1-20.6l17 15.6c19.5 17.9 49.9 16.6 67.8-2.9 4.5-4.9 7.8-10.6 9.9-16.5 19.4 13 45.8 10.3 62.1-7.5 17.9-19.5 16.6-49.9-2.9-67.8l-134.2-123zM16 128c-8.8 0-16 7.2-16 16v208c0 17.7 14.3 32 32 32h32c17.7 0 32-14.3 32-32V128H16z m32 192a16 16 0 1 1 0 32 16 16 0 1 1 0-32z m496-192v224c0 17.7 14.3 32 32 32h32c17.7 0 32-14.3 32-32V144c0-8.8-7.2-16-16-16h-80z m32 208a16 16 0 1 1 32 0 16 16 0 1 1-32 0z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_heart.xml b/app/src/main/res/drawable/fa_heart.xml
new file mode 100644
index 000000000..a4ba077b2
--- /dev/null
+++ b/app/src/main/res/drawable/fa_heart.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="512dp"
+    android:height="512dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M47.6 300.4l180.7 168.7c7.5 7 17.4 10.9 27.7 10.9s20.2-3.9 27.7-10.9l180.7-168.7c30.4-28.3 47.6-68 47.6-109.5v-5.8c0-69.9-50.5-129.5-119.4-141-45.6-7.6-92 7.3-124.6 39.9l-12 12-12-12c-32.6-32.6-79-47.5-124.6-39.9C50.5 55.6 0 115.2 0 185.1v5.8c0 41.5 17.2 81.2 47.6 109.5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/fa_hippo.xml b/app/src/main/res/drawable/fa_hippo.xml
deleted file mode 100644
index fa35d6ffe..000000000
--- a/app/src/main/res/drawable/fa_hippo.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="640dp"
-    android:height="512dp"
-    android:viewportWidth="640"
-    android:viewportHeight="512">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M581.12 96.2c-27.67-0.15-52.5 17.58-76.6 26.62C489.98 88.27 455.83 64 416 64c-11.28 0-21.95 2.3-32 5.88V56c0-13.26-10.75-24-24-24h-16c-13.25 0-24 10.74-24 24v48.98C286.01 79.58 241.24 64 192 64 85.96 64 0 135.64 0 224v240c0 8.84 7.16 16 16 16h64c8.84 0 16-7.16 16-16v-70.79C128.35 407.57 166.72 416 208 416s79.65-8.43 112-22.79V464c0 8.84 7.16 16 16 16h64c8.84 0 16-7.16 16-16V288h128v32c0 8.84 7.16 16 16 16h32c8.84 0 16-7.16 16-16v-32c17.67 0 32-14.33 32-32v-92.02c0-34.09-24.79-67.59-58.88-67.78zM448 176c-8.84 0-16-7.16-16-16s7.16-16 16-16 16 7.16 16 16-7.16 16-16 16z"/>
-</vector>
diff --git a/app/src/main/res/drawable/fa_ice_cream.xml b/app/src/main/res/drawable/fa_ice_cream.xml
index d50d59cc6..5563adc8e 100644
--- a/app/src/main/res/drawable/fa_ice_cream.xml
+++ b/app/src/main/res/drawable/fa_ice_cream.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="512">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M368 160h-0.94a144 144 0 1 0-286.12 0H80a48 48 0 0 0 0 96h288a48 48 0 0 0 0-96zM195.38 493.69a31.52 31.52 0 0 0 57.24 0L352 288H96z"/>
+        android:pathData="M367.1 160c0.6-5.3 0.9-10.6 0.9-16C368 64.5 303.5 0 224 0S80 64.5 80 144c0 5.4 0.3 10.7 0.9 16H80c-26.5 0-48 21.5-48 48s21.5 48 48 48h53.5 181H368c26.5 0 48-21.5 48-48s-21.5-48-48-48h-0.9zM96 288l104.8 209.7c4.4 8.8 13.3 14.3 23.2 14.3s18.8-5.5 23.2-14.3L352 288H96z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_industry.xml b/app/src/main/res/drawable/fa_industry.xml
index 9b57b66f9..1425144eb 100644
--- a/app/src/main/res/drawable/fa_industry.xml
+++ b/app/src/main/res/drawable/fa_industry.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="512dp"
+    android:width="576dp"
     android:height="512dp"
-    android:viewportWidth="512"
+    android:viewportWidth="576"
     android:viewportHeight="512">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M475.12 163.78L336 252.31v-68.28c0-18.92-20.93-30.4-36.88-20.25L160 252.31V56c0-13.26-10.74-24-24-24H24C10.74 32 0 42.74 0 56v400c0 13.26 10.74 24 24 24h464c13.26 0 24-10.74 24-24V184.03c0-18.92-20.93-30.4-36.88-20.25z"/>
+        android:pathData="M64 32c-17.7 0-32 14.3-32 32v240 48 80c0 26.5 21.5 48 48 48h416c26.5 0 48-21.5 48-48V304 152.2c0-18.2-19.4-29.7-35.4-21.1L352 215.4v-63.2c0-18.2-19.4-29.7-35.4-21.1L160 215.4V64c0-17.7-14.3-32-32-32H64z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_kiwi_bird.xml b/app/src/main/res/drawable/fa_kiwi_bird.xml
deleted file mode 100644
index 025b1d1da..000000000
--- a/app/src/main/res/drawable/fa_kiwi_bird.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="576dp"
-    android:height="512dp"
-    android:viewportWidth="576"
-    android:viewportHeight="512">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M575.81 217.98C572.64 157.41 518.28 112 457.63 112h-9.37c-52.82 0-104.25-16.25-147.74-46.24-41.99-28.96-96.04-41.62-153.21-28.7C129.3 41.12-0.08 78.24 0 224c0.04 70.95 38.68 132.8 95.99 166.01V464c0 8.84 7.16 16 16 16h16c8.84 0 16-7.16 16-16v-54.26c15.36 3.96 31.4 6.26 48 6.26 5.44 0 10.68-0.73 16-1.18V464c0 8.84 7.16 16 16 16h16c8.84 0 16-7.16 16-16v-59.43c14.24-5.06 27.88-11.39 40.34-19.51C342.07 355.25 393.86 336 448.46 336c25.48 0 16.01-0.31 23.05-0.78l74.41 136.44c2.86 5.23 8.3 8.34 14.05 8.34 1.31 0 2.64-0.16 3.95-0.5 7.09-1.8 12.05-8.19 12.05-15.5 0 0 0.14-240.24-0.16-246.02zM463.97 248c-13.25 0-24-10.75-24-24 0-13.26 10.75-24 24-24s24 10.74 24 24c0 13.25-10.75 24-24 24z m80 153.25l-39.86-73.08c15.12-5.83 28.73-14.6 39.86-25.98v99.06z"/>
-</vector>
diff --git a/app/src/main/res/drawable/fa_magnet.xml b/app/src/main/res/drawable/fa_magnet.xml
index 9a3a6bd91..6aba34692 100644
--- a/app/src/main/res/drawable/fa_magnet.xml
+++ b/app/src/main/res/drawable/fa_magnet.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="512dp"
+    android:width="448dp"
     android:height="512dp"
-    android:viewportWidth="512"
+    android:viewportWidth="448"
     android:viewportHeight="512">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M164.07 148.1H12a12 12 0 0 1-12-12v-80a36 36 0 0 1 36-36h104a36 36 0 0 1 36 36v80a11.89 11.89 0 0 1-11.93 12z m347.93-12V56a36 36 0 0 0-36-36H372a36 36 0 0 0-36 36v80a12 12 0 0 0 12 12h152a11.89 11.89 0 0 0 12-11.9z m-164 44a12 12 0 0 0-12 12v52c0 128.1-160 127.9-160 0v-52a12 12 0 0 0-12-12H12.1a12 12 0 0 0-12 12.1c0.1 21.4 0.6 40.3 0 53.3 0 150.6 136.17 246.6 256.75 246.6s255-96 255-246.7c-0.6-12.8-0.2-33 0-53.2a12 12 0 0 0-12-12.1z"/>
+        android:pathData="M0 160v96c0 123.7 100.3 224 224 224s224-100.3 224-224v-96H320v96c0 53-43 96-96 96s-96-43-96-96v-96H0z m0-32h128V64c0-17.7-14.3-32-32-32H32C14.3 32 0 46.3 0 64v64z m320 0h128V64c0-17.7-14.3-32-32-32h-64c-17.7 0-32 14.3-32 32v64z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_map.xml b/app/src/main/res/drawable/fa_map.xml
index f40243a69..4da86d2b4 100644
--- a/app/src/main/res/drawable/fa_map.xml
+++ b/app/src/main/res/drawable/fa_map.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="512">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M0 117.66v346.32c0 11.32 11.43 19.06 21.94 14.86L160 416V32L20.12 87.95A32 32 0 0 0 0 117.66zM192 416l192 64V96L192 32v384zM554.06 33.16L416 96v384l139.88-55.95A32 32 0 0 0 576 394.34V48.02c0-11.32-11.43-19.06-21.94-14.86z"/>
+        android:pathData="M384 476.1l-192-54.9V35.9l192 54.9v385.3z m32-1.2V88.4l127.1-50.9c15.8-6.3 32.9 5.3 32.9 22.3v334.8c0 9.8-6 18.6-15.1 22.3L416 474.8zM15.1 95.1L160 37.2v386.4L32.9 474.5C17.1 480.8 0 469.2 0 452.2V117.4c0-9.8 6-18.6 15.1-22.3z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_map_signs.xml b/app/src/main/res/drawable/fa_map_signs.xml
deleted file mode 100644
index 9dca18713..000000000
--- a/app/src/main/res/drawable/fa_map_signs.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="512dp"
-    android:height="512dp"
-    android:viewportWidth="512"
-    android:viewportHeight="512">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M507.31 84.69L464 41.37c-6-6-14.14-9.37-22.63-9.37H288V16c0-8.84-7.16-16-16-16h-32c-8.84 0-16 7.16-16 16v16H56c-13.25 0-24 10.75-24 24v80c0 13.25 10.75 24 24 24h385.37c8.49 0 16.62-3.37 22.63-9.37l43.31-43.31c6.25-6.26 6.25-16.38 0-22.63zM224 496c0 8.84 7.16 16 16 16h32c8.84 0 16-7.16 16-16V384h-64v112z m232-272H288v-32h-64v32H70.63c-8.49 0-16.62 3.37-22.63 9.37L4.69 276.69c-6.25 6.25-6.25 16.38 0 22.63L48 342.63c6 6 14.14 9.37 22.63 9.37H456c13.25 0 24-10.75 24-24v-80c0-13.25-10.75-24-24-24z"/>
-</vector>
diff --git a/app/src/main/res/drawable/fa_meteor.xml b/app/src/main/res/drawable/fa_meteor.xml
index 0e1ea7044..502290c65 100644
--- a/app/src/main/res/drawable/fa_meteor.xml
+++ b/app/src/main/res/drawable/fa_meteor.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="512">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M511.33 20.8c-11.61 38.7-34.3 111.7-61.3 187.7 7 2.1 13.4 4 18.6 5.6a16.06 16.06 0 0 1 9.5 22.9c-22.1 42.3-82.7 152.8-142.48 214.4-1 1.1-2 2.5-3 3.5A194.83 194.83 0 1 1 57.1 179.42c1-1 2.4-2 3.5-3 61.6-59.9 171.97-120.4 214.37-142.5a16.06 16.06 0 0 1 22.9 9.5c1.6 5.1 3.5 11.6 5.6 18.6 75.89-27 148.97-49.7 187.67-61.3a16.18 16.18 0 0 1 20.2 20.1ZM319.95 320a127.98 127.98 0 1 0-127.98 128 127.98 127.98 0 0 0 127.98-128Zm-127.98-32a32 32 0 1 1-32-32 31.96 31.96 0 0 1 32 32Zm32 80a16 16 0 1 1-16-16 16.05 16.05 0 0 1 16 16Z"/>
+        android:pathData="M493.7 0.9L299.4 75.6l2.3-29.3c1-12.8-12.8-21.5-24-15.1L101.3 133.4C38.6 169.7 0 236.6 0 309c0 112.1 90.9 203 203 203 72.4 0 139.4-38.6 175.7-101.3l102.1-176.4c6.5-11.1-2.2-25-15.1-24l-29.3 2.3 74.7-194.3c0.6-1.5 0.9-3.2 0.9-4.8C512 6 506 0 498.5 0c-1.7 0-3.3 0.3-4.8 0.9zM192 192a128 128 0 1 1 0 256 128 128 0 1 1 0-256z m0 96a32 32 0 1 0-64 0 32 32 0 1 0 64 0z m16 96a16 16 0 1 0 0-32 16 16 0 1 0 0 32z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_microphone.xml b/app/src/main/res/drawable/fa_microphone.xml
new file mode 100644
index 000000000..287b64b3c
--- /dev/null
+++ b/app/src/main/res/drawable/fa_microphone.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="384dp"
+    android:height="512dp"
+    android:viewportWidth="384"
+    android:viewportHeight="512">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M192 0c-53 0-96 43-96 96v160c0 53 43 96 96 96s96-43 96-96V96c0-53-43-96-96-96zM64 216c0-13.3-10.7-24-24-24s-24 10.7-24 24v40c0 89.1 66.2 162.7 152 174.4V464h-48c-13.3 0-24 10.7-24 24s10.7 24 24 24h72 72c13.3 0 24-10.7 24-24s-10.7-24-24-24h-48v-33.6c85.8-11.7 152-85.3 152-174.4v-40c0-13.3-10.7-24-24-24s-24 10.7-24 24v40c0 70.7-57.3 128-128 128S64 326.7 64 256v-40z"/>
+</vector>
diff --git a/app/src/main/res/drawable/fa_microscope.xml b/app/src/main/res/drawable/fa_microscope.xml
index efed4ff46..5a5e7d235 100644
--- a/app/src/main/res/drawable/fa_microscope.xml
+++ b/app/src/main/res/drawable/fa_microscope.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="512">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M160 320h12v16c0 8.84 7.16 16 16 16h40c8.84 0 16-7.16 16-16v-16h12c17.67 0 32-14.33 32-32V64c0-17.67-14.33-32-32-32V16c0-8.84-7.16-16-16-16h-64c-8.84 0-16 7.16-16 16v16c-17.67 0-32 14.33-32 32v224c0 17.67 14.33 32 32 32z m304 128h-1.29C493.24 413.99 512 369.2 512 320c0-105.88-86.12-192-192-192v64c70.58 0 128 57.42 128 128s-57.42 128-128 128H48c-26.51 0-48 21.49-48 48 0 8.84 7.16 16 16 16h480c8.84 0 16-7.16 16-16 0-26.51-21.49-48-48-48z m-360-32h208c4.42 0 8-3.58 8-8v-16c0-4.42-3.58-8-8-8H104c-4.42 0-8 3.58-8 8v16c0 4.42 3.58 8 8 8z"/>
+        android:pathData="M160 32c0-17.7 14.3-32 32-32h32c17.7 0 32 14.3 32 32 17.7 0 32 14.3 32 32v224c0 17.7-14.3 32-32 32 0 17.7-14.3 32-32 32h-32c-17.7 0-32-14.3-32-32-17.7 0-32-14.3-32-32V64c0-17.7 14.3-32 32-32zM32 448h288c70.7 0 128-57.3 128-128s-57.3-128-128-128v-64c106 0 192 86 192 192 0 49.2-18.5 94-48.9 128H480c17.7 0 32 14.3 32 32s-14.3 32-32 32H320 32c-17.7 0-32-14.3-32-32s14.3-32 32-32z m80-64h192c8.8 0 16 7.2 16 16s-7.2 16-16 16H112c-8.8 0-16-7.2-16-16s7.2-16 16-16z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_money_bill.xml b/app/src/main/res/drawable/fa_money_bill.xml
new file mode 100644
index 000000000..556e1a4a5
--- /dev/null
+++ b/app/src/main/res/drawable/fa_money_bill.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="576dp"
+    android:height="512dp"
+    android:viewportWidth="576"
+    android:viewportHeight="512">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M64 64C28.7 64 0 92.7 0 128v256c0 35.3 28.7 64 64 64h448c35.3 0 64-28.7 64-64V128c0-35.3-28.7-64-64-64H64z m64 320H64v-64c35.3 0 64 28.7 64 64zM64 192v-64h64c0 35.3-28.7 64-64 64z m384 192c0-35.3 28.7-64 64-64v64h-64z m64-192c-35.3 0-64-28.7-64-64h64v64z m-224-32a96 96 0 1 1 0 192 96 96 0 1 1 0-192z"/>
+</vector>
diff --git a/app/src/main/res/drawable/fa_moon.xml b/app/src/main/res/drawable/fa_moon.xml
index 1d0cb335d..752880d93 100644
--- a/app/src/main/res/drawable/fa_moon.xml
+++ b/app/src/main/res/drawable/fa_moon.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="512dp"
+    android:width="384dp"
     android:height="512dp"
-    android:viewportWidth="512"
+    android:viewportWidth="384"
     android:viewportHeight="512">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M283.21 512c78.96 0 151.08-35.92 198.86-94.8 7.07-8.7-0.64-21.42-11.56-19.34-124.2 23.65-238.27-71.58-238.27-196.96 0-72.22 38.67-138.63 101.5-174.39C343.43 21 341 6.31 330 4.28A258.16 258.16 0 0 0 283.2 0c-141.3 0-256 114.51-256 256 0 141.3 114.51 256 256 256z"/>
+        android:pathData="M223.5 32C100 32 0 132.3 0 256s100 224 223.5 224c60.6 0 115.5-24.2 155.8-63.4 5-4.9 6.3-12.5 3.1-18.7s-10.1-9.7-17-8.5c-9.8 1.7-19.8 2.6-30.1 2.6-96.9 0-175.5-78.8-175.5-176 0-65.8 36-123.1 89.3-153.3 6.1-3.5 9.2-10.5 7.7-17.3s-7.3-11.9-14.3-12.5c-6.3-0.5-12.6-0.8-19-0.8z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_mountain_sun.xml b/app/src/main/res/drawable/fa_mountain_sun.xml
index 99caa011a..d92769c9b 100644
--- a/app/src/main/res/drawable/fa_mountain_sun.xml
+++ b/app/src/main/res/drawable/fa_mountain_sun.xml
@@ -3,7 +3,7 @@
     android:height="512dp"
     android:viewportWidth="640"
     android:viewportHeight="512">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M560,160A80,80 0,1 0,560 0a80,80 0,1 0,0 160zM55.9,512H381.1h75H578.9c33.8,0 61.1,-27.4 61.1,-61.1c0,-11.2 -3.1,-22.2 -8.9,-31.8l-132,-216.3C495,196.1 487.8,192 480,192s-15,4.1 -19.1,10.7l-48.2,79L286.8,81c-6.6,-10.6 -18.3,-17 -30.8,-17s-24.1,6.4 -30.8,17L8.6,426.4C3,435.3 0,445.6 0,456.1C0,487 25,512 55.9,512z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M560 160a80 80 0 1 0 0-160 80 80 0 1 0 0 160zM55.9 512h325.2 75 122.8c33.8 0 61.1-27.4 61.1-61.1 0-11.2-3.1-22.2-8.9-31.8l-132-216.3C495 196.1 487.8 192 480 192s-15 4.1-19.1 10.7l-48.2 79L286.8 81c-6.6-10.6-18.3-17-30.8-17s-24.1 6.4-30.8 17L8.6 426.4C3 435.3 0 445.6 0 456.1 0 487 25 512 55.9 512z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_mug_hot.xml b/app/src/main/res/drawable/fa_mug_hot.xml
index 4a3c8a442..b59605dd4 100644
--- a/app/src/main/res/drawable/fa_mug_hot.xml
+++ b/app/src/main/res/drawable/fa_mug_hot.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="512">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M127.1 146.5c1.3 7.7 8 13.5 16 13.5h16.5c9.8 0 17.6-8.5 16.3-18-3.8-28.2-16.4-54.2-36.6-74.7-14.4-14.7-23.6-33.3-26.4-53.5C111.8 5.9 105 0 96.8 0H80.4C70.6 0 63 8.5 64.1 18c3.9 31.9 18 61.3 40.6 84.4 12 12.2 19.7 27.5 22.4 44.1z m112 0c1.3 7.7 8 13.5 16 13.5h16.5c9.8 0 17.6-8.5 16.3-18-3.8-28.2-16.4-54.2-36.6-74.7-14.4-14.7-23.6-33.3-26.4-53.5C223.8 5.9 217 0 208.8 0h-16.4c-9.8 0-17.5 8.5-16.3 18 3.9 31.9 18 61.3 40.6 84.4 12 12.2 19.7 27.5 22.4 44.1zM400 192H32c-17.7 0-32 14.3-32 32v192c0 53 43 96 96 96h192c53 0 96-43 96-96h16c61.8 0 112-50.2 112-112s-50.2-112-112-112z m0 160h-16v-96h16c26.5 0 48 21.5 48 48s-21.5 48-48 48z"/>
+        android:pathData="M88 0C74.7 0 64 10.7 64 24c0 38.9 23.4 59.4 39.1 73.1l1.1 1c16.3 14.2 23.8 21.8 23.8 37.9 0 13.3 10.7 24 24 24s24-10.7 24-24c0-38.9-23.4-59.4-39.1-73.1l-1.1-1C119.5 47.7 112 40.1 112 24c0-13.3-10.7-24-24-24zM32 192c-17.7 0-32 14.3-32 32v192c0 53 43 96 96 96h192c53 0 96-43 96-96h16c61.9 0 112-50.1 112-112s-50.1-112-112-112h-48H32z m352 64h16c26.5 0 48 21.5 48 48s-21.5 48-48 48h-16v-96zM224 24c0-13.3-10.7-24-24-24s-24 10.7-24 24c0 38.9 23.4 59.4 39.1 73.1l1.1 1c16.3 14.2 23.8 21.8 23.8 37.9 0 13.3 10.7 24 24 24s24-10.7 24-24c0-38.9-23.4-59.4-39.1-73.1l-1.1-1C231.5 47.7 224 40.1 224 24z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_music.xml b/app/src/main/res/drawable/fa_music.xml
index 41e0a80e2..1cc672f90 100644
--- a/app/src/main/res/drawable/fa_music.xml
+++ b/app/src/main/res/drawable/fa_music.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="512">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M470.38 1.51L150.41 96A32 32 0 0 0 128 126.51v261.41A139 139 0 0 0 96 384c-53 0-96 28.66-96 64s43 64 96 64 96-28.66 96-64V214.32l256-75v184.61a138.4 138.4 0 0 0-32-3.93c-53 0-96 28.66-96 64s43 64 96 64 96-28.65 96-64V32a32 32 0 0 0-41.62-30.49z"/>
+        android:pathData="M499.1 6.3c8.1 6 12.9 15.6 12.9 25.7v72 264c0 44.2-43 80-96 80s-96-35.8-96-80 43-80 96-80c11.2 0 22 1.6 32 4.6V147l-256 76.8V432c0 44.2-43 80-96 80S0 476.2 0 432s43-80 96-80c11.2 0 22 1.6 32 4.6V200v-72c0-14.1 9.3-26.6 22.8-30.7l320-96c9.7-2.9 20.2-1.1 28.3 5z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_paw.xml b/app/src/main/res/drawable/fa_paw.xml
index dad4cbb75..7323f23db 100644
--- a/app/src/main/res/drawable/fa_paw.xml
+++ b/app/src/main/res/drawable/fa_paw.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="512">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M256 224c-79.41 0-192 122.76-192 200.25 0 34.9 26.81 55.75 71.74 55.75 48.84 0 81.09-25.08 120.26-25.08 39.51 0 71.85 25.08 120.26 25.08 44.93 0 71.74-20.85 71.74-55.75C448 346.76 335.41 224 256 224z m-147.28-12.61c-10.4-34.65-42.44-57.09-71.56-50.13-29.12 6.96-44.29 40.69-33.89 75.34 10.4 34.65 42.44 57.09 71.56 50.13 29.12-6.96 44.29-40.69 33.89-75.34z m84.72-20.78c30.94-8.14 46.42-49.94 34.58-93.36s-46.52-72.01-77.46-63.87-46.42 49.94-34.58 93.36c11.84 43.42 46.53 72.02 77.46 63.87z m281.39-29.34c-29.12-6.96-61.15 15.48-71.56 50.13-10.4 34.65 4.77 68.38 33.89 75.34 29.12 6.96 61.15-15.48 71.56-50.13 10.4-34.65-4.77-68.38-33.89-75.34z m-156.27 29.34c30.94 8.14 65.62-20.45 77.46-63.87 11.84-43.42-3.64-85.21-34.58-93.36s-65.62 20.45-77.46 63.87c-11.84 43.42 3.64 85.22 34.58 93.36z"/>
+        android:pathData="M226.5 92.9c14.3 42.9-0.3 86.2-32.6 96.8s-70.1-15.6-84.4-58.5 0.3-86.2 32.6-96.8 70.1 15.6 84.4 58.5zM100.4 198.6c18.9 32.4 14.3 70.1-10.2 84.1s-59.7-0.9-78.5-33.3-14.4-70.1 10.1-84.1 59.7 0.9 78.5 33.3zM69.2 401.2C121.6 259.9 214.7 224 256 224s134.4 35.9 186.8 177.2c3.6 9.7 5.2 20.1 5.2 30.5v1.6c0 25.8-20.9 46.7-46.7 46.7-11.5 0-22.9-1.4-34-4.2l-88-22c-15.3-3.8-31.3-3.8-46.6 0l-88 22c-11.1 2.8-22.5 4.2-34 4.2-25.8 0-46.7-20.9-46.7-46.7v-1.6c0-10.4 1.6-20.8 5.2-30.5z m352.6-118.5c-24.5-14-29.1-51.7-10.2-84.1s54-47.3 78.5-33.3 29.1 51.7 10.2 84.1-54 47.3-78.5 33.3z m-111.7-93c-32.3-10.6-46.9-53.9-32.6-96.8s52.1-69.1 84.4-58.5 46.9 53.9 32.6 96.8-52.1 69.1-84.4 58.5z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_pen_nib.xml b/app/src/main/res/drawable/fa_pen_nib.xml
index 0927a15ce..e279b573a 100644
--- a/app/src/main/res/drawable/fa_pen_nib.xml
+++ b/app/src/main/res/drawable/fa_pen_nib.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="512">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M136.6 138.79a64 64 0 0 0-43.31 41.35L0 460l14.69 14.69L164.8 324.58c-2.99-6.26-4.8-13.18-4.8-20.58 0-26.51 21.49-48 48-48s48 21.49 48 48-21.49 48-48 48c-7.4 0-14.32-1.81-20.58-4.8L37.31 497.31 52 512l279.86-93.29a64 64 0 0 0 41.35-43.31L416 224 288 96l-151.4 42.79z m361.34-64.62l-60.11-60.11c-18.75-18.75-49.16-18.75-67.91 0l-56.55 56.55 128.02 128.02 56.55-56.55c18.75-18.75 18.75-49.15 0-67.91z"/>
+        android:pathData="M368.4 18.3l-55.7 55.8 125.2 125.2 55.7-55.7c21.9-21.9 21.9-57.3 0-79.2l-46-46.1c-21.9-21.9-57.3-21.9-79.2 0zM288 94.6l-9.2 2.8-144.1 43.2c-19.9 6-35.7 21.2-42.3 41L3.8 445.8c-3.8 11.3-1 23.9 7.3 32.4l153.6-153.5c-3-6.3-4.7-13.3-4.7-20.7 0-26.5 21.5-48 48-48s48 21.5 48 48-21.5 48-48 48c-7.4 0-14.4-1.7-20.7-4.7L33.7 500.9c8.6 8.3 21.1 11.2 32.4 7.3l264.3-88.6c19.7-6.6 35-22.4 41-42.3l43.2-144.1 2.8-9.2L288 94.6z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_pepper_hot.xml b/app/src/main/res/drawable/fa_pepper_hot.xml
index 7890e7f97..c1b477d91 100644
--- a/app/src/main/res/drawable/fa_pepper_hot.xml
+++ b/app/src/main/res/drawable/fa_pepper_hot.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="512">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M330.67 263.12V173.4l-52.75-24.22C219.44 218.76 197.58 400 56 400a56 56 0 0 0 0 112c212.64 0 370.65-122.87 419.18-210.34l-37.05-38.54z m131.09-128.37C493.92 74.91 477.18 26.48 458.62 3a8 8 0 0 0-11.93-0.59l-22.9 23a8.06 8.06 0 0 0-0.89 10.23c6.86 10.36 17.05 35.1-1.4 72.32A142.85 142.85 0 0 0 364.34 96c-28 0-54 8.54-76.34 22.59l74.67 34.29v78.24h89.09L506.44 288c3.26-12.62 5.56-25.63 5.56-39.31a154 154 0 0 0-50.24-113.94z"/>
+        android:pathData="M428.3 3c11.6-6.4 26.2-2.3 32.6 9.3l4.8 8.7c19.3 34.7 19.8 75.7 3.4 110 26.7 28.6 42.9 66.9 42.9 109 0 18.5-3.1 36.3-8.9 52.8-6.1 17.3-28.5 16.3-36.8-0.1l-11.7-23.4c-4.1-8.1-12.4-13.3-21.5-13.3H360c-13.3 0-24-10.7-24-24v-80c0-13.3-10.7-24-24-24h-17.1c-21.3 0-30-23.9-10.8-32.9C304.7 85.4 327.7 80 352 80c28.3 0 54.8 7.3 77.8 20.2 5.5-18.2 3.7-38.4-6-55.8l-4.8-8.7c-6.4-11.6-2.3-26.2 9.3-32.6zM171.2 345.5L264 160h40v80c0 26.5 21.5 48 48 48h76.2l23.9 47.8C372.3 443.9 244.3 512 103.2 512H44.4C19.9 512 0 492.1 0 467.6c0-20.8 14.5-38.8 34.8-43.3l49.8-11.1c37.6-8.4 69.5-33.2 86.7-67.7z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_person_biking.xml b/app/src/main/res/drawable/fa_person_biking.xml
index d971ab9e1..53cb10baa 100644
--- a/app/src/main/res/drawable/fa_person_biking.xml
+++ b/app/src/main/res/drawable/fa_person_biking.xml
@@ -3,7 +3,7 @@
     android:height="512dp"
     android:viewportWidth="640"
     android:viewportHeight="512">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M400,96a48,48 0,1 0,0 -96,48 48,0 1,0 0,96zM427.2,160l-61.8,-48.8c-17.3,-13.6 -41.7,-13.8 -59.1,-0.3l-83.1,64.2c-30.7,23.8 -28.5,70.8 4.3,91.6L288,305.1L288,416c0,17.7 14.3,32 32,32s32,-14.3 32,-32L352,288c0,-10.7 -5.3,-20.7 -14.2,-26.6L295,232.9l60.3,-48.5L396,217c5.7,4.5 12.7,7 20,7h64c17.7,0 32,-14.3 32,-32s-14.3,-32 -32,-32L427.2,160zM56,384a72,72 0,1 1,144 0A72,72 0,1 1,56 384zM256,384A128,128 0,1 0,0 384a128,128 0,1 0,256 0zM440,384a72,72 0,1 1,144 0,72 72,0 1,1 -144,0zM640,384a128,128 0,1 0,-256 0,128 128,0 1,0 256,0z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M400 96a48 48 0 1 0 0-96 48 48 0 1 0 0 96z m27.2 64l-61.8-48.8c-17.3-13.6-41.7-13.8-59.1-0.3l-83.1 64.2c-30.7 23.8-28.5 70.8 4.3 91.6l60.5 38.4V416c0 17.7 14.3 32 32 32s32-14.3 32-32V288c0-10.7-5.3-20.7-14.2-26.6L295 232.9l60.3-48.5L396 217c5.7 4.5 12.7 7 20 7h64c17.7 0 32-14.3 32-32s-14.3-32-32-32h-52.8zM56 384a72 72 0 1 1 144 0 72 72 0 1 1-144 0z m200 0a128 128 0 1 0-256 0 128 128 0 1 0 256 0z m184 0a72 72 0 1 1 144 0 72 72 0 1 1-144 0z m200 0a128 128 0 1 0-256 0 128 128 0 1 0 256 0z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_pills.xml b/app/src/main/res/drawable/fa_pills.xml
index 81a8a3278..e2541740b 100644
--- a/app/src/main/res/drawable/fa_pills.xml
+++ b/app/src/main/res/drawable/fa_pills.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="512">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M112 32C50.1 32 0 82.1 0 144v224c0 61.9 50.1 112 112 112s112-50.1 112-112V144c0-61.9-50.1-112-112-112z m48 224H64V144c0-26.5 21.5-48 48-48s48 21.5 48 48v112z m139.7-29.7c-3.5-3.5-9.4-3.1-12.3 0.8-45.3 62.5-40.4 150.1 15.9 206.4 56.3 56.3 143.9 61.2 206.4 15.9 4-2.9 4.3-8.8 0.8-12.3L299.7 226.3z m229.8-19c-56.3-56.3-143.9-61.2-206.4-15.9-4 2.9-4.3 8.8-0.8 12.3l210.8 210.8c3.5 3.5 9.4 3.1 12.3-0.8 45.3-62.6 40.5-150.1-15.9-206.4z"/>
+        android:pathData="M112 96c-26.5 0-48 21.5-48 48v112h96V144c0-26.5-21.5-48-48-48zM0 144C0 82.1 50.1 32 112 32s112 50.1 112 112v224c0 61.9-50.1 112-112 112S0 429.9 0 368V144z m554.9 255.4c-7.1 12.3-23.7 13.1-33.8 3.1L333.5 214.9c-10-10-9.3-26.7 3.1-33.8C360 167.7 387.1 160 416 160c88.4 0 160 71.6 160 160 0 28.9-7.7 56-21.1 79.4z m-59.5 59.5C472 472.3 444.9 480 416 480c-88.4 0-160-71.6-160-160 0-28.9 7.7-56 21.1-79.4 7.1-12.3 23.7-13.1 33.8-3.1l187.6 187.6c10 10 9.3 26.7-3.1 33.8z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_plane.xml b/app/src/main/res/drawable/fa_plane.xml
index fc5a16a07..99406ded1 100644
--- a/app/src/main/res/drawable/fa_plane.xml
+++ b/app/src/main/res/drawable/fa_plane.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="512">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M480 192H365.71L260.61 8.06A16.01 16.01 0 0 0 246.71 0h-65.5c-10.63 0-18.3 10.17-15.38 20.39L214.86 192H112l-43.2-57.6c-3.02-4.03-7.77-6.4-12.8-6.4H16.01c-10.41 0-18.05 9.78-15.52 19.88L32 256 0.49 364.12C-2.04 374.22 5.6 384 16.01 384H56c5.04 0 9.78-2.37 12.8-6.4L112 320h102.86l-49.03 171.6c-2.92 10.22 4.75 20.4 15.38 20.4h65.5c5.74 0 11.04-3.08 13.89-8.06L365.71 320H480c35.35 0 96-28.65 96-64s-60.65-64-96-64z"/>
+        android:pathData="M482.3 192c34.2 0 93.7 29 93.7 64 0 36-59.5 64-93.7 64H365.7L265.2 495.9c-5.7 10-16.3 16.1-27.8 16.1h-56.2c-10.6 0-18.3-10.2-15.4-20.4l49-171.6H112l-43.2 57.6c-3 4-7.8 6.4-12.8 6.4H14c-7.8 0-14-6.3-14-14 0-1.3 0.2-2.6 0.5-3.9L32 256 0.5 145.9C0.1 144.6 0 143.3 0 142c0-7.8 6.3-14 14-14h42c5 0 9.8 2.4 12.8 6.4L112 192h102.9l-49-171.6c-3-10.2 4.7-20.4 15.3-20.4h56.2c11.5 0 22.1 6.2 27.8 16.1L365.7 192h116.6z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_plug.xml b/app/src/main/res/drawable/fa_plug.xml
index 115302dd1..08be91e44 100644
--- a/app/src/main/res/drawable/fa_plug.xml
+++ b/app/src/main/res/drawable/fa_plug.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="512">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M320 32a32 32 0 0 0-64 0v96h64Zm48 128H16a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h16v32a160.07 160.07 0 0 0 128 156.8V512h64v-99.2A160.07 160.07 0 0 0 352 256v-32h16a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16ZM128 32a32 32 0 0 0-64 0v96h64Z"/>
+        android:pathData="M96 0C78.3 0 64 14.3 64 32v96h64V32c0-17.7-14.3-32-32-32z m192 0c-17.7 0-32 14.3-32 32v96h64V32c0-17.7-14.3-32-32-32zM32 160c-17.7 0-32 14.3-32 32s14.3 32 32 32v32c0 77.4 55 142 128 156.8V480c0 17.7 14.3 32 32 32s32-14.3 32-32v-67.2C297 398 352 333.4 352 256v-32c17.7 0 32-14.3 32-32s-14.3-32-32-32H32z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_poo.xml b/app/src/main/res/drawable/fa_poo.xml
new file mode 100644
index 000000000..320d38862
--- /dev/null
+++ b/app/src/main/res/drawable/fa_poo.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="512dp"
+    android:height="512dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M268.9 0.9c-5.5-0.7-11 1.4-14.5 5.7s-4.6 10.1-2.8 15.4c2.8 8.2 4.3 16.9 4.3 26.1 0 44.1-35.7 79.9-79.8 80H160c-35.3 0-64 28.7-64 64 0 19.1 8.4 36.3 21.7 48H104c-39.8 0-72 32.2-72 72 0 23.2 11 43.8 28 57-34.1 5.7-60 35.3-60 71 0 39.8 32.2 72 72 72h368c39.8 0 72-32.2 72-72 0-35.7-25.9-65.3-60-71 17-13.2 28-33.8 28-57 0-39.8-32.2-72-72-72h-13.7c13.3-11.7 21.7-28.9 21.7-48 0-35.3-28.7-64-64-64h-5.5c3.5-10 5.5-20.8 5.5-32 0-48.6-36.2-88.8-83.1-95.1zM192 256a32 32 0 1 1 0 64 32 32 0 1 1 0-64z m96 32a32 32 0 1 1 64 0 32 32 0 1 1-64 0z m64 108.3c0 2.4-0.7 4.8-2.2 6.7-8.2 10.5-39.5 45-93.8 45s-85.6-34.6-93.8-45c-1.5-1.9-2.2-4.3-2.2-6.7 0-6.8 5.5-12.3 12.3-12.3h167.4c6.8 0 12.3 5.5 12.3 12.3z"/>
+</vector>
diff --git a/app/src/main/res/drawable/fa_radiation.xml b/app/src/main/res/drawable/fa_radiation.xml
new file mode 100644
index 000000000..d27be232e
--- /dev/null
+++ b/app/src/main/res/drawable/fa_radiation.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="512dp"
+    android:height="512dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M216 186.7c-23.9 13.8-40 39.7-40 69.3H32c-17.7 0-32.2-14.4-30-31.9C10.7 154 47.8 92.7 101.3 52c14.1-10.7 33.8-5.3 42.7 10l72 124.7zM256 336c14.6 0 28.2-3.9 40-10.7l72 124.8c8.8 15.3 3.7 35.1-12.6 41.9-30.6 12.9-64.2 20-99.4 20s-68.9-7.1-99.4-20c-16.3-6.9-21.4-26.6-12.6-41.9l72-124.8c11.8 6.8 25.4 10.7 40 10.7z m224-80H336c0-29.6-16.1-55.5-40-69.3L368 62c8.8-15.3 28.6-20.7 42.7-10 53.6 40.7 90.6 102 99.4 172.1 2.2 17.5-12.4 31.9-30 31.9z m-224-48a48 48 0 1 1 0 96 48 48 0 1 1 0-96z"/>
+</vector>
diff --git a/app/src/main/res/drawable/fa_radio.xml b/app/src/main/res/drawable/fa_radio.xml
index e3508650b..0aa460ead 100644
--- a/app/src/main/res/drawable/fa_radio.xml
+++ b/app/src/main/res/drawable/fa_radio.xml
@@ -3,7 +3,7 @@
     android:height="512dp"
     android:viewportWidth="512"
     android:viewportHeight="512">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M494.8,47c12.7,-3.7 20,-17.1 16.3,-29.8S494,-2.8 481.2,1L51.7,126.9c-9.4,2.7 -17.9,7.3 -25.1,13.2C10.5,151.7 0,170.6 0,192v4L0,304 0,448c0,35.3 28.7,64 64,64L448,512c35.3,0 64,-28.7 64,-64L512,192c0,-35.3 -28.7,-64 -64,-64L218.5,128L494.8,47zM368,240a80,80 0,1 1,0 160,80 80,0 1,1 0,-160zM80,256c0,-8.8 7.2,-16 16,-16h96c8.8,0 16,7.2 16,16s-7.2,16 -16,16L96,272c-8.8,0 -16,-7.2 -16,-16zM64,320c0,-8.8 7.2,-16 16,-16L208,304c8.8,0 16,7.2 16,16s-7.2,16 -16,16L80,336c-8.8,0 -16,-7.2 -16,-16zM80,384c0,-8.8 7.2,-16 16,-16h96c8.8,0 16,7.2 16,16s-7.2,16 -16,16L96,400c-8.8,0 -16,-7.2 -16,-16z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M494.8 47c12.7-3.7 20-17.1 16.3-29.8S494-2.8 481.2 1L51.7 126.9c-9.4 2.7-17.9 7.3-25.1 13.2C10.5 151.7 0 170.6 0 192v4 108 144c0 35.3 28.7 64 64 64h384c35.3 0 64-28.7 64-64V192c0-35.3-28.7-64-64-64H218.5l276.3-81zM368 240a80 80 0 1 1 0 160 80 80 0 1 1 0-160zM80 256c0-8.8 7.2-16 16-16h96c8.8 0 16 7.2 16 16s-7.2 16-16 16H96c-8.8 0-16-7.2-16-16z m-16 64c0-8.8 7.2-16 16-16h128c8.8 0 16 7.2 16 16s-7.2 16-16 16H80c-8.8 0-16-7.2-16-16z m16 64c0-8.8 7.2-16 16-16h96c8.8 0 16 7.2 16 16s-7.2 16-16 16H96c-8.8 0-16-7.2-16-16z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_rainbow.xml b/app/src/main/res/drawable/fa_rainbow.xml
index 2e3bd8a31..b4ea77401 100644
--- a/app/src/main/res/drawable/fa_rainbow.xml
+++ b/app/src/main/res/drawable/fa_rainbow.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="576dp"
+    android:width="640dp"
     android:height="512dp"
-    android:viewportWidth="576"
+    android:viewportWidth="640"
     android:viewportHeight="512">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M268.3 32.7C115.4 42.9 0 176.9 0 330.2V464c0 8.8 7.2 16 16 16h32c8.8 0 16-7.2 16-16V320C64 186.8 180.9 80.3 317.5 97.9 430.4 112.4 512 214 512 327.8V464c0 8.8 7.2 16 16 16h32c8.8 0 16-7.2 16-16V320c0-165.3-140-298.6-307.7-287.3z m-5.6 96.9C166 142 96 229.1 96 326.7V464c0 8.8 7.2 16 16 16h32c8.8 0 16-7.2 16-16V320c0-74.8 64.5-134.8 140.8-127.4 66.5 6.5 115.2 66.2 115.2 133.1V464c0 8.8 7.2 16 16 16h32c8.8 0 16-7.2 16-16V320c0-114.2-100.2-205.4-217.3-190.4z m6.2 96.3c-45.6 8.9-76.9 51.5-76.9 97.9V464c0 8.8 7.2 16 16 16h32c8.8 0 16-7.2 16-16V320c0-17.6 14.3-32 32-32s32 14.4 32 32v144c0 8.8 7.2 16 16 16h32c8.8 0 16-7.2 16-16V320c0-59.2-53.8-106-115.1-94.1z"/>
+        android:pathData="M320 96C178.6 96 64 210.6 64 352v96c0 17.7-14.3 32-32 32S0 465.7 0 448v-96C0 175.3 143.3 32 320 32s320 143.3 320 320v96c0 17.7-14.3 32-32 32s-32-14.3-32-32v-96c0-141.4-114.6-256-256-256z m0 192c-35.3 0-64 28.7-64 64v96c0 17.7-14.3 32-32 32s-32-14.3-32-32v-96c0-70.7 57.3-128 128-128s128 57.3 128 128v96c0 17.7-14.3 32-32 32s-32-14.3-32-32v-96c0-35.3-28.7-64-64-64z m-160 64v96c0 17.7-14.3 32-32 32s-32-14.3-32-32v-96c0-123.7 100.3-224 224-224s224 100.3 224 224v96c0 17.7-14.3 32-32 32s-32-14.3-32-32v-96c0-88.4-71.6-160-160-160s-160 71.6-160 160z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_ribbon.xml b/app/src/main/res/drawable/fa_ribbon.xml
index efe92f454..75dd3100d 100644
--- a/app/src/main/res/drawable/fa_ribbon.xml
+++ b/app/src/main/res/drawable/fa_ribbon.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="512">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M6.1 444.3c-9.6 10.8-7.5 27.6 4.5 35.7l68.8 27.9c9.9 6.7 23.3 5 31.3-3.8l91.8-101.9-79.2-87.9-117.2 130z m435.8 0s-292-324.6-295.4-330.1c15.4-8.4 40.2-17.9 77.5-17.9s62.1 9.5 77.5 17.9c-3.3 5.6-56 64.6-56 64.6l79.1 87.7 34.2-38c28.7-31.9 33.3-78.6 11.4-115.5l-43.7-73.5c-4.3-7.2-9.9-13.3-16.8-18-40.7-27.6-127.4-29.7-171.4 0-6.9 4.7-12.5 10.8-16.8 18l-43.6 73.2c-1.5 2.5-37.1 62.2 11.5 116L337.5 504c8 8.9 21.4 10.5 31.3 3.8l68.8-27.9c11.9-8 14-24.8 4.3-35.6z"/>
+        android:pathData="M333.2 322.8l-133.9-146-53.3-58.2c7.8-5.1 37-22.6 78-22.6s70.2 17.4 78 22.6L245.7 180l85.6 93.4 27.4-29.8c16.3-17.7 25.3-40.9 25.3-65v-29.5c0-19-5.6-37.5-16.1-53.3l-40.1-60.2C312.9 13.4 287.9 0 261.2 0h-76c-25.8 0-50.1 12.5-65.1 33.5L81.9 87C70.3 103.2 64 122.8 64 142.8V164c0 23.2 8.4 45.6 23.6 63.1l56 64.2 83.3 95.6 91.8 105.3c10 11.5 26.8 14.3 40 6.8l54.5-31.1c17.8-10.2 21.6-34.3 7.7-49.4l-87.7-95.7z m-128 87.8L121.9 315 27.1 418.5c-13.9 15.1-10.1 39.2 7.7 49.4l55.1 31.5c13 7.4 29.3 4.9 39.4-6.1l75.9-82.6z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_road.xml b/app/src/main/res/drawable/fa_road.xml
index 60f571f83..13559bf43 100644
--- a/app/src/main/res/drawable/fa_road.xml
+++ b/app/src/main/res/drawable/fa_road.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="512">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M573.19 402.67l-139.79-320C428.43 71.29 417.6 64 405.68 64h-97.59l2.45 23.16c0.5 4.72-3.21 8.84-7.96 8.84h-29.16c-4.75 0-8.46-4.12-7.96-8.84L267.91 64h-97.59c-11.93 0-22.76 7.29-27.73 18.67L2.8 402.67C-6.45 423.86 8.31 448 30.54 448h196.84l10.31-97.68c0.86-8.14 7.72-14.32 15.91-14.32h68.8c8.19 0 15.05 6.18 15.91 14.32L348.62 448h196.84c22.23 0 36.99-24.14 27.73-45.33zM260.4 135.16a8 8 0 0 1 7.96-7.16h39.29c4.09 0 7.53 3.09 7.96 7.16l4.6 43.58c0.75 7.09-4.81 13.26-11.93 13.26h-40.54c-7.13 0-12.68-6.17-11.93-13.26l4.59-43.58zM315.64 304h-55.29c-9.5 0-16.91-8.23-15.91-17.68l5.07-48c0.86-8.14 7.72-14.32 15.91-14.32h45.15c8.19 0 15.05 6.18 15.91 14.32l5.07 48c1 9.45-6.41 17.68-15.91 17.68z"/>
+        android:pathData="M256 32h-74.8c-27.1 0-51.3 17.1-60.3 42.6L3.1 407.2c-2 5.8-3.1 12-3.1 18.2C0 455.5 24.5 480 54.6 480H256v-64c0-17.7 14.3-32 32-32s32 14.3 32 32v64h201.4c30.2 0 54.6-24.5 54.6-54.6 0-6.2-1.1-12.4-3.1-18.2L455.1 74.6C446 49.1 421.9 32 394.8 32H320v64c0 17.7-14.3 32-32 32s-32-14.3-32-32V32z m64 192v64c0 17.7-14.3 32-32 32s-32-14.3-32-32v-64c0-17.7 14.3-32 32-32s32 14.3 32 32z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_rocket.xml b/app/src/main/res/drawable/fa_rocket.xml
index 5fbcec2a4..1c615f867 100644
--- a/app/src/main/res/drawable/fa_rocket.xml
+++ b/app/src/main/res/drawable/fa_rocket.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="512">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M505.12 19.1c-1.19-5.54-6.66-11-12.2-12.2C460.71 0 435.5 0 410.4 0 307.18 0 245.27 55.2 199.05 128H94.84c-16.35 0.02-35.56 11.88-42.89 26.48L2.52 253.3A28.4 28.4 0 0 0 0 264a24 24 0 0 0 24 24h103.82l-22.48 22.47c-11.36 11.36-13 32.26 0 45.25l50.9 50.9c11.16 11.2 32.16 13.16 45.28 0L224 384.17V488a24 24 0 0 0 24 24 28.56 28.56 0 0 0 10.71-2.52l98.73-49.39c14.63-7.3 26.5-26.5 26.5-42.86V312.8c72.6-46.32 128.04-108.4 128.04-211.1 0.1-25.2 0.1-50.4-6.86-82.6ZM384.04 168a40 40 0 1 1 40.01-40 40.02 40.02 0 0 1-40.01 40Z"/>
+        android:pathData="M156.6 384.9L125.7 354c-8.5-8.5-11.5-20.8-7.7-32.2 3-8.9 7-20.5 11.8-33.8H24c-8.6 0-16.6-4.6-20.9-12.1s-4.2-16.7 0.2-24.1l52.5-88.5c13-21.9 36.5-35.3 61.9-35.3H200c2.4-4 4.8-7.7 7.2-11.3C289.1-4.1 411.1-8.1 483.9 5.3c11.6 2.1 20.6 11.2 22.8 22.8 13.4 72.9 9.3 194.8-111.4 276.7-3.5 2.4-7.3 4.8-11.3 7.2v82.3c0 25.4-13.4 49-35.3 61.9l-88.5 52.5c-7.4 4.4-16.6 4.5-24.1 0.2S224 496.7 224 488V380.8c-14.1 4.9-26.4 8.9-35.7 11.9-11.2 3.6-23.4 0.5-31.8-7.8zM384 168a40 40 0 1 0 0-80 40 40 0 1 0 0 80z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_sack_dollar.xml b/app/src/main/res/drawable/fa_sack_dollar.xml
index 39e4fba30..5060dea8f 100644
--- a/app/src/main/res/drawable/fa_sack_dollar.xml
+++ b/app/src/main/res/drawable/fa_sack_dollar.xml
@@ -3,7 +3,7 @@
     android:height="512dp"
     android:viewportWidth="512"
     android:viewportHeight="512">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M320,96L192,96L144.6,24.9C137.5,14.2 145.1,0 157.9,0L354.1,0c12.8,0 20.4,14.2 13.3,24.9L320,96zM192,128L320,128c3.8,2.5 8.1,5.3 13,8.4C389.7,172.7 512,250.9 512,416c0,53 -43,96 -96,96L96,512c-53,0 -96,-43 -96,-96C0,250.9 122.3,172.7 179,136.4l0,0 0,0c4.8,-3.1 9.2,-5.9 13,-8.4zM276,216c0,-11 -9,-20 -20,-20s-20,9 -20,20v14c-7.6,1.7 -15.2,4.4 -22.2,8.5c-13.9,8.3 -25.9,22.8 -25.8,43.9c0.1,20.3 12,33.1 24.7,40.7c11,6.6 24.7,10.8 35.6,14l1.7,0.5c12.6,3.8 21.8,6.8 28,10.7c5.1,3.2 5.8,5.4 5.9,8.2c0.1,5 -1.8,8 -5.9,10.5c-5,3.1 -12.9,5 -21.4,4.7c-11.1,-0.4 -21.5,-3.9 -35.1,-8.5c-2.3,-0.8 -4.7,-1.6 -7.2,-2.4c-10.5,-3.5 -21.8,2.2 -25.3,12.6s2.2,21.8 12.6,25.3c1.9,0.6 4,1.3 6.1,2.1l0,0 0,0c8.3,2.9 17.9,6.2 28.2,8.4L235.9,424c0,11 9,20 20,20s20,-9 20,-20L275.9,410.2c8,-1.7 16,-4.5 23.2,-9c14.3,-8.9 25.1,-24.1 24.8,-45c-0.3,-20.3 -11.7,-33.4 -24.6,-41.6c-11.5,-7.2 -25.9,-11.6 -37.1,-15l0,0 -0.7,-0.2c-12.8,-3.9 -21.9,-6.7 -28.3,-10.5c-5.2,-3.1 -5.3,-4.9 -5.3,-6.7c0,-3.7 1.4,-6.5 6.2,-9.3c5.4,-3.2 13.6,-5.1 21.5,-5c9.6,0.1 20.2,2.2 31.2,5.2c10.7,2.8 21.6,-3.5 24.5,-14.2s-3.5,-21.6 -14.2,-24.5c-6.5,-1.7 -13.7,-3.4 -21.1,-4.7L276,216z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M320 96H192l-47.4-71.1C137.5 14.2 145.1 0 157.9 0h196.2c12.8 0 20.4 14.2 13.3 24.9L320 96z m-128 32h128c3.8 2.5 8.1 5.3 13 8.4 56.7 36.3 179 114.5 179 279.6 0 53-43 96-96 96H96c-53 0-96-43-96-96 0-165.1 122.3-243.3 179-279.6 4.8-3.1 9.2-5.9 13-8.4z m84 88c0-11-9-20-20-20s-20 9-20 20v14c-7.6 1.7-15.2 4.4-22.2 8.5-13.9 8.3-25.9 22.8-25.8 43.9 0.1 20.3 12 33.1 24.7 40.7 11 6.6 24.7 10.8 35.6 14l1.7 0.5c12.6 3.8 21.8 6.8 28 10.7 5.1 3.2 5.8 5.4 5.9 8.2 0.1 5-1.8 8-5.9 10.5-5 3.1-12.9 5-21.4 4.7-11.1-0.4-21.5-3.9-35.1-8.5-2.3-0.8-4.7-1.6-7.2-2.4-10.5-3.5-21.8 2.2-25.3 12.6s2.2 21.8 12.6 25.3c1.9 0.6 4 1.3 6.1 2.1 8.3 2.9 17.9 6.2 28.2 8.4V424c0 11 9 20 20 20s20-9 20-20v-13.8c8-1.7 16-4.5 23.2-9 14.3-8.9 25.1-24.1 24.8-45-0.3-20.3-11.7-33.4-24.6-41.6-11.5-7.2-25.9-11.6-37.1-15l-0.7-0.2c-12.8-3.9-21.9-6.7-28.3-10.5-5.2-3.1-5.3-4.9-5.3-6.7 0-3.7 1.4-6.5 6.2-9.3 5.4-3.2 13.6-5.1 21.5-5 9.6 0.1 20.2 2.2 31.2 5.2 10.7 2.8 21.6-3.5 24.5-14.2s-3.5-21.6-14.2-24.5c-6.5-1.7-13.7-3.4-21.1-4.7V216z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_school.xml b/app/src/main/res/drawable/fa_school.xml
deleted file mode 100644
index 9e0d3d294..000000000
--- a/app/src/main/res/drawable/fa_school.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="640dp"
-    android:height="512dp"
-    android:viewportWidth="640"
-    android:viewportHeight="512">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M0 224v272c0 8.84 7.16 16 16 16h80V192H32c-17.67 0-32 14.33-32 32z m360-48h-24v-40c0-4.42-3.58-8-8-8h-16c-4.42 0-8 3.58-8 8v64c0 4.42 3.58 8 8 8h48c4.42 0 8-3.58 8-8v-16c0-4.42-3.58-8-8-8z m137.75-63.96l-160-106.67a32.02 32.02 0 0 0-35.5 0l-160 106.67A32 32 0 0 0 128 138.66V512h128V368c0-8.84 7.16-16 16-16h96c8.84 0 16 7.16 16 16v144h128V138.67c0-10.7-5.35-20.7-14.25-26.63zM320 256c-44.18 0-80-35.82-80-80s35.82-80 80-80 80 35.82 80 80-35.82 80-80 80z m288-64h-64v320h80c8.84 0 16-7.16 16-16V224c0-17.67-14.33-32-32-32z"/>
-</vector>
diff --git a/app/src/main/res/drawable/fa_scissors.xml b/app/src/main/res/drawable/fa_scissors.xml
index 4ad5a1163..398be53ce 100644
--- a/app/src/main/res/drawable/fa_scissors.xml
+++ b/app/src/main/res/drawable/fa_scissors.xml
@@ -3,7 +3,7 @@
     android:height="512dp"
     android:viewportWidth="512"
     android:viewportHeight="512">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M256,192l-39.5,-39.5c4.9,-12.6 7.5,-26.2 7.5,-40.5C224,50.1 173.9,0 112,0S0,50.1 0,112s50.1,112 112,112c14.3,0 27.9,-2.7 40.5,-7.5L192,256l-39.5,39.5c-12.6,-4.9 -26.2,-7.5 -40.5,-7.5C50.1,288 0,338.1 0,400s50.1,112 112,112s112,-50.1 112,-112c0,-14.3 -2.7,-27.9 -7.5,-40.5L499.2,76.8c7.1,-7.1 7.1,-18.5 0,-25.6c-28.3,-28.3 -74.1,-28.3 -102.4,0L256,192zM278.6,342.6L396.8,460.8c28.3,28.3 74.1,28.3 102.4,0c7.1,-7.1 7.1,-18.5 0,-25.6L342.6,278.6l-64,64zM64,112a48,48 0,1 1,96 0,48 48,0 1,1 -96,0zM112,352a48,48 0,1 1,0 96,48 48,0 1,1 0,-96z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M256 192l-39.5-39.5c4.9-12.6 7.5-26.2 7.5-40.5C224 50.1 173.9 0 112 0S0 50.1 0 112s50.1 112 112 112c14.3 0 27.9-2.7 40.5-7.5L192 256l-39.5 39.5c-12.6-4.9-26.2-7.5-40.5-7.5C50.1 288 0 338.1 0 400s50.1 112 112 112 112-50.1 112-112c0-14.3-2.7-27.9-7.5-40.5L499.2 76.8c7.1-7.1 7.1-18.5 0-25.6-28.3-28.3-74.1-28.3-102.4 0L256 192z m22.6 150.6l118.2 118.2c28.3 28.3 74.1 28.3 102.4 0 7.1-7.1 7.1-18.5 0-25.6L342.6 278.6l-64 64zM64 112a48 48 0 1 1 96 0 48 48 0 1 1-96 0z m48 240a48 48 0 1 1 0 96 48 48 0 1 1 0-96z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_seedling.xml b/app/src/main/res/drawable/fa_seedling.xml
index dc04ab510..8c06da8fe 100644
--- a/app/src/main/res/drawable/fa_seedling.xml
+++ b/app/src/main/res/drawable/fa_seedling.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="512">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M64 96H0c0 123.7 100.3 224 224 224v144c0 8.8 7.2 16 16 16h32c8.8 0 16-7.2 16-16V320C288 196.3 187.7 96 64 96z m384-64c-84.2 0-157.4 46.5-195.7 115.2 27.7 30.2 48.2 66.9 59 107.6C424 243.1 512 147.9 512 32h-64z"/>
+        android:pathData="M512 32c0 113.6-84.6 207.5-194.2 222-7.1-53.4-30.6-101.6-65.3-139.3C290.8 46.3 364 0 448 0h32c17.7 0 32 14.3 32 32zM0 96c0-17.7 14.3-32 32-32h32c123.7 0 224 100.3 224 224v32 160c0 17.7-14.3 32-32 32s-32-14.3-32-32V320C100.3 320 0 219.7 0 96z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_shield.xml b/app/src/main/res/drawable/fa_shield.xml
index 667bd6b62..44c09e54c 100644
--- a/app/src/main/res/drawable/fa_shield.xml
+++ b/app/src/main/res/drawable/fa_shield.xml
@@ -3,7 +3,7 @@
     android:height="512dp"
     android:viewportWidth="512"
     android:viewportHeight="512">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M256,0c4.6,0 9.2,1 13.4,2.9L457.7,82.8c22,9.3 38.4,31 38.3,57.2c-0.5,99.2 -41.3,280.7 -213.6,363.2c-16.7,8 -36.1,8 -52.8,0C57.3,420.7 16.5,239.2 16,140c-0.1,-26.2 16.3,-47.9 38.3,-57.2L242.7,2.9C246.8,1 251.4,0 256,0z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M256 0c4.6 0 9.2 1 13.4 2.9l188.3 79.9c22 9.3 38.4 31 38.3 57.2-0.5 99.2-41.3 280.7-213.6 363.2-16.7 8-36.1 8-52.8 0C57.3 420.7 16.5 239.2 16 140c-0.1-26.2 16.3-47.9 38.3-57.2L242.7 2.9C246.8 1 251.4 0 256 0z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_signs_post.xml b/app/src/main/res/drawable/fa_signs_post.xml
new file mode 100644
index 000000000..4256c200d
--- /dev/null
+++ b/app/src/main/res/drawable/fa_signs_post.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="512dp"
+    android:height="512dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M224 32H64c-17.7 0-32 14.3-32 32v64c0 17.7 14.3 32 32 32h377.4c4.2 0 8.3-1.7 11.3-4.7l48-48c6.2-6.2 6.2-16.4 0-22.6l-48-48c-3-3-7.1-4.7-11.3-4.7H288c0-17.7-14.3-32-32-32s-32 14.3-32 32z m256 224c0-17.7-14.3-32-32-32H288v-32h-64v32H70.6c-4.2 0-8.3 1.7-11.3 4.7l-48 48c-6.2 6.2-6.2 16.4 0 22.6l48 48c3 3 7.1 4.7 11.3 4.7H448c17.7 0 32-14.3 32-32v-64zM288 480v-96h-64v96c0 17.7 14.3 32 32 32s32-14.3 32-32z"/>
+</vector>
diff --git a/app/src/main/res/drawable/fa_skull.xml b/app/src/main/res/drawable/fa_skull.xml
index db0d0b3cd..c0a54d885 100644
--- a/app/src/main/res/drawable/fa_skull.xml
+++ b/app/src/main/res/drawable/fa_skull.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="512">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M256 0C114.6 0 0 100.3 0 224c0 70.1 36.9 132.6 94.5 173.7 9.6 6.9 15.2 18.1 13.5 29.9l-9.4 66.2c-1.4 9.6 6 18.2 15.7 18.2H192v-56c0-4.4 3.6-8 8-8h16c4.4 0 8 3.6 8 8v56h64v-56c0-4.4 3.6-8 8-8h16c4.4 0 8 3.6 8 8v56h77.7c9.7 0 17.1-8.6 15.7-18.2l-9.4-66.2c-1.7-11.7 3.8-23 13.5-29.9C475.1 356.6 512 294.1 512 224 512 100.3 397.4 0 256 0z m-96 320c-35.3 0-64-28.7-64-64s28.7-64 64-64 64 28.7 64 64-28.7 64-64 64z m192 0c-35.3 0-64-28.7-64-64s28.7-64 64-64 64 28.7 64 64-28.7 64-64 64z"/>
+        android:pathData="M416 398.9c58.5-41.1 96-104.1 96-174.9C512 100.3 397.4 0 256 0S0 100.3 0 224c0 70.7 37.5 133.8 96 174.9v1.1 64c0 26.5 21.5 48 48 48h48v-48c0-8.8 7.2-16 16-16s16 7.2 16 16v48h64v-48c0-8.8 7.2-16 16-16s16 7.2 16 16v48h48c26.5 0 48-21.5 48-48v-64-1.1zM96 256a64 64 0 1 1 128 0 64 64 0 1 1-128 0z m256-64a64 64 0 1 1 0 128 64 64 0 1 1 0-128z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_smile.xml b/app/src/main/res/drawable/fa_smile.xml
deleted file mode 100644
index 03ee29dba..000000000
--- a/app/src/main/res/drawable/fa_smile.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="496dp"
-    android:height="512dp"
-    android:viewportWidth="496"
-    android:viewportHeight="512">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M248 8C111 8 0 119 0 256s111 248 248 248 248-111 248-248S385 8 248 8z m80 168c17.7 0 32 14.3 32 32s-14.3 32-32 32-32-14.3-32-32 14.3-32 32-32z m-160 0c17.7 0 32 14.3 32 32s-14.3 32-32 32-32-14.3-32-32 14.3-32 32-32z m194.8 170.2C334.3 380.4 292.5 400 248 400s-86.3-19.6-114.8-53.8c-13.6-16.3 11-36.7 24.6-20.5 22.4 26.9 55.2 42.2 90.2 42.2s67.8-15.4 90.2-42.2c13.4-16.2 38.1 4.2 24.6 20.5z"/>
-</vector>
diff --git a/app/src/main/res/drawable/fa_snowflake.xml b/app/src/main/res/drawable/fa_snowflake.xml
index b6c51a6e9..5b4948c75 100644
--- a/app/src/main/res/drawable/fa_snowflake.xml
+++ b/app/src/main/res/drawable/fa_snowflake.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="512">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M440.3 345.2l-33.8-19.5 26-7c8.2-2.2 13.1-10.7 10.9-18.9l-4-14.9c-2.2-8.2-10.7-13.1-18.9-10.9l-70.8 19-63.9-37 63.8-36.9 70.8 19c8.2 2.2 16.7-2.7 18.9-10.9l4-14.9c2.2-8.2-2.7-16.7-10.9-18.9l-26-7 33.8-19.5c7.4-4.3 9.9-13.7 5.7-21.1L430.4 119c-4.3-7.4-13.7-9.9-21.1-5.7l-33.8 19.5 7-26c2.2-8.2-2.7-16.7-10.9-18.9l-14.9-4c-8.2-2.2-16.7 2.7-18.9 10.9l-19 70.8-62.8 36.2v-77.5l53.7-53.7c6.2-6.2 6.2-16.4 0-22.6l-11.3-11.3c-6.2-6.2-16.4-6.2-22.6 0L256 56.4V16c0-8.8-7.2-16-16-16h-32c-8.8 0-16 7.2-16 16v40.4l-19.7-19.7c-6.2-6.2-16.4-6.2-22.6 0L138.3 48c-6.3 6.2-6.3 16.4 0 22.6l53.7 53.7v77.5l-62.8-36.2-19-70.8c-2.2-8.2-10.7-13.1-18.9-10.9l-14.9 4c-8.2 2.2-13.1 10.7-10.9 18.9l7 26-33.8-19.5c-7.4-4.3-16.8-1.7-21.1 5.7L2.1 145.7c-4.3 7.4-1.7 16.8 5.7 21.1l33.8 19.5-26 7c-8.3 2.2-13.2 10.7-11 19l4 14.9c2.2 8.2 10.7 13.1 18.9 10.9l70.8-19 63.8 36.9-63.8 36.9-70.8-19c-8.2-2.2-16.7 2.7-18.9 10.9l-4 14.9c-2.2 8.2 2.7 16.7 10.9 18.9l26 7-33.8 19.6c-7.4 4.3-9.9 13.7-5.7 21.1l15.5 26.8c4.3 7.4 13.7 9.9 21.1 5.7l33.8-19.5-7 26c-2.2 8.2 2.7 16.7 10.9 18.9l14.9 4c8.2 2.2 16.7-2.7 18.9-10.9l19-70.8 62.8-36.2v77.5l-53.7 53.7c-6.3 6.2-6.3 16.4 0 22.6l11.3 11.3c6.2 6.2 16.4 6.2 22.6 0l19.7-19.7V496c0 8.8 7.2 16 16 16h32c8.8 0 16-7.2 16-16v-40.4l19.7 19.7c6.2 6.2 16.4 6.2 22.6 0l11.3-11.3c6.2-6.2 6.2-16.4 0-22.6L256 387.7v-77.5l62.8 36.2 19 70.8c2.2 8.2 10.7 13.1 18.9 10.9l14.9-4c8.2-2.2 13.1-10.7 10.9-18.9l-7-26 33.8 19.5c7.4 4.3 16.8 1.7 21.1-5.7l15.5-26.8c4.3-7.3 1.8-16.8-5.6-21z"/>
+        android:pathData="M224 0c17.7 0 32 14.3 32 32v30.1l15-15c9.4-9.4 24.6-9.4 33.9 0s9.4 24.6 0 33.9l-49 49v70.3l61.4-35.8L335 98.4c3.4-12.8 16.6-20.4 29.4-17s20.4 16.6 17 29.4l-5.2 19.3 23.6-13.8c15.3-8.9 34.9-3.7 43.8 11.5s3.8 34.9-11.5 43.8l-25.3 14.8 21.7 5.8c12.8 3.4 20.4 16.6 17 29.4s-16.6 20.4-29.4 17l-67.7-18.1-60.9 35.5 60.9 35.5 67.7-18.1c12.8-3.4 26 4.2 29.4 17s-4.2 26-17 29.4l-21.7 5.8 25.3 14.8c15.3 8.9 20.4 28.5 11.5 43.8s-28.5 20.4-43.8 11.5l-23.6-13.8 5.2 19.3c3.4 12.8-4.2 26-17 29.4s-26-4.2-29.4-17l-17.7-66.1-61.3-35.8V382l49 49c9.4 9.4 9.4 24.6 0 33.9s-24.6 9.4-33.9 0l-15-15V480c0 17.7-14.3 32-32 32s-32-14.3-32-32v-30.1l-15 15c-9.4 9.4-24.6 9.4-33.9 0s-9.4-24.6 0-33.9l49-49v-70.3l-61.4 35.8-17.7 66.1c-3.4 12.8-16.6 20.4-29.4 17s-20.4-16.6-17-29.4l5.2-19.3-23.8 13.7c-15.3 8.9-34.9 3.7-43.8-11.5s-3.7-34.9 11.5-43.8l25.3-14.8-21.7-5.8c-12.8-3.4-20.4-16.6-17-29.4s16.6-20.4 29.4-17l67.7 18.1 61-35.4-60.9-35.5-67.7 18.1c-12.8 3.4-26-4.2-29.4-17s4.2-26 17-29.4l21.7-5.8-25.3-14.8c-15.3-8.9-20.4-28.5-11.5-43.7s28.5-20.4 43.8-11.5l23.6 13.8-5.2-19.3c-3.4-12.8 4.2-26 17-29.4s26 4.2 29.4 17l17.7 66.1 61.3 35.7v-70.4L143 81c-9.4-9.4-9.4-24.6 0-33.9s24.6-9.4 33.9 0l15 15V32c0-17.7 14.3-32 32-32z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_socks.xml b/app/src/main/res/drawable/fa_socks.xml
index 1768e9cac..bf08d5dfc 100644
--- a/app/src/main/res/drawable/fa_socks.xml
+++ b/app/src/main/res/drawable/fa_socks.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="512">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M214.66 311.01L288 256V96H128v176l-86.65 64.61c-39.4 29.56-53.86 84.42-29.21 127.06C30.39 495.25 63.27 512 96.08 512c20.03 0 40.25-6.25 57.52-19.2l21.86-16.39c-29.85-55.38-13.54-125.84 39.2-165.4zM288 32c0-11.05 3.07-21.3 8.02-30.38C293.4 0.92 290.85 0 288 0H160c-17.67 0-32 14.33-32 32v32h160V32zM480 0H352c-17.67 0-32 14.33-32 32v32h192V32c0-17.67-14.33-32-32-32zM320 272l-86.13 64.61c-39.4 29.56-53.86 84.42-29.21 127.06 18.25 31.58 50.61 48.33 83.42 48.33 20.03 0 40.25-6.25 57.52-19.2l115.2-86.4A128 128 0 0 0 512 304V96H320v176z"/>
+        android:pathData="M175.2 476.6c-9.7-18-15.2-38.7-15.2-60.6 0-40.3 19-78.2 51.2-102.4l64-48c8.1-6 12.8-15.5 12.8-25.6V96H128v144c0 20.1-9.5 39.1-25.6 51.2l-64 48C14.2 357.3 0 385.8 0 416c0 53 43 96 96 96 20.8 0 41-6.7 57.6-19.2l21.6-16.2zM128 64h160V48c0-14.5 3.9-28.2 10.7-39.9C291 3 281.9 0 272 0h-96c-26.5 0-48 21.5-48 48v16z m192 32v144c0 20.1-9.5 39.1-25.6 51.2l-64 48C206.2 357.3 192 385.8 192 416c0 53 43 96 96 96 20.8 0 41-6.7 57.6-19.2l115.2-86.4C493 382.2 512 344.3 512 304V96H320z m192-32V48c0-26.5-21.5-48-48-48h-96c-26.5 0-48 21.5-48 48v16h192z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_spider.xml b/app/src/main/res/drawable/fa_spider.xml
index ae82070ae..baaeb7768 100644
--- a/app/src/main/res/drawable/fa_spider.xml
+++ b/app/src/main/res/drawable/fa_spider.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="576dp"
+    android:width="512dp"
     android:height="512dp"
-    android:viewportWidth="576"
+    android:viewportWidth="512"
     android:viewportHeight="512">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M151.17 167.35L177.1 176h4.67l5.22-26.12c0.72-3.58 1.8-7.58 3.21-11.79l-20.29-40.58 23.8-71.39c2.79-8.38-1.73-17.44-10.12-20.24l-15.17-5.06c-8.38-2.8-17.45 1.73-20.24 10.12l-25.89 77.68a32.04 32.04 0 0 0 1.73 24.43l27.15 54.3z m422.14 182.03l-52.75-79.12a32 32 0 0 0-26.62-14.25H416l68.99-24.36a32.03 32.03 0 0 0 16.51-12.61l53.6-80.41c4.9-7.35 2.91-17.29-4.44-22.19l-13.31-8.88c-7.35-4.9-17.29-2.91-22.19 4.44l-50.56 75.83L404.1 208H368l-10.37-51.85C355.44 145.18 340.26 96 288 96c-52.26 0-67.44 49.18-69.63 60.15L208 208h-36.1l-60.49-20.17L60.84 112c-4.9-7.35-14.83-9.34-22.19-4.44l-13.31 8.88c-7.35 4.9-9.34 14.83-4.44 22.19l53.6 80.41a32.03 32.03 0 0 0 16.51 12.61L160 256H82.06a32.02 32.02 0 0 0-26.63 14.25L2.69 349.38c-4.9 7.35-2.92 17.29 4.44 22.19l13.31 8.88c7.35 4.9 17.29 2.91 22.19-4.44l48-72h47.06l-60.83 97.33A31.99 31.99 0 0 0 72 418.3V496c0 8.84 7.16 16 16 16h16c8.84 0 16-7.16 16-16v-73.11l74.08-118.53c-1.01 14.05-2.08 28.11-2.08 42.21C192 399.64 232.76 448 288 448s96-48.36 96-101.43c0-14.1-1.08-28.16-2.08-42.21L456 422.89V496c0 8.84 7.16 16 16 16h16c8.84 0 16-7.16 16-16v-77.71c0-6-1.69-11.88-4.86-16.96L438.31 304h47.06l48 72c4.9 7.35 14.84 9.34 22.19 4.44l13.31-8.88c7.36-4.9 9.34-14.83 4.44-22.18zM406.09 97.51l-20.29 40.58c1.41 4.21 2.49 8.21 3.21 11.79l5.22 26.12h4.67l25.93-8.65 27.15-54.3a32 32 0 0 0 1.73-24.43l-25.89-77.68c-2.79-8.38-11.86-12.92-20.24-10.12l-15.17 5.06c-8.38 2.8-12.91 11.86-10.12 20.24l23.8 71.39z"/>
+        android:pathData="M158.4 32.6c4.8-12.4-1.4-26.3-13.8-31s-26.3 1.4-31 13.8L81.1 100c-7.9 20.7-3 44.1 12.7 59.7l57.4 57.4-80.4-26.8c-2.4-0.8-4.3-2.7-5.1-5.1l-18.9-56.8C42.6 115.8 29 109 16.4 113.2S-3 131 1.2 143.6l18.9 56.8c5.6 16.7 18.7 29.8 35.4 35.4l60.6 20.2-60.5 20.2c-16.7 5.6-29.8 18.7-35.4 35.4l-19 56.8C-3 381 3.8 394.6 16.4 398.8s26.2-2.6 30.4-15.2l18.9-56.8c0.8-2.4 2.7-4.3 5.1-5.1l80.4-26.8-57.5 57.4C78.1 368 73.1 391.4 81.1 412l32.5 84.6c4.8 12.4 18.6 18.5 31 13.8s18.5-18.6 13.8-31l-32.5-84.6c-1.1-3-0.4-6.3 1.8-8.5l32.3-32.4c1 52.1 43.6 94.1 96 94.1s95-41.9 96-94.1l32.3 32.3c2.2 2.2 2.9 5.6 1.8 8.5l-32.5 84.6c-4.8 12.4 1.4 26.3 13.8 31s26.3-1.4 31-13.8l32.5-84.5c7.9-20.7 3-44.1-12.7-59.7l-57.4-57.4 80.4 26.8c2.4 0.8 4.3 2.7 5.1 5.1l18.9 56.8c4.2 12.6 17.8 19.4 30.4 15.2s19.4-17.8 15.2-30.4l-18.9-56.8c-5.6-16.7-18.7-29.8-35.4-35.4L395.9 256l60.5-20.2c16.7-5.6 29.8-18.7 35.4-35.4l18.9-56.8c4.2-12.6-2.6-26.2-15.2-30.4s-26.2 2.6-30.4 15.2l-18.9 56.8c-0.8 2.4-2.7 4.3-5.1 5.1l-80.4 26.8 57.4-57.4c15.6-15.6 20.6-39 12.7-59.7l-32.4-84.6c-4.8-12.4-18.6-18.6-31-13.8s-18.5 18.6-13.8 31l32.5 84.6c1.1 3 0.4 6.3-1.8 8.5L336 174.1V160c0-31.8-18.6-59.3-45.5-72.2-9.1-4.4-18.5 3.3-18.5 13.4V112c0 8.8-7.2 16-16 16s-16-7.2-16-16v-10.8c0-10.1-9.4-17.7-18.5-13.4-26.9 12.9-45.5 40.4-45.5 72.2v14.1l-48.3-48.3c-2.2-2.2-2.9-5.6-1.8-8.5l32.5-84.6z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_suitcase_medical.xml b/app/src/main/res/drawable/fa_suitcase_medical.xml
index 697ebf040..a93e815e5 100644
--- a/app/src/main/res/drawable/fa_suitcase_medical.xml
+++ b/app/src/main/res/drawable/fa_suitcase_medical.xml
@@ -3,7 +3,7 @@
     android:height="512dp"
     android:viewportWidth="512"
     android:viewportHeight="512">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M184,48L328,48c4.4,0 8,3.6 8,8L336,96L176,96L176,56c0,-4.4 3.6,-8 8,-8zM128,56L128,96v32L128,480L384,480L384,128 384,96 384,56c0,-30.9 -25.1,-56 -56,-56L184,0c-30.9,0 -56,25.1 -56,56zM96,96L64,96C28.7,96 0,124.7 0,160L0,416c0,35.3 28.7,64 64,64L96,480L96,96zM416,480h32c35.3,0 64,-28.7 64,-64L512,160c0,-35.3 -28.7,-64 -64,-64L416,96L416,480zM224,208c0,-8.8 7.2,-16 16,-16h32c8.8,0 16,7.2 16,16v48h48c8.8,0 16,7.2 16,16v32c0,8.8 -7.2,16 -16,16L288,320v48c0,8.8 -7.2,16 -16,16L240,384c-8.8,0 -16,-7.2 -16,-16L224,320L176,320c-8.8,0 -16,-7.2 -16,-16L160,272c0,-8.8 7.2,-16 16,-16h48L224,208z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M184 48h144c4.4 0 8 3.6 8 8v40H176V56c0-4.4 3.6-8 8-8z m-56 8v40 32 352h256V128 96 56c0-30.9-25.1-56-56-56H184c-30.9 0-56 25.1-56 56zM96 96H64c-35.3 0-64 28.7-64 64v256c0 35.3 28.7 64 64 64h32V96z m320 384h32c35.3 0 64-28.7 64-64V160c0-35.3-28.7-64-64-64h-32v384zM224 208c0-8.8 7.2-16 16-16h32c8.8 0 16 7.2 16 16v48h48c8.8 0 16 7.2 16 16v32c0 8.8-7.2 16-16 16h-48v48c0 8.8-7.2 16-16 16h-32c-8.8 0-16-7.2-16-16v-48h-48c-8.8 0-16-7.2-16-16v-32c0-8.8 7.2-16 16-16h48v-48z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_sun.xml b/app/src/main/res/drawable/fa_sun.xml
index 5e051a84e..bfe4bdbac 100644
--- a/app/src/main/res/drawable/fa_sun.xml
+++ b/app/src/main/res/drawable/fa_sun.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="512">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M256 160c-52.9 0-96 43.1-96 96s43.1 96 96 96 96-43.1 96-96-43.1-96-96-96z m246.4 80.5l-94.7-47.3 33.5-100.4c4.5-13.6-8.4-26.5-21.9-21.9l-100.4 33.5-47.4-94.8c-6.4-12.8-24.6-12.8-31 0l-47.3 94.7L92.7 70.8c-13.6-4.5-26.5 8.4-21.9 21.9l33.5 100.4-94.7 47.4c-12.8 6.4-12.8 24.6 0 31l94.7 47.3-33.5 100.5c-4.5 13.6 8.4 26.5 21.9 21.9l100.4-33.5 47.3 94.7c6.4 12.8 24.6 12.8 31 0l47.3-94.7 100.4 33.5c13.6 4.5 26.5-8.4 21.9-21.9l-33.5-100.4 94.7-47.3c13-6.5 13-24.7 0.2-31.1z m-155.9 106c-49.9 49.9-131.1 49.9-181 0-49.9-49.9-49.9-131.1 0-181 49.9-49.9 131.1-49.9 181 0 49.9 49.9 49.9 131.1 0 181z"/>
+        android:pathData="M361.5 1.2c5 2.1 8.6 6.6 9.6 11.9L391 121l107.9 19.8c5.3 1 9.8 4.6 11.9 9.6s1.5 10.7-1.6 15.2L446.9 256l62.3 90.3c3.1 4.5 3.7 10.2 1.6 15.2s-6.6 8.6-11.9 9.6L391 391l-19.9 107.9c-1 5.3-4.6 9.8-9.6 11.9s-10.7 1.5-15.2-1.6L256 446.9l-90.3 62.3c-4.5 3.1-10.2 3.7-15.2 1.6s-8.6-6.6-9.6-11.9L121 391 13.1 371.1c-5.3-1-9.8-4.6-11.9-9.6s-1.5-10.7 1.6-15.2L65.1 256 2.8 165.7c-3.1-4.5-3.7-10.2-1.6-15.2s6.6-8.6 11.9-9.6L121 121l19.9-107.9c1-5.3 4.6-9.8 9.6-11.9s10.7-1.5 15.2 1.6L256 65.1l90.3-62.3c4.5-3.1 10.2-3.7 15.2-1.6zM160 256a96 96 0 1 1 192 0 96 96 0 1 1-192 0z m224 0a128 128 0 1 0-256 0 128 128 0 1 0 256 0z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_temperature_three_quarters.xml b/app/src/main/res/drawable/fa_temperature_three_quarters.xml
index e5abcbc54..85067b75c 100644
--- a/app/src/main/res/drawable/fa_temperature_three_quarters.xml
+++ b/app/src/main/res/drawable/fa_temperature_three_quarters.xml
@@ -3,7 +3,7 @@
     android:height="512dp"
     android:viewportWidth="320"
     android:viewportHeight="512">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M160,64c-26.5,0 -48,21.5 -48,48V276.5c0,17.3 -7.1,31.9 -15.3,42.5C86.2,332.6 80,349.5 80,368c0,44.2 35.8,80 80,80s80,-35.8 80,-80c0,-18.5 -6.2,-35.4 -16.7,-48.9c-8.2,-10.6 -15.3,-25.2 -15.3,-42.5V112c0,-26.5 -21.5,-48 -48,-48zM48,112C48,50.2 98.1,0 160,0s112,50.1 112,112V276.5c0,0.1 0.1,0.3 0.2,0.6c0.2,0.6 0.8,1.6 1.7,2.8c18.9,24.4 30.1,55 30.1,88.1c0,79.5 -64.5,144 -144,144S16,447.5 16,368c0,-33.2 11.2,-63.8 30.1,-88.1c0.9,-1.2 1.5,-2.2 1.7,-2.8c0.1,-0.3 0.2,-0.5 0.2,-0.6V112zM208,368c0,26.5 -21.5,48 -48,48s-48,-21.5 -48,-48c0,-20.9 13.4,-38.7 32,-45.3V144c0,-8.8 7.2,-16 16,-16s16,7.2 16,16V322.7c18.6,6.6 32,24.4 32,45.3z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M160 64c-26.5 0-48 21.5-48 48v164.5c0 17.3-7.1 31.9-15.3 42.5C86.2 332.6 80 349.5 80 368c0 44.2 35.8 80 80 80s80-35.8 80-80c0-18.5-6.2-35.4-16.7-48.9-8.2-10.6-15.3-25.2-15.3-42.5V112c0-26.5-21.5-48-48-48zM48 112C48 50.2 98.1 0 160 0s112 50.1 112 112v164.5c0 0.1 0.1 0.3 0.2 0.6 0.2 0.6 0.8 1.6 1.7 2.8 18.9 24.4 30.1 55 30.1 88.1 0 79.5-64.5 144-144 144S16 447.5 16 368c0-33.2 11.2-63.8 30.1-88.1 0.9-1.2 1.5-2.2 1.7-2.8 0.1-0.3 0.2-0.5 0.2-0.6V112z m160 256c0 26.5-21.5 48-48 48s-48-21.5-48-48c0-20.9 13.4-38.7 32-45.3V144c0-8.8 7.2-16 16-16s16 7.2 16 16v178.7c18.6 6.6 32 24.4 32 45.3z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_toilet_paper.xml b/app/src/main/res/drawable/fa_toilet_paper.xml
new file mode 100644
index 000000000..cab3c9a81
--- /dev/null
+++ b/app/src/main/res/drawable/fa_toilet_paper.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="640dp"
+    android:height="512dp"
+    android:viewportWidth="640"
+    android:viewportHeight="512">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M444.2 0c-47 49.6-60.2 126.5-60.2 192 0 158.8-27.3 247-42.7 283.9-10 24-33.2 36.1-55.4 36.1H48c-11.5 0-22.2-6.2-27.8-16.2s-5.6-22.3 0.4-32.2c9.8-17.7 15.4-38.2 20.5-57.7C52.3 362.8 64 293.5 64 192 64 86 107 0 160 0h284.2zM512 384c-53 0-96-86-96-192S459 0 512 0s96 86 96 192-43 192-96 192z m0-128c17.7 0 32-28.7 32-64s-14.3-64-32-64-32 28.7-32 64 14.3 64 32 64z m-368-48a16 16 0 1 0-32 0 16 16 0 1 0 32 0z m64 0a16 16 0 1 0-32 0 16 16 0 1 0 32 0z m48 16a16 16 0 1 0 0-32 16 16 0 1 0 0 32z m80-16a16 16 0 1 0-32 0 16 16 0 1 0 32 0z"/>
+</vector>
diff --git a/app/src/main/res/drawable/fa_tractor.xml b/app/src/main/res/drawable/fa_tractor.xml
index 46737d840..bd1735863 100644
--- a/app/src/main/res/drawable/fa_tractor.xml
+++ b/app/src/main/res/drawable/fa_tractor.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="512">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M528 336c-48.6 0-88 39.4-88 88s39.4 88 88 88 88-39.4 88-88-39.4-88-88-88z m0 112c-13.23 0-24-10.77-24-24s10.77-24 24-24 24 10.77 24 24-10.77 24-24 24z m80-288h-64v-40.2c0-14.12 4.7-27.76 13.15-38.84 4.42-5.8 3.55-14.06-1.32-19.49L534.2 37.3c-6.66-7.45-18.32-6.92-24.7 0.78C490.58 60.9 480 89.81 480 119.8V160H377.67L321.58 29.14A47.91 47.91 0 0 0 277.45 0H144c-26.47 0-48 21.53-48 48v146.52c-8.63-6.73-20.96-6.46-28.89 1.47L36 227.1c-8.59 8.59-8.59 22.52 0 31.11l5.06 5.06c-4.99 9.26-8.96 18.82-11.91 28.72H22c-12.15 0-22 9.85-22 22v44c0 12.15 9.85 22 22 22h7.14c2.96 9.91 6.92 19.46 11.91 28.73l-5.06 5.06c-8.59 8.59-8.59 22.52 0 31.11L67.1 476c8.59 8.59 22.52 8.59 31.11 0l5.06-5.06c9.26 4.99 18.82 8.96 28.72 11.91V490c0 12.15 9.85 22 22 22h44c12.15 0 22-9.85 22-22v-7.14c9.9-2.95 19.46-6.92 28.72-11.91l5.06 5.06c8.59 8.59 22.52 8.59 31.11 0l31.11-31.11c8.59-8.59 8.59-22.52 0-31.11l-5.06-5.06c4.99-9.26 8.96-18.82 11.91-28.72H330c12.15 0 22-9.85 22-22v-6h80.54c21.91-28.99 56.32-48 95.46-48 18.64 0 36.07 4.61 51.8 12.2l50.82-50.82c6-6 9.37-14.14 9.37-22.63V192c0.01-17.67-14.32-32-31.99-32zM176 416c-44.18 0-80-35.82-80-80s35.82-80 80-80 80 35.82 80 80-35.82 80-80 80z m22-256h-38V64h106.89l41.15 96H198z"/>
+        android:pathData="M96 64c0-35.3 28.7-64 64-64h106.3c26.2 0 49.7 15.9 59.4 40.2l48 119.8H480v-33.8c0-24.8 5.8-49.3 16.9-71.6l2.5-5c7.9-15.8 27.1-22.2 42.9-14.3s22.2 27.1 14.3 42.9l-2.5 5c-6.7 13.3-10.1 28-10.1 42.9V160h56c22.1 0 40 17.9 40 40v45.4c0 16.5-8.5 31.9-22.6 40.7l-43.3 27.1c-14.2-5.9-29.8-9.2-46.1-9.2-39.3 0-74.1 18.9-96 48h-80c0 17.7-14.3 32-32 32h-8.2c-1.7 4.8-3.7 9.5-5.8 14.1l5.8 5.8c12.5 12.5 12.5 32.8 0 45.3l-22.6 22.6c-12.5 12.5-32.8 12.5-45.3 0l-5.8-5.8c-4.6 2.2-9.3 4.1-14.1 5.8v8.2c0 17.7-14.3 32-32 32h-32c-17.7 0-32-14.3-32-32v-8.2c-4.8-1.7-9.5-3.7-14.1-5.8l-5.8 5.8c-12.5 12.5-32.8 12.5-45.3 0l-22.6-22.7c-12.5-12.5-12.5-32.8 0-45.3L46 398c-2.2-4.6-4.1-9.3-5.8-14.1H32c-17.7 0-32-14.3-32-32V320c0-17.7 14.3-32 32-32h8.2c1.7-4.8 3.7-9.5 5.8-14.1l-5.8-5.8c-12.5-12.5-12.5-32.8 0-45.3l22.6-22.6c9-9 21.9-11.5 33.1-7.6V192v-32-96z m170.3 0H160v96h32 112.7l-38.4-96zM176 256a80 80 0 1 0 0 160 80 80 0 1 0 0-160z m352 192a24 24 0 1 0 0-48 24 24 0 1 0 0 48z m0 64c-48.6 0-88-39.4-88-88 0-29.8 14.8-56.1 37.4-72 14.3-10.1 31.8-16 50.6-16 2.7 0 5.3 0.1 7.9 0.3 44.9 4 80.1 41.7 80.1 87.7 0 48.6-39.4 88-88 88z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_tree.xml b/app/src/main/res/drawable/fa_tree.xml
index e466e8fc8..3da5a8f81 100644
--- a/app/src/main/res/drawable/fa_tree.xml
+++ b/app/src/main/res/drawable/fa_tree.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="384dp"
+    android:width="448dp"
     android:height="512dp"
-    android:viewportWidth="384"
+    android:viewportWidth="448"
     android:viewportHeight="512">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M378.31 378.49L298.42 288h30.63c9.01 0 16.98-5 20.78-13.06 3.8-8.04 2.55-17.26-3.28-24.05L268.42 160h28.89c9.1 0 17.3-5.35 20.86-13.61 3.52-8.13 1.86-17.59-4.24-24.08L203.66 4.83c-6.03-6.45-17.28-6.45-23.32 0L70.06 122.31c-6.1 6.49-7.75 15.95-4.24 24.08C69.38 154.65 77.59 160 86.69 160h28.89l-78.14 90.91c-5.81 6.78-7.06 15.99-3.27 24.04C37.97 283 45.93 288 54.95 288h30.63L5.69 378.49c-6 6.79-7.36 16.09-3.56 24.26 3.75 8.05 12 13.25 21.01 13.25H160v24.45l-30.29 48.4c-5.32 10.64 2.42 23.16 14.31 23.16h95.96c11.89 0 19.63-12.52 14.31-23.16L224 440.45V416h136.86c9.01 0 17.26-5.2 21.01-13.25 3.8-8.17 2.44-17.47-3.56-24.26z"/>
+        android:pathData="M210.6 5.9L62 169.4c-3.9 4.2-6 9.8-6 15.5 0 12.8 10.3 23.1 23.1 23.1H104l-73.4 73.4c-4.2 4.2-6.6 10-6.6 16 0 12.5 10.1 22.6 22.6 22.6H80L5.4 409.5c-3.5 4.2-5.4 9.5-5.4 15 0 13 10.5 23.5 23.5 23.5H192v32c0 17.7 14.3 32 32 32s32-14.3 32-32v-32h168.5c13 0 23.5-10.5 23.5-23.5 0-5.5-1.9-10.8-5.4-15L368 320h33.4c12.5 0 22.6-10.1 22.6-22.6 0-6-2.4-11.8-6.6-16L344 208h24.9c12.7 0 23.1-10.3 23.1-23.1 0-5.7-2.1-11.3-6-15.5L237.4 5.9C234 2.1 229.1 0 224 0s-10 2.1-13.4 5.9z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_trophy.xml b/app/src/main/res/drawable/fa_trophy.xml
index 29ca3332a..f45004daa 100644
--- a/app/src/main/res/drawable/fa_trophy.xml
+++ b/app/src/main/res/drawable/fa_trophy.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="512">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M552 64H448V24c0-13.3-10.7-24-24-24H152c-13.3 0-24 10.7-24 24v40H24C10.7 64 0 74.7 0 88v56c0 35.7 22.5 72.4 61.9 100.7 31.5 22.7 69.8 37.1 110 41.7C203.3 338.5 240 360 240 360v72h-48c-35.3 0-64 20.7-64 56v12c0 6.6 5.4 12 12 12h296c6.6 0 12-5.4 12-12v-12c0-35.3-28.7-56-64-56h-48v-72s36.7-21.5 68.1-73.6c40.3-4.6 78.6-19 110-41.7 39.3-28.3 61.9-65 61.9-100.7V88c0-13.3-10.7-24-24-24zM99.3 192.8C74.9 175.2 64 155.6 64 144v-16h64.2c1 32.6 5.8 61.2 12.8 86.2-15.1-5.2-29.2-12.4-41.7-21.4zM512 144c0 16.1-17.7 36.1-35.3 48.8-12.5 9-26.7 16.2-41.8 21.4 7-25 11.8-53.6 12.8-86.2H512v16z"/>
+        android:pathData="M400 0H176c-26.5 0-48.1 21.8-47.1 48.2 0.2 5.3 0.4 10.6 0.7 15.8H24C10.7 64 0 74.7 0 88c0 92.6 33.5 157 78.5 200.7 44.3 43.1 98.3 64.8 138.1 75.8 23.4 6.5 39.4 26 39.4 45.6 0 20.9-17 37.9-37.9 37.9H192c-17.7 0-32 14.3-32 32s14.3 32 32 32h192c17.7 0 32-14.3 32-32s-14.3-32-32-32h-26.1c-20.9 0-37.9-17-37.9-37.9 0-19.6 15.9-39.2 39.4-45.6 39.9-11 93.9-32.7 138.2-75.8C542.5 245 576 180.6 576 88c0-13.3-10.7-24-24-24H446.4c0.3-5.2 0.5-10.4 0.7-15.8C448.1 21.8 426.5 0 400 0zM48.9 112h84.4c9.1 90.1 29.2 150.3 51.9 190.6-24.9-11-50.8-26.5-73.2-48.3-32-31.1-58-76-63-142.3z m415.2 142.3c-22.4 21.8-48.3 37.3-73.2 48.3 22.7-40.3 42.8-100.5 51.9-190.6h84.4c-5.1 66.3-31.1 111.2-63 142.3z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_umbrella.xml b/app/src/main/res/drawable/fa_umbrella.xml
index 48e9420fa..e006fd19f 100644
--- a/app/src/main/res/drawable/fa_umbrella.xml
+++ b/app/src/main/res/drawable/fa_umbrella.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="512">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M575.7 280.8C547.1 144.5 437.3 62.6 320 49.9V32c0-17.7-14.3-32-32-32s-32 14.3-32 32v17.9C138.3 62.6 29.5 144.5 0.3 280.8c-2.2 10.1 8.5 21.3 18.7 11.4 52-55 107.7-52.4 158.6 37 5.3 9.5 14.9 8.6 19.7 0 20.2-35.4 44.9-73.2 90.7-73.2 58.5 0 88.2 68.8 90.7 73.2 4.8 8.6 14.4 9.5 19.7 0 51-89.5 107.1-91.4 158.6-37 10.3 10 20.9-1.3 18.7-11.4zM256 301.7V432c0 8.8-7.2 16-16 16-7.8 0-13.2-5.3-15.1-10.7-5.9-16.7-24.1-25.4-40.8-19.5-16.7 5.9-25.4 24.2-19.5 40.8 11.2 31.9 41.6 53.3 75.4 53.3 44.1 0 80-35.9 80-80V301.6c-9.1-7.9-19.8-13.6-32-13.6-12.3 0.1-22.4 4.8-32 13.7z"/>
+        android:pathData="M288 0c17.7 0 32 14.3 32 32v17.7C451.8 63.4 557.7 161 573.9 285.9c2 15.6-17.3 24.4-27.8 12.7-14-15.6-41.3-26.6-66.1-26.6-38.7 0-71 27.5-78.4 64.1-1.7 8.7-8.7 15.9-17.6 15.9s-15.8-7.2-17.6-15.9C359 299.5 326.7 272 288 272s-71 27.5-78.4 64.1c-1.7 8.7-8.7 15.9-17.6 15.9s-15.8-7.2-17.6-15.9C167 299.5 134.7 272 96 272c-24.8 0-52.1 11-66.1 26.7-10.5 11.7-29.8 2.8-27.8-12.8C18.3 161 124.2 63.4 256 49.7V32c0-17.7 14.3-32 32-32z m0 304c12.3 0 23.5 4.6 32 12.2v114.4c0 45-36.5 81.4-81.4 81.4-30.8 0-59-17.4-72.8-45l-2.3-4.7c-7.9-15.8-1.5-35 14.3-42.9s35-1.5 42.9 14.3l2.3 4.7c3 5.9 9 9.6 15.6 9.6 9.6 0 17.4-7.8 17.4-17.4V316.2c8.5-7.6 19.7-12.2 32-12.2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_user_astronaut.xml b/app/src/main/res/drawable/fa_user_astronaut.xml
deleted file mode 100644
index e39692128..000000000
--- a/app/src/main/res/drawable/fa_user_astronaut.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="448dp"
-    android:height="512dp"
-    android:viewportWidth="448"
-    android:viewportHeight="512">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M64 224h13.5c24.7 56.5 80.9 96 146.5 96s121.8-39.5 146.5-96H384c8.8 0 16-7.2 16-16v-96c0-8.8-7.2-16-16-16h-13.5C345.8 39.5 289.6 0 224 0S102.2 39.5 77.5 96H64c-8.8 0-16 7.2-16 16v96c0 8.8 7.2 16 16 16z m40-88c0-22.1 21.5-40 48-40h144c26.5 0 48 17.9 48 40v24c0 53-43 96-96 96h-48c-53 0-96-43-96-96v-24z m72 72l12-36 36-12-36-12-12-36-12 36-36 12 36 12 12 36z m151.6 113.4C297.7 340.7 262.2 352 224 352s-73.7-11.3-103.6-30.6C52.9 328.5 0 385 0 454.4v9.6c0 26.5 21.5 48 48 48h80v-64c0-17.7 14.3-32 32-32h128c17.7 0 32 14.3 32 32v64h80c26.5 0 48-21.5 48-48v-9.6c0-69.4-52.9-125.9-120.4-133zM272 448c-8.8 0-16 7.2-16 16s7.2 16 16 16 16-7.2 16-16-7.2-16-16-16z m-96 0c-8.8 0-16 7.2-16 16v48h32v-48c0-8.8-7.2-16-16-16z"/>
-</vector>
diff --git a/app/src/main/res/drawable/fa_utensils.xml b/app/src/main/res/drawable/fa_utensils.xml
index 1bf4c8bec..de8377546 100644
--- a/app/src/main/res/drawable/fa_utensils.xml
+++ b/app/src/main/res/drawable/fa_utensils.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="416dp"
+    android:width="448dp"
     android:height="512dp"
-    android:viewportWidth="416"
+    android:viewportWidth="448"
     android:viewportHeight="512">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M207.9 15.2c0.8 4.7 16.1 94.5 16.1 128.8 0 52.3-27.8 89.6-68.9 104.6L168 486.7c0.7 13.7-10.2 25.3-24 25.3H80c-13.7 0-24.7-11.5-24-25.3l12.9-238.1C27.7 233.6 0 196.2 0 144 0 109.6 15.3 19.9 16.1 15.2 19.3-5.1 61.4-5.4 64 16.3v141.2c1.3 3.4 15.1 3.2 16 0 1.4-25.3 7.9-139.2 8-141.8 3.3-20.8 44.7-20.8 47.9 0 0.2 2.7 6.6 116.5 8 141.8 0.9 3.2 14.8 3.4 16 0V16.3c2.6-21.6 44.8-21.4 48-1.1z m119.2 285.7l-15 185.1c-1.2 14 9.9 26 23.9 26h56c13.3 0 24-10.7 24-24V24c0-13.2-10.7-24-24-24-82.5 0-221.4 178.5-64.9 300.9z"/>
+        android:pathData="M416 0c-16 0-128 32-128 176v112c0 35.3 28.7 64 64 64h32v128c0 17.7 14.3 32 32 32s32-14.3 32-32V352 240 32c0-17.7-14.3-32-32-32zM64 16c0-8.2-6.1-15-14.3-15.9S34.2 4.6 32.4 12.5L2.1 148.8C0.7 155.1 0 161.5 0 167.9c0 45.9 35.1 83.6 80 87.7V480c0 17.7 14.3 32 32 32s32-14.3 32-32V255.6c44.9-4.1 80-41.8 80-87.7 0-6.4-0.7-12.8-2.1-19.1L191.6 12.5c-1.8-8-9.3-13.3-17.4-12.4S160 7.8 160 16v134.2c0 5.4-4.4 9.8-9.8 9.8-5.1 0-9.3-3.9-9.8-9L127.9 14.6C127.2 6.3 120.3 0 112 0S96.8 6.3 96.1 14.6L83.7 151c-0.5 5.1-4.7 9-9.8 9-5.4 0-9.8-4.4-9.8-9.8V16z m48.3 152H112h-0.3l0.3-0.7 0.3 0.7z"/>
 </vector>
diff --git a/app/src/main/res/drawable/fa_volcano.xml b/app/src/main/res/drawable/fa_volcano.xml
deleted file mode 100644
index 5ebebe8b7..000000000
--- a/app/src/main/res/drawable/fa_volcano.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="512dp"
-    android:height="512dp"
-    android:viewportWidth="512"
-    android:viewportHeight="512">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M160,144c-35.3,0 -64,-28.7 -64,-64s28.7,-64 64,-64c15.7,0 30,5.6 41.2,15C212.4,12.4 232.7,0 256,0s43.6,12.4 54.8,31C322,21.6 336.3,16 352,16c35.3,0 64,28.7 64,64s-28.7,64 -64,64c-14.7,0 -28.3,-5 -39.1,-13.3l-32,48C275.3,187 266,192 256,192s-19.3,-5 -24.9,-13.3l-32,-48C188.3,139 174.7,144 160,144zM144,352l48.4,-24.2c10.2,-5.1 21.6,-7.8 33,-7.8c19.6,0 38.4,7.8 52.2,21.6l32.5,32.5c6.3,6.3 14.9,9.9 23.8,9.9c11.3,0 21.8,-5.6 28,-15l9.7,-14.6 -58.9,-66.3c-9.1,-10.2 -22.2,-16.1 -35.9,-16.1L235.1,272c-13.7,0 -26.8,5.9 -35.9,16.1l-59.9,67.4L144,352zM163.4,256.2c18.2,-20.5 44.3,-32.2 71.8,-32.2h41.8c27.4,0 53.5,11.7 71.8,32.2l150.2,169c8.5,9.5 13.2,21.9 13.2,34.7c0,28.8 -23.4,52.2 -52.2,52.2L52.2,512.1C23.4,512 0,488.6 0,459.8c0,-12.8 4.7,-25.1 13.2,-34.7l150.2,-169z"/>
-</vector>
diff --git a/app/src/main/res/drawable/fa_wine_glass.xml b/app/src/main/res/drawable/fa_wine_glass.xml
index 9d19cd03d..c875833df 100644
--- a/app/src/main/res/drawable/fa_wine_glass.xml
+++ b/app/src/main/res/drawable/fa_wine_glass.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="288dp"
+    android:width="320dp"
     android:height="512dp"
-    android:viewportWidth="288"
+    android:viewportWidth="320"
     android:viewportHeight="512">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M216 464h-40V346.81c68.47-15.89 118.05-79.91 111.4-154.16l-15.95-178.1C270.71 6.31 263.9 0 255.74 0H32.26c-8.15 0-14.97 6.31-15.7 14.55L0.6 192.66C-6.05 266.91 43.53 330.93 112 346.82V464H72c-22.09 0-40 17.91-40 40 0 4.42 3.58 8 8 8h208c4.42 0 8-3.58 8-8 0-22.09-17.91-40-40-40z"/>
+        android:pathData="M32.1 29.3C33.5 12.8 47.4 0 64 0h192c16.6 0 30.5 12.8 31.9 29.3l14 168.4c6 72-42.5 135.2-109.9 150.6V448h48c17.7 0 32 14.3 32 32s-14.3 32-32 32h-80-80c-17.7 0-32-14.3-32-32s14.3-32 32-32h48v-99.6C60.6 333 12.1 269.8 18.1 197.8l14-168.4z m56 98.7h143.8l-5.3-64H93.4l-5.3 64z"/>
 </vector>
diff --git a/run-v2-icons.md b/run-v2-icons.md
new file mode 100644
index 000000000..90f3a077d
--- /dev/null
+++ b/run-v2-icons.md
@@ -0,0 +1,86 @@
+
+## OONI Run v2 Icons in near alphabetical order.
+
+| Web                        | Mobile                                                                                           | Description                |
+|----------------------------|--------------------------------------------------------------------------------------------------|----------------------------|
+| FaAnchor                   | [fa_anchor.xml](app/src/main/res/drawable/fa_anchor.xml)                                         | Anchor                     |
+| FaAward                    | [fa_award.xml](app/src/main/res/drawable/fa_award.xml)                                           | Award                      |
+| FaBed                      | [fa_bed.xml](app/src/main/res/drawable/fa_bed.xml)                                               | Bed                        |
+| FaBolt                     | [fa_bolt.xml](app/src/main/res/drawable/fa_bolt.xml)                                             | Bolt                       |
+| FaBone                     | [fa_bone.xml](app/src/main/res/drawable/fa_bone.xml)                                             | Bone                       |
+| FaBookOpenReader           | [fa_book_open_reader.xml](app/src/main/res/drawable/fa_book_open_reader.xml)                     | Book Open Reader           |
+| FaBrush                    | [fa_brush.xml](app/src/main/res/drawable/fa_brush.xml)                                           | Brush                      |
+| FaBuilding                 | [fa_building.xml](app/src/main/res/drawable/fa_building.xml)                                     | Building                   |
+| FaCakeCandles              | [fa_cake_candles.xml](app/src/main/res/drawable/fa_cake_candles.xml)                             | Cake Candles               |
+| FaCar                      | [fa_car.xml](app/src/main/res/drawable/fa_car.xml)                                               | Car                        |
+| FaCarrot                   | [fa_carrot.xml](app/src/main/res/drawable/fa_carrot.xml)                                         | Carrot                     |
+| FaCloudRain                | [fa_cloud_rain.xml](app/src/main/res/drawable/fa_cloud_rain.xml)                                 | Cloud Rain                 |
+| FaCloudSun                 | [fa_cloud_sun.xml](app/src/main/res/drawable/fa_cloud_sun.xml)                                   | Cloud Sun                  |
+| FaCompass                  | [fa_compass.xml](app/src/main/res/drawable/fa_compass.xml)                                       | Compass                    |
+| FaComputer                 | [fa_computer.xml](app/src/main/res/drawable/fa_computer.xml)                                     | Computer                   |
+| FaCrown                    | [fa_crown.xml](app/src/main/res/drawable/fa_crown.xml)                                           | Crown                      |
+| FaCloudSunRain             | [fa_cloud_sun_rain.xml](app/src/main/res/drawable/fa_cloud_sun_rain.xml)                         | Cloud Sun Rain             |
+| FaCube                     | [fa_cube.xml](app/src/main/res/drawable/fa_cube.xml)                                             | Cube                       |
+| FaDove                     | [fa_dove.xml](app/src/main/res/drawable/fa_dove.xml)                                             | Dove                       |
+| FaDroplet                  | [fa_droplet.xml](app/src/main/res/drawable/fa_droplet.xml)                                       | Droplet                    |
+| FaEarthAmericas            | [fa_earth_americas.xml](app/src/main/res/drawable/fa_earth_americas.xml)                         | Earth Americas             |
+| FaFaceSmile                | [fa_face_smile.xml](app/src/main/res/drawable/fa_face_smile.xml)                                 | Face Smile                 |
+| FaFaucet                   | [fa_faucet.xml](app/src/main/res/drawable/fa_faucet.xml)                                         | Faucet                     |
+| FaFilm                     | [fa_film.xml](app/src/main/res/drawable/fa_film.xml)                                             | Film                       |
+| FaFire                     | [fa_fire.xml](app/src/main/res/drawable/fa_fire.xml)                                             | Fire                       |
+| FaFish                     | [fa_fish.xml](app/src/main/res/drawable/fa_fish.xml)                                             | Fish                       |
+| FaFlagCheckered            | [fa_flag_checkered.xml](app/src/main/res/drawable/fa_flag_checkered.xml)                         | Flag Checkered             |
+| FaGauge                    | [fa_gauge.xml](app/src/main/res/drawable/fa_gauge.xml)                                           | Gauge                      |
+| FaGhost                    | [fa_ghost.xml](app/src/main/res/drawable/fa_ghost.xml)                                           | Ghost                      |
+| FaGift                     | [fa_gift.xml](app/src/main/res/drawable/fa_gift.xml)                                             | Gift                       |
+| FaGlasses                  | [fa_glasses.xml](app/src/main/res/drawable/fa_glasses.xml)                                       | Glasses                    |
+| FaGraduationCap            | [fa_graduation_cap.xml](app/src/main/res/drawable/fa_graduation_cap.xml)                         | Graduation Cap             |
+| FaGuitar                   | [fa_guitar.xml](app/src/main/res/drawable/fa_guitar.xml)                                         | Guitar                     |
+| FaHammer                   | [fa_hammer.xml](app/src/main/res/drawable/fa_hammer.xml)                                         | Hammer                     |
+| FaHand                     | [fa_hand.xml](app/src/main/res/drawable/fa_hand.xml)                                             | Hand                       |
+| FaHandshake                | [fa_handshake.xml](app/src/main/res/drawable/fa_handshake.xml)                                   | Handshake                  |
+| FaHeart                    | [fa_heart.xml](app/src/main/res/drawable/fa_heart.xml)                                           | Heart                      |
+| FaIceCream                 | [fa_ice_cream.xml](app/src/main/res/drawable/fa_ice_cream.xml)                                   | Ice Cream                  |
+| FaIndustry                 | [fa_industry.xml](app/src/main/res/drawable/fa_industry.xml)                                     | Industry                   |
+| FaMagnet                   | [fa_magnet.xml](app/src/main/res/drawable/fa_magnet.xml)                                         | Magnet                     |
+| FaMap                      | [fa_map.xml](app/src/main/res/drawable/fa_map.xml)                                               | Map                        |
+| FaMeteor                   | [fa_meteor.xml](app/src/main/res/drawable/fa_meteor.xml)                                         | Meteor                     |
+| FaMicroscope               | [fa_microscope.xml](app/src/main/res/drawable/fa_microscope.xml)                                 | Microscope                 |
+| FaMoneyBill                | [fa_money_bill.xml](app/src/main/res/drawable/fa_money_bill.xml)                                 | Money Bill                 |
+| FaMoon                     | [fa_moon.xml](app/src/main/res/drawable/fa_moon.xml)                                             | Moon                       |
+| FaMountainSun              | [fa_mountain_sun.xml](app/src/main/res/drawable/fa_mountain_sun.xml)                             | Mountain Sun               |
+| FaMugHot                   | [fa_mug_hot.xml](app/src/main/res/drawable/fa_mug_hot.xml)                                       | Mug Hot                    |
+| FaMusic                    | [fa_music.xml](app/src/main/res/drawable/fa_music.xml)                                           | Music                      |
+| FaPaw                      | [fa_paw.xml](app/src/main/res/drawable/fa_paw.xml)                                               | Paw                        |
+| FaPenNib                   | [fa_pen_nib.xml](app/src/main/res/drawable/fa_pen_nib.xml)                                       | Pen Nib                    |
+| FaPepperHot                | [fa_pepper_hot.xml](app/src/main/res/drawable/fa_pepper_hot.xml)                                 | Pepper Hot                 |
+| FaPersonBiking             | [fa_person_biking.xml](app/src/main/res/drawable/fa_person_biking.xml)                           | Person Biking              |
+| FaPills                    | [fa_pills.xml](app/src/main/res/drawable/fa_pills.xml)                                           | Pills                      |
+| FaPlane                    | [fa_plane.xml](app/src/main/res/drawable/fa_plane.xml)                                           | Plane                      |
+| FaPlug                     | [fa_plug.xml](app/src/main/res/drawable/fa_plug.xml)                                             | Plug                       |
+| FaPoo                      | [fa_poo.xml](app/src/main/res/drawable/fa_poo.xml)                                               | Poo                        |
+| FaRadiation                | [fa_radiation.xml](app/src/main/res/drawable/fa_radiation.xml)                                   | Radiation                  |
+| FaRadio                    | [fa_radio.xml](app/src/main/res/drawable/fa_radio.xml)                                           | Radio                      |
+| FaRainbow                  | [fa_rainbow.xml](app/src/main/res/drawable/fa_rainbow.xml)                                       | Rainbow                    |
+| FaRibbon                   | [fa_ribbon.xml](app/src/main/res/drawable/fa_ribbon.xml)                                         | Ribbon                     |
+| FaRoad                     | [fa_road.xml](app/src/main/res/drawable/fa_road.xml)                                             | Road                       |
+| FaRocket                   | [fa_rocket.xml](app/src/main/res/drawable/fa_rocket.xml)                                         | Rocket                     |
+| FaSackDollar               | [fa_sack_dollar.xml](app/src/main/res/drawable/fa_sack_dollar.xml)                               | Sack Dollar                |
+| FaScissors                 | [fa_scissors.xml](app/src/main/res/drawable/fa_scissors.xml)                                     | Scissors                   |
+| FaSkull                    | [fa_skull.xml](app/src/main/res/drawable/fa_skull.xml)                                           | Skull                      |
+| FaSeedling                 | [fa_seedling.xml](app/src/main/res/drawable/fa_seedling.xml)                                     | Seedling                   |
+| FaShield                   | [fa_shield.xml](app/src/main/res/drawable/fa_shield.xml)                                         | Shield                     |
+| FaSignsPost                | [fa_signs_post.xml](app/src/main/res/drawable/fa_signs_post.xml)                                 | Signs Post                 |
+| FaSnowflake                | [fa_snowflake.xml](app/src/main/res/drawable/fa_snowflake.xml)                                   | Snowflake                  |
+| FaSocks                    | [fa_socks.xml](app/src/main/res/drawable/fa_socks.xml)                                           | Socks                      |
+| FaSpider                   | [fa_spider.xml](app/src/main/res/drawable/fa_spider.xml)                                         | Spider                     |
+| FaSuitcaseMedical          | [fa_suitcase_medical.xml](app/src/main/res/drawable/fa_suitcase_medical.xml)                     | Suitcase Medical           |
+| FaSun                      | [fa_sun.xml](app/src/main/res/drawable/fa_sun.xml)                                               | Sun                        |
+| FaTemperatureThreeQuarters | [fa_temperature_three_quarters.xml](app/src/main/res/drawable/fa_temperature_three_quarters.xml) | Temperature Three Quarters |
+| FaToiletPaper              | [fa_toilet_paper.xml](app/src/main/res/drawable/fa_toilet_paper.xml)                             | Toilet Paper               |
+| FaTractor                  | [fa_tractor.xml](app/src/main/res/drawable/fa_tractor.xml)                                       | Tractor                    |
+| FaTree                     | [fa_tree.xml](app/src/main/res/drawable/fa_tree.xml)                                             | Tree                       |
+| FaTrophy                   | [fa_trophy.xml](app/src/main/res/drawable/fa_trophy.xml)                                         | Trophy                     |
+| FaUmbrella                 | [fa_umbrella.xml](app/src/main/res/drawable/fa_umbrella.xml)                                     | Umbrella                   |
+| FaUtensils                 | [fa_utensils.xml](app/src/main/res/drawable/fa_utensils.xml)                                     | Utensils                   |
+| FaWineGlass                | [fa_wine_glass.xml](app/src/main/res/drawable/fa_wine_glass.xml)                                 | Wine Glass                 |