From 23bf6b9ffa8e2c7a849ff0d38d29234fb7cd94d6 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Wed, 12 Aug 2020 13:35:31 +0200
Subject: [PATCH] Theme legacy icons as well

We want to prefer the SC accent/design to the Element one on devvices
pre-API-24 as well.

Closes SpiritCroc/SchildiChat-android#4.
---
 legacy_icons.sh                               | 22 ++++++++++++
 .../res/drawable/bg_breadcrumbs_typing.xml    |  4 +--
 vector/src/main/res/drawable/ic_camera.xml    |  4 +--
 vector/src/main/res/drawable/ic_check_on.xml  |  2 +-
 vector/src/main/res/drawable/ic_filter.xml    |  4 +--
 .../main/res/drawable/ic_material_share.xml   | 10 +++---
 .../src/main/res/drawable/ic_plus_circle.xml  |  4 +--
 vector/src/main/res/drawable/ic_search.xml    |  4 +--
 vector/src/main/res/drawable/ic_send.xml      |  2 +-
 .../drawable/ic_settings_root_advanced.xml    | 20 ++++++++---
 .../res/drawable/ic_settings_root_call.xml    | 20 ++++++-----
 .../res/drawable/ic_settings_root_flair.xml   | 25 ++++++++++----
 .../res/drawable/ic_settings_root_general.xml | 26 ++++++++++----
 .../drawable/ic_settings_root_help_about.xml  | 34 +++++++++++++++----
 .../ic_settings_root_ignored_users.xml        | 34 +++++++++++++++----
 .../res/drawable/ic_settings_root_labs.xml    | 20 ++++++-----
 .../res/drawable/ic_settings_root_legacy.xml  |  2 +-
 .../ic_settings_root_notification.xml         | 18 ++++++----
 .../drawable/ic_settings_root_preferences.xml | 18 ++++++----
 .../ic_settings_root_security_privacy.xml     | 26 ++++++++++----
 .../main/res/drawable/ic_shield_custom.xml    |  2 +-
 .../main/res/drawable/ic_shield_trusted.xml   |  2 +-
 vector/src/main/res/drawable/ic_x_18dp.xml    |  2 +-
 vector/src/main/res/drawable/ic_x_green.xml   | 14 ++++++++
 24 files changed, 228 insertions(+), 91 deletions(-)
 create mode 100755 legacy_icons.sh
 create mode 100644 vector/src/main/res/drawable/ic_x_green.xml

diff --git a/legacy_icons.sh b/legacy_icons.sh
new file mode 100755
index 0000000000..8899cb06e0
--- /dev/null
+++ b/legacy_icons.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+set -e
+
+# Generate legacy icons for custom color icons in drawable-anydpi-v24
+
+pushd "$(dirname "$(realpath "$0")")" > /dev/null
+
+desired_accent=`cat vector/src/main/res/values/colors_sc.xml | grep '<color name="accent_sc">' | sed 's|.*>\(.*\)</.*|\1|'`
+
+echo "Hardcode colorAccent to $desired_accent"
+
+for f in vector/src/main/res/drawable-anydpi-v24/*; do
+
+    target_file="vector/src/main/res/drawable/$(basename "$f")"
+    echo "$f -> $target_file"
+    sed "s|?\(android:\)\?\(attr/\)\?colorAccent|$desired_accent|g" "$f" > "$target_file"
+
+done
+
+
+popd > /dev/null
diff --git a/vector/src/main/res/drawable/bg_breadcrumbs_typing.xml b/vector/src/main/res/drawable/bg_breadcrumbs_typing.xml
index 6b70bd1f87..72add57def 100644
--- a/vector/src/main/res/drawable/bg_breadcrumbs_typing.xml
+++ b/vector/src/main/res/drawable/bg_breadcrumbs_typing.xml
@@ -4,5 +4,5 @@
 
     <corners android:radius="40dp" />
 
-    <solid android:color="?colorAccent" />
-</shape>
+    <solid android:color="#8BC34A" />
+</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/ic_camera.xml b/vector/src/main/res/drawable/ic_camera.xml
index af44a317b3..7d682d1f1a 100644
--- a/vector/src/main/res/drawable/ic_camera.xml
+++ b/vector/src/main/res/drawable/ic_camera.xml
@@ -8,7 +8,7 @@
         android:fillType="evenOdd"
         android:pathData="M23,19C23,20.1046 22.1046,21 21,21H3C1.8954,21 1,20.1046 1,19V8C1,6.8954 1.8954,6 3,6H7L9,3H15L17,6H21C22.1046,6 23,6.8954 23,8V19Z"
         android:strokeWidth="2"
-        android:strokeColor="#03B381"
+        android:strokeColor="#8BC34A"
         android:strokeLineCap="round"
         android:strokeLineJoin="round" />
     <path
@@ -16,7 +16,7 @@
         android:fillType="evenOdd"
         android:pathData="M12,17C14.2091,17 16,15.2091 16,13C16,10.7909 14.2091,9 12,9C9.7909,9 8,10.7909 8,13C8,15.2091 9.7909,17 12,17Z"
         android:strokeWidth="2"
-        android:strokeColor="#03B381"
+        android:strokeColor="#8BC34A"
         android:strokeLineCap="round"
         android:strokeLineJoin="round" />
 </vector>
diff --git a/vector/src/main/res/drawable/ic_check_on.xml b/vector/src/main/res/drawable/ic_check_on.xml
index 05439c4df4..e46f234d49 100644
--- a/vector/src/main/res/drawable/ic_check_on.xml
+++ b/vector/src/main/res/drawable/ic_check_on.xml
@@ -7,7 +7,7 @@
         android:fillColor="#00000000"
         android:pathData="M20,7L9,18L4,13"
         android:strokeWidth="2"
-        android:strokeColor="#03B381"
+        android:strokeColor="#8BC34A"
         android:strokeLineCap="round"
         android:strokeLineJoin="round" />
 </vector>
diff --git a/vector/src/main/res/drawable/ic_filter.xml b/vector/src/main/res/drawable/ic_filter.xml
index 740585b17e..82c3146eb2 100644
--- a/vector/src/main/res/drawable/ic_filter.xml
+++ b/vector/src/main/res/drawable/ic_filter.xml
@@ -7,14 +7,14 @@
       android:pathData="M4,6.5h16"
       android:strokeWidth="1.8"
       android:fillColor="#00000000"
-      android:strokeColor="#9E9E9E"
+      android:strokeColor="#8BC34A"
       android:fillType="evenOdd"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M6,12.5h12M9,18.5h6"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#9E9E9E"
+      android:strokeColor="#8BC34A"
       android:fillType="evenOdd"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_material_share.xml b/vector/src/main/res/drawable/ic_material_share.xml
index 5ecbfe3388..87bd8cbc7a 100644
--- a/vector/src/main/res/drawable/ic_material_share.xml
+++ b/vector/src/main/res/drawable/ic_material_share.xml
@@ -3,22 +3,22 @@
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#00000000" android:fillType="evenOdd"
         android:pathData="M18,8C19.6569,8 21,6.6568 21,5C21,3.3431 19.6569,2 18,2C16.3431,2 15,3.3431 15,5C15,6.6568 16.3431,8 18,8Z"
-        android:strokeColor="#03B381" android:strokeLineCap="round"
+        android:strokeColor="#8BC34A" android:strokeLineCap="round"
         android:strokeLineJoin="round" android:strokeWidth="2"/>
     <path android:fillColor="#00000000" android:fillType="evenOdd"
         android:pathData="M6,15C7.6568,15 9,13.6569 9,12C9,10.3431 7.6568,9 6,9C4.3432,9 3,10.3431 3,12C3,13.6569 4.3432,15 6,15Z"
-        android:strokeColor="#03B381" android:strokeLineCap="round"
+        android:strokeColor="#8BC34A" android:strokeLineCap="round"
         android:strokeLineJoin="round" android:strokeWidth="2"/>
     <path android:fillColor="#00000000" android:fillType="evenOdd"
         android:pathData="M18,22C19.6569,22 21,20.6569 21,19C21,17.3431 19.6569,16 18,16C16.3431,16 15,17.3431 15,19C15,20.6569 16.3431,22 18,22Z"
-        android:strokeColor="#03B381" android:strokeLineCap="round"
+        android:strokeColor="#8BC34A" android:strokeLineCap="round"
         android:strokeLineJoin="round" android:strokeWidth="2"/>
     <path android:fillColor="#00000000"
         android:pathData="M8.59,13.51L15.42,17.49"
-        android:strokeColor="#03B381" android:strokeLineCap="round"
+        android:strokeColor="#8BC34A" android:strokeLineCap="round"
         android:strokeLineJoin="round" android:strokeWidth="2"/>
     <path android:fillColor="#00000000"
         android:pathData="M15.41,6.51L8.59,10.49"
-        android:strokeColor="#03B381" android:strokeLineCap="round"
+        android:strokeColor="#8BC34A" android:strokeLineCap="round"
         android:strokeLineJoin="round" android:strokeWidth="2"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_plus_circle.xml b/vector/src/main/res/drawable/ic_plus_circle.xml
index 0b7b4eecd6..374335a0b6 100644
--- a/vector/src/main/res/drawable/ic_plus_circle.xml
+++ b/vector/src/main/res/drawable/ic_plus_circle.xml
@@ -8,7 +8,7 @@
         android:fillType="evenOdd"
         android:pathData="M11,11m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"
         android:strokeWidth="1.4"
-        android:strokeColor="#03B381"
+        android:strokeColor="#8BC34A"
         android:strokeLineCap="round"
         android:strokeLineJoin="round" />
     <path
@@ -16,7 +16,7 @@
         android:fillType="evenOdd"
         android:pathData="M11,7v8M7,11h8"
         android:strokeWidth="1.4"
-        android:strokeColor="#03B381"
+        android:strokeColor="#8BC34A"
         android:strokeLineCap="round"
         android:strokeLineJoin="round" />
 </vector>
diff --git a/vector/src/main/res/drawable/ic_search.xml b/vector/src/main/res/drawable/ic_search.xml
index e72df715cf..c13110082f 100644
--- a/vector/src/main/res/drawable/ic_search.xml
+++ b/vector/src/main/res/drawable/ic_search.xml
@@ -9,7 +9,7 @@
       android:strokeWidth="2"
       android:fillColor="#00000000"
       android:fillType="evenOdd"
-      android:strokeColor="#9E9E9E"
+      android:strokeColor="#8BC34A"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M19,19l-4.35,-4.35"
@@ -17,6 +17,6 @@
       android:strokeWidth="2"
       android:fillColor="#00000000"
       android:fillType="evenOdd"
-      android:strokeColor="#9E9E9E"
+      android:strokeColor="#8BC34A"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_send.xml b/vector/src/main/res/drawable/ic_send.xml
index d79ba7c126..58fe20936f 100644
--- a/vector/src/main/res/drawable/ic_send.xml
+++ b/vector/src/main/res/drawable/ic_send.xml
@@ -9,6 +9,6 @@
       android:strokeWidth="2"
       android:fillColor="#00000000"
       android:fillType="evenOdd"
-      android:strokeColor="#03B381"
+      android:strokeColor="#8BC34A"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_settings_root_advanced.xml b/vector/src/main/res/drawable/ic_settings_root_advanced.xml
index fbcd165cda..11ba50ac81 100644
--- a/vector/src/main/res/drawable/ic_settings_root_advanced.xml
+++ b/vector/src/main/res/drawable/ic_settings_root_advanced.xml
@@ -1,5 +1,17 @@
-<vector android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="?riotx_header_panel_text_secondary" android:fillType="evenOdd" android:pathData="M22,12C22,17.5228 17.5228,22 12,22C6.4771,22 2,17.5228 2,12C2,6.4771 6.4771,2 12,2C17.5228,2 22,6.4771 22,12ZM8.5,12C8.5,12.8284 7.8284,13.5 7,13.5C6.1716,13.5 5.5,12.8284 5.5,12C5.5,11.1716 6.1716,10.5 7,10.5C7.8284,10.5 8.5,11.1716 8.5,12ZM12.25,13.5C13.0784,13.5 13.75,12.8284 13.75,12C13.75,11.1716 13.0784,10.5 12.25,10.5C11.4216,10.5 10.75,11.1716 10.75,12C10.75,12.8284 11.4216,13.5 12.25,13.5ZM19,12C19,12.8284 18.3284,13.5 17.5,13.5C16.6716,13.5 16,12.8284 16,12C16,11.1716 16.6716,10.5 17.5,10.5C18.3284,10.5 19,11.1716 19,12Z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="22dp"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
+  <path
+      android:pathData="M11,11m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#8BC34A"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M 14,11 A 1.5,1.5 0 0 1 15.5,9.5 1.5,1.5 0 0 1 17,11 1.5,1.5 0 0 1 15.5,12.5 1.5,1.5 0 0 1 14,11 M 9.5,11 A 1.5,1.5 0 0 1 11,9.5 1.5,1.5 0 0 1 12.5,11 1.5,1.5 0 0 1 11,12.5 1.5,1.5 0 0 1 9.5,11 M 5,11 A 1.5,1.5 0 0 1 6.5,9.5 1.5,1.5 0 0 1 8,11 1.5,1.5 0 0 1 6.5,12.5 1.5,1.5 0 0 1 5,11 Z"
+      android:fillColor="#8BC34A" />
 </vector>
diff --git a/vector/src/main/res/drawable/ic_settings_root_call.xml b/vector/src/main/res/drawable/ic_settings_root_call.xml
index 0742e16e0d..388890da4d 100644
--- a/vector/src/main/res/drawable/ic_settings_root_call.xml
+++ b/vector/src/main/res/drawable/ic_settings_root_call.xml
@@ -1,12 +1,14 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="25dp"
-    android:height="25dp"
-    android:viewportWidth="25"
-    android:viewportHeight="25">
+    android:width="22dp"
+    android:height="22dp"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
   <path
-      android:pathData="M0.5,8C0.5,6.3432 1.8432,5 3.5,5H14.5C16.1569,5 17.5,6.3432 17.5,8V17C17.5,18.6569 16.1569,20 14.5,20H3.5C1.8432,20 0.5,18.6569 0.5,17V8Z"
-      android:fillColor="?riotx_header_panel_text_secondary"/>
-  <path
-      android:pathData="M19.4229,9.4388L23.5259,6.8221C23.9142,6.5744 24.4229,6.8533 24.4229,7.3139V17.545C24.4229,18.0326 23.8601,18.305 23.4777,18.0025L19.4229,14.7959V9.4388Z"
-      android:fillColor="?riotx_header_panel_text_secondary"/>
+      android:pathData="M21,15.92v3a2,2 0,0 1,-2.18 2,19.79 19.79,0 0,1 -8.63,-3.07 19.5,19.5 0,0 1,-6 -6,19.79 19.79,0 0,1 -3.07,-8.67A2,2 0,0 1,3.11 1h3a2,2 0,0 1,2 1.72c0.127,0.96 0.361,1.903 0.7,2.81a2,2 0,0 1,-0.45 2.11L7.09,8.91a16,16 0,0 0,6 6l1.27,-1.27a2,2 0,0 1,2.11 -0.45c0.907,0.339 1.85,0.573 2.81,0.7A2,2 0,0 1,21 15.92z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:fillType="evenOdd"
+      android:strokeColor="#8BC34A"
+      android:strokeLineCap="round"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_settings_root_flair.xml b/vector/src/main/res/drawable/ic_settings_root_flair.xml
index 36b282455b..ceefe16155 100644
--- a/vector/src/main/res/drawable/ic_settings_root_flair.xml
+++ b/vector/src/main/res/drawable/ic_settings_root_flair.xml
@@ -1,9 +1,22 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="25dp"
-    android:height="25dp"
-    android:viewportWidth="25"
-    android:viewportHeight="25">
+    android:width="16dp"
+    android:height="24dp"
+    android:viewportWidth="16"
+    android:viewportHeight="24">
   <path
-      android:pathData="M12.4893,23C13.1012,23 13.6058,22.5491 13.6917,21.9156C14.6258,15.3344 15.5169,14.4325 21.8727,13.7132C22.5169,13.638 23,13.112 23,12.5C23,11.8773 22.5276,11.3727 21.8834,11.2868C15.5598,10.4601 14.7439,9.6549 13.6917,3.0736C13.5844,2.4402 13.1012,2 12.4893,2C11.888,2 11.3834,2.4402 11.2868,3.0844C10.3635,9.6656 9.4724,10.5675 3.1166,11.2868C2.4724,11.362 2,11.8773 2,12.5C2,13.112 2.4617,13.6273 3.1166,13.7132C9.4402,14.5936 10.2239,15.3451 11.2868,21.9264C11.4049,22.5598 11.8988,23 12.4893,23Z"
-      android:fillColor="?riotx_header_panel_text_secondary"/>
+      android:pathData="M8,8m-7,0a7,7 0,1 1,14 0a7,7 0,1 1,-14 0"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:fillType="evenOdd"
+      android:strokeColor="#8BC34A"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M4.21,13.89L3,23l5,-3 5,3 -1.21,-9.12"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:fillType="evenOdd"
+      android:strokeColor="#8BC34A"
+      android:strokeLineCap="round"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_settings_root_general.xml b/vector/src/main/res/drawable/ic_settings_root_general.xml
index a07bf7a164..8173b07b3f 100644
--- a/vector/src/main/res/drawable/ic_settings_root_general.xml
+++ b/vector/src/main/res/drawable/ic_settings_root_general.xml
@@ -1,10 +1,22 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="25dp"
-    android:height="25dp"
-    android:viewportWidth="25"
-    android:viewportHeight="25">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
   <path
-      android:pathData="M20.5988,9.5162C20.8188,10.0938 21.3825,10.4788 22.0013,10.4788C22.8263,10.4788 23.5,11.1525 23.5,11.9775V13.0225C23.5,13.8475 22.8263,14.5213 22.0013,14.5213C21.3825,14.5213 20.8188,14.9062 20.5988,15.4838C20.5806,15.5292 20.5624,15.5753 20.5441,15.6218C20.4792,15.7863 20.4125,15.9555 20.3375,16.1163C20.0763,16.68 20.2,17.34 20.64,17.78C21.2313,18.3575 21.2313,19.3062 20.64,19.8975L19.8975,20.64C19.32,21.2313 18.3713,21.2313 17.78,20.64C17.3538,20.2 16.68,20.0763 16.1163,20.3375C15.91,20.4338 15.7037,20.5163 15.4838,20.5988C14.9062,20.8188 14.5213,21.3825 14.5213,22.0013C14.5213,22.8263 13.8475,23.5 13.0225,23.5H11.9775C11.1525,23.5 10.4788,22.8263 10.4788,22.0013C10.4788,21.3825 10.0938,20.8188 9.5162,20.5988C9.4708,20.5806 9.4247,20.5624 9.3781,20.544C9.2137,20.4792 9.0445,20.4125 8.8837,20.3375C8.32,20.0763 7.66,20.2 7.22,20.64C6.6425,21.2313 5.6937,21.2313 5.1025,20.64L4.36,19.8975C3.7687,19.32 3.7687,18.3713 4.36,17.78C4.8,17.3538 4.9237,16.68 4.6625,16.1163C4.5662,15.91 4.4837,15.7037 4.4012,15.4838C4.1813,14.9062 3.6175,14.5213 2.9987,14.5213C2.1737,14.5213 1.5,13.8475 1.5,13.0225V11.9775C1.5,11.1525 2.1737,10.4788 2.9987,10.4788C3.6175,10.4788 4.1813,10.0938 4.4012,9.5162C4.4446,9.3774 4.499,9.2441 4.5539,9.1093C4.586,9.0305 4.6183,8.9512 4.6487,8.87C4.91,8.3062 4.7863,7.6462 4.3463,7.2063C3.755,6.6287 3.755,5.68 4.3463,5.0887L5.1025,4.36C5.68,3.7687 6.6287,3.7687 7.22,4.36C7.6462,4.8 8.32,4.9237 8.8837,4.6625C9.09,4.5662 9.2963,4.47 9.5162,4.4012C10.0938,4.1813 10.4788,3.6175 10.4788,2.9987C10.4788,2.1737 11.1525,1.5 11.9775,1.5H13.0225C13.8475,1.5 14.5213,2.1737 14.5213,2.9987C14.5213,3.6312 14.9062,4.1813 15.4838,4.4012C15.5292,4.4194 15.5753,4.4376 15.6218,4.4559C15.7863,4.5208 15.9555,4.5875 16.1163,4.6625C16.68,4.9237 17.34,4.8 17.78,4.36C18.3575,3.7687 19.3062,3.7687 19.8975,4.36L20.64,5.1025C21.2313,5.68 21.2313,6.6287 20.64,7.22C20.2,7.6462 20.0763,8.32 20.3375,8.8837C20.4338,9.09 20.5163,9.2963 20.5988,9.5162ZM12.5,18C9.4613,18 7,15.5387 7,12.5C7,9.4613 9.4613,7 12.5,7C15.5387,7 18,9.4613 18,12.5C18,15.5387 15.5387,18 12.5,18Z"
-      android:fillColor="?riotx_header_panel_text_secondary"
-      android:fillType="evenOdd"/>
+      android:pathData="M12,12m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:fillType="evenOdd"
+      android:strokeColor="#8BC34A"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M19.4,15a1.65,1.65 0,0 0,0.33 1.82l0.06,0.06a2,2 0,1 1,-2.83 2.83l-0.06,-0.06a1.65,1.65 0,0 0,-1.82 -0.33,1.65 1.65,0 0,0 -1,1.51L14.08,21a2,2 0,1 1,-4 0v-0.09A1.65,1.65 0,0 0,9 19.4a1.65,1.65 0,0 0,-1.82 0.33l-0.06,0.06a2,2 0,1 1,-2.83 -2.83l0.06,-0.06a1.65,1.65 0,0 0,0.33 -1.82,1.65 1.65,0 0,0 -1.51,-1L3,14.08a2,2 0,1 1,0 -4h0.09A1.65,1.65 0,0 0,4.6 9a1.65,1.65 0,0 0,-0.33 -1.82l-0.06,-0.06a2,2 0,1 1,2.83 -2.83l0.06,0.06a1.65,1.65 0,0 0,1.82 0.33L9,4.68a1.65,1.65 0,0 0,1 -1.51L10,3a2,2 0,1 1,4 0v0.09a1.65,1.65 0,0 0,1 1.51,1.65 1.65,0 0,0 1.82,-0.33l0.06,-0.06a2,2 0,1 1,2.83 2.83l-0.06,0.06a1.65,1.65 0,0 0,-0.33 1.82L19.32,9c0.26,0.604 0.852,0.997 1.51,1L21,10a2,2 0,1 1,0 4h-0.09a1.65,1.65 0,0 0,-1.51 1z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:fillType="evenOdd"
+      android:strokeColor="#8BC34A"
+      android:strokeLineCap="round"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_settings_root_help_about.xml b/vector/src/main/res/drawable/ic_settings_root_help_about.xml
index 0c79955cba..369ce4f535 100644
--- a/vector/src/main/res/drawable/ic_settings_root_help_about.xml
+++ b/vector/src/main/res/drawable/ic_settings_root_help_about.xml
@@ -1,10 +1,30 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="25dp"
-    android:height="25dp"
-    android:viewportWidth="25"
-    android:viewportHeight="25">
+    android:width="22dp"
+    android:height="22dp"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
   <path
-      android:pathData="M12.5,22.5C18.0228,22.5 22.5,18.0228 22.5,12.5C22.5,6.9771 18.0228,2.5 12.5,2.5C6.9771,2.5 2.5,6.9771 2.5,12.5C2.5,18.0228 6.9771,22.5 12.5,22.5ZM12.5002,18.6458C13.1905,18.6458 13.7502,18.0862 13.7502,17.3958C13.7502,16.7055 13.1905,16.1458 12.5002,16.1458C11.8098,16.1458 11.2502,16.7055 11.2502,17.3958C11.2502,18.0862 11.8098,18.6458 12.5002,18.6458ZM10.7636,10.6163C10.7636,9.6542 11.5442,8.8802 12.4997,8.8802C13.4524,8.8802 14.2358,9.6636 14.2358,10.6163C14.2358,11.0576 14.0471,11.215 13.3036,11.7287C12.9741,11.9563 12.5223,12.2725 12.1705,12.7362C11.7939,13.2327 11.5622,13.8517 11.5622,14.6389H13.4372C13.4372,14.2533 13.5396,14.0339 13.6643,13.8695C13.8138,13.6724 14.0304,13.5055 14.3694,13.2713C14.405,13.2467 14.4426,13.2212 14.4818,13.1945C15.0963,12.7765 16.1108,12.0865 16.1108,10.6163C16.1108,8.6281 14.4879,7.0052 12.4997,7.0052C10.5142,7.0052 8.8885,8.6132 8.8885,10.6163H10.7636Z"
-      android:fillColor="?riotx_header_panel_text_secondary"
-      android:fillType="evenOdd"/>
+      android:pathData="M11,11m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#8BC34A"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M8.09,8C8.5754,6.62 9.9854,5.7914 11.4272,6.0387C12.869,6.286 13.9222,7.5372 13.92,9C13.92,11 10.92,12 10.92,12"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#8BC34A"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M11.0002,15.9913L11,15.9913"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#8BC34A"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_settings_root_ignored_users.xml b/vector/src/main/res/drawable/ic_settings_root_ignored_users.xml
index cf039d55dc..74cb9e754a 100644
--- a/vector/src/main/res/drawable/ic_settings_root_ignored_users.xml
+++ b/vector/src/main/res/drawable/ic_settings_root_ignored_users.xml
@@ -1,10 +1,30 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="25dp"
-    android:height="25dp"
-    android:viewportWidth="25"
-    android:viewportHeight="25">
+    android:width="17dp"
+    android:height="20dp"
+    android:viewportWidth="17"
+    android:viewportHeight="20">
   <path
-      android:pathData="M22.5,12.5C22.5,18.0228 18.0228,22.5 12.5,22.5C6.9771,22.5 2.5,18.0228 2.5,12.5C2.5,6.9771 6.9771,2.5 12.5,2.5C18.0228,2.5 22.5,6.9771 22.5,12.5ZM7,11.25C6.7239,11.25 6.5,11.4739 6.5,11.75V13.25C6.5,13.5261 6.7239,13.75 7,13.75H18C18.2761,13.75 18.5,13.5261 18.5,13.25V11.75C18.5,11.4739 18.2761,11.25 18,11.25H7Z"
-      android:fillColor="?riotx_header_panel_text_secondary"
-      android:fillType="evenOdd"/>
+      android:pathData="M16,19v-2a4,4 0,0 0,-4 -4H5a4,4 0,0 0,-4 4v2"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:fillType="evenOdd"
+      android:strokeColor="#8BC34A"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M8.5,5m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:fillType="evenOdd"
+      android:strokeColor="#8BC34A"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M5.672,2.172l5.656,5.656"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:fillType="evenOdd"
+      android:strokeColor="#8BC34A"
+      android:strokeLineCap="round"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_settings_root_labs.xml b/vector/src/main/res/drawable/ic_settings_root_labs.xml
index 5416ad7089..50e6ac02bd 100644
--- a/vector/src/main/res/drawable/ic_settings_root_labs.xml
+++ b/vector/src/main/res/drawable/ic_settings_root_labs.xml
@@ -1,12 +1,14 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="25dp"
-    android:height="25dp"
-    android:viewportWidth="25"
-    android:viewportHeight="25">
+    android:width="18dp"
+    android:height="22dp"
+    android:viewportWidth="18"
+    android:viewportHeight="22">
   <path
-      android:pathData="M5.25,22.5C4.5596,22.5 4,21.9404 4,21.25V12.8687C4,12.6622 4.275,12.5 4.625,12.5H5.875C6.225,12.5 6.5,12.6622 6.5,12.8687V21.25C6.5,21.9404 5.9404,22.5 5.25,22.5Z"
-      android:fillColor="?riotx_header_panel_text_secondary"/>
-  <path
-      android:pathData="M7.3481,2.5C4.8899,2.5 4.0004,4.1544 4.0004,5.1811V15.9785H5.8277C9.6771,14.2291 13.4294,17.5377 17.3919,17.4997C21.3545,17.4616 21.5,15.3319 21.5,14.267V5.7136C21.5,2.2337 19.0904,5.5804 14.9982,4.2304C11.4458,3.0584 10.8053,2.5 7.3481,2.5Z"
-      android:fillColor="?riotx_header_panel_text_secondary"/>
+      android:pathData="M1,14s1,-1 4,-1 5,2 8,2 4,-1 4,-1V2s-1,1 -4,1 -5,-2 -8,-2 -4,1 -4,1v12zM1,21v-7"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:fillType="evenOdd"
+      android:strokeColor="#8BC34A"
+      android:strokeLineCap="round"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_settings_root_legacy.xml b/vector/src/main/res/drawable/ic_settings_root_legacy.xml
index c56a7d31f8..9ad4d4a0f7 100644
--- a/vector/src/main/res/drawable/ic_settings_root_legacy.xml
+++ b/vector/src/main/res/drawable/ic_settings_root_legacy.xml
@@ -9,6 +9,6 @@
       android:strokeWidth="2"
       android:fillColor="#00000000"
       android:fillType="evenOdd"
-      android:strokeColor="#7E899C"
+      android:strokeColor="#8BC34A"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_settings_root_notification.xml b/vector/src/main/res/drawable/ic_settings_root_notification.xml
index bf3786aeab..ed6d5ef6d2 100644
--- a/vector/src/main/res/drawable/ic_settings_root_notification.xml
+++ b/vector/src/main/res/drawable/ic_settings_root_notification.xml
@@ -1,10 +1,14 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="25dp"
-    android:height="25dp"
-    android:viewportWidth="25"
-    android:viewportHeight="25">
+    android:width="20dp"
+    android:height="22dp"
+    android:viewportWidth="20"
+    android:viewportHeight="22">
   <path
-      android:pathData="M13.4923,3.0211C13.4974,2.9731 13.5,2.9243 13.5,2.875C13.5,2.1156 12.8844,1.5 12.125,1.5C11.3656,1.5 10.75,2.1156 10.75,2.875C10.75,2.9243 10.7526,2.9731 10.7577,3.0211C7.7183,3.6742 5.25,6.4401 5.25,9.75V14.425C5.25,15.6625 4.5625,16.4875 3.7513,16.9688C3.2013,17.2988 2.5,17.7525 2.5,18.3025C2.5,18.935 2.8988,19.3613 3.7238,19.3613H12.125H20.5263C21.3513,19.3613 21.75,18.9213 21.75,18.3025C21.75,17.7525 21.0625,17.2988 20.4988,16.9688C19.6738,16.4875 19,15.6763 19,14.425V9.75C19,6.4401 16.5317,3.6742 13.4923,3.0211ZM10.1863,20.75C10.1038,20.97 10.0625,21.19 10.0625,21.4375C10.0625,22.5788 10.9838,23.5 12.125,23.5C13.2663,23.5 14.1875,22.5788 14.1875,21.4375C14.1875,21.19 14.1325,20.97 14.0638,20.75H10.1863Z"
-      android:fillColor="?riotx_header_panel_text_secondary"
-      android:fillType="evenOdd"/>
+      android:pathData="M16,7A6,6 0,1 0,4 7c0,7 -3,9 -3,9h18s-3,-2 -3,-9M11.73,20a2,2 0,0 1,-3.46 0"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:fillType="evenOdd"
+      android:strokeColor="#8BC34A"
+      android:strokeLineCap="round"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_settings_root_preferences.xml b/vector/src/main/res/drawable/ic_settings_root_preferences.xml
index 1aa5e338f0..f7ac84ddab 100644
--- a/vector/src/main/res/drawable/ic_settings_root_preferences.xml
+++ b/vector/src/main/res/drawable/ic_settings_root_preferences.xml
@@ -1,10 +1,14 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="25dp"
-    android:height="25dp"
-    android:viewportWidth="25"
-    android:viewportHeight="25">
+    android:width="24dp"
+    android:height="20dp"
+    android:viewportWidth="24"
+    android:viewportHeight="20">
   <path
-      android:pathData="M8.5,4.5C4.0817,4.5 0.5,8.0817 0.5,12.5C0.5,16.9183 4.0817,20.5 8.5,20.5H16.5C20.9183,20.5 24.5,16.9183 24.5,12.5C24.5,8.0817 20.9183,4.5 16.5,4.5H8.5ZM13.5,12.5C13.5,15.2614 11.2614,17.5 8.5,17.5C5.7386,17.5 3.5,15.2614 3.5,12.5C3.5,9.7386 5.7386,7.5 8.5,7.5C11.2614,7.5 13.5,9.7386 13.5,12.5Z"
-      android:fillColor="?riotx_header_panel_text_secondary"
-      android:fillType="evenOdd"/>
+      android:pathData="M4,19v-7M4,8V1M12,19v-9M12,6V1M20,19v-5M20,10V1M1,12h6M9,6h6M17,14h6"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:fillType="evenOdd"
+      android:strokeColor="#8BC34A"
+      android:strokeLineCap="round"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_settings_root_security_privacy.xml b/vector/src/main/res/drawable/ic_settings_root_security_privacy.xml
index 194eec1be3..647463e5e6 100644
--- a/vector/src/main/res/drawable/ic_settings_root_security_privacy.xml
+++ b/vector/src/main/res/drawable/ic_settings_root_security_privacy.xml
@@ -1,10 +1,22 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="25dp"
-    android:height="25dp"
-    android:viewportWidth="25"
-    android:viewportHeight="25">
+    android:width="20dp"
+    android:height="22dp"
+    android:viewportWidth="20"
+    android:viewportHeight="22">
   <path
-      android:pathData="M11.8333,2.5C8.8878,2.5 6.5,4.8878 6.5,7.8333V10.5C5.3954,10.5 4.5,11.3954 4.5,12.5V20.5C4.5,21.6046 5.3954,22.5 6.5,22.5H18.5C19.6046,22.5 20.5,21.6046 20.5,20.5V12.5C20.5,11.3954 19.6046,10.5 18.5,10.5V7.8333C18.5,4.8878 16.1122,2.5 13.1667,2.5H11.8333ZM15.8333,10.5V7.8333C15.8333,6.3606 14.6394,5.1667 13.1667,5.1667H11.8333C10.3606,5.1667 9.1667,6.3606 9.1667,7.8333V10.5H15.8333Z"
-      android:fillColor="?riotx_header_panel_text_secondary"
-      android:fillType="evenOdd"/>
+      android:pathData="M3,10L17,10A2,2 0,0 1,19 12L19,19A2,2 0,0 1,17 21L3,21A2,2 0,0 1,1 19L1,12A2,2 0,0 1,3 10z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:fillType="evenOdd"
+      android:strokeColor="#8BC34A"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M5,10L5,6a5,5 0,1 1,10 0v4"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:fillType="evenOdd"
+      android:strokeColor="#8BC34A"
+      android:strokeLineCap="round"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_shield_custom.xml b/vector/src/main/res/drawable/ic_shield_custom.xml
index cb5e98c033..8d96d86bdf 100644
--- a/vector/src/main/res/drawable/ic_shield_custom.xml
+++ b/vector/src/main/res/drawable/ic_shield_custom.xml
@@ -7,7 +7,7 @@
       android:strokeWidth="1"
       android:pathData="M12,21C12,21 21,17.2 21,11.5V4.85L12,2L3,4.85V11.5C3,17.2 12,21 12,21Z"
       android:strokeLineJoin="round"
-      android:fillColor="#03B381"
+      android:fillColor="#8BC34A"
       android:fillType="evenOdd"
       android:strokeColor="#ffffff"
       android:strokeLineCap="round"/>
diff --git a/vector/src/main/res/drawable/ic_shield_trusted.xml b/vector/src/main/res/drawable/ic_shield_trusted.xml
index 56f0aa0b63..55e63afdf7 100644
--- a/vector/src/main/res/drawable/ic_shield_trusted.xml
+++ b/vector/src/main/res/drawable/ic_shield_trusted.xml
@@ -7,7 +7,7 @@
       android:strokeWidth="1"
       android:pathData="M12,21C12,21 21,17.2 21,11.5V4.85L12,2L3,4.85V11.5C3,17.2 12,21 12,21Z"
       android:strokeLineJoin="round"
-      android:fillColor="#03B381"
+      android:fillColor="#8BC34A"
       android:fillType="evenOdd"
       android:strokeColor="#ffffff"
       android:strokeLineCap="round"/>
diff --git a/vector/src/main/res/drawable/ic_x_18dp.xml b/vector/src/main/res/drawable/ic_x_18dp.xml
index 3172da8cc2..85f75720bc 100644
--- a/vector/src/main/res/drawable/ic_x_18dp.xml
+++ b/vector/src/main/res/drawable/ic_x_18dp.xml
@@ -9,6 +9,6 @@
       android:strokeWidth="2.333"
       android:fillColor="#00000000"
       android:fillType="evenOdd"
-      android:strokeColor="#03B381"
+      android:strokeColor="#8BC34A"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_x_green.xml b/vector/src/main/res/drawable/ic_x_green.xml
new file mode 100644
index 0000000000..999ba1e620
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_x_green.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="14dp"
+    android:height="14dp"
+    android:viewportWidth="14"
+    android:viewportHeight="14">
+  <path
+      android:pathData="M13,1L1,13M1,1l12,12"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:fillType="evenOdd"
+      android:strokeColor="#8BC34A"
+      android:strokeLineCap="round"/>
+</vector>