diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml
index 73bbff07de..bb4647f96e 100644
--- a/com.discord/apktool.yml
+++ b/com.discord/apktool.yml
@@ -1,5 +1,5 @@
!!brut.androlib.meta.MetaInfo
-apkFileName: com.discord-1243.apk
+apkFileName: com.discord-1244.apk
compressionType: false
doNotCompress:
- resources.arsc
@@ -3106,5 +3106,5 @@ usesFramework:
tag: null
version: 2.4.2-83a459-SNAPSHOT
versionInfo:
- versionCode: '1243'
- versionName: '36.3'
+ versionCode: '1244'
+ versionName: '35.4'
diff --git a/com.discord/original/AndroidManifest.xml b/com.discord/original/AndroidManifest.xml
index 9b899777de..7df1bdd054 100644
Binary files a/com.discord/original/AndroidManifest.xml and b/com.discord/original/AndroidManifest.xml differ
diff --git a/com.discord/res/drawable-anydpi-v24/ic_call_24dp.xml b/com.discord/res/drawable-anydpi-v24/ic_call_24dp.xml
deleted file mode 100644
index ac2abcf767..0000000000
--- a/com.discord/res/drawable-anydpi-v24/ic_call_24dp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/drawable-anydpi-v24/ic_call_audio_stop_grey_24dp.xml b/com.discord/res/drawable-anydpi-v24/ic_call_audio_stop_grey_24dp.xml
new file mode 100644
index 0000000000..b73e4ef2c9
--- /dev/null
+++ b/com.discord/res/drawable-anydpi-v24/ic_call_audio_stop_grey_24dp.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable-anydpi-v24/ic_call_audio_stop_white_24dp.xml b/com.discord/res/drawable-anydpi-v24/ic_call_audio_stop_white_24dp.xml
new file mode 100644
index 0000000000..24603545f0
--- /dev/null
+++ b/com.discord/res/drawable-anydpi-v24/ic_call_audio_stop_white_24dp.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable-anydpi-v24/ic_call_disconnect_24dp.xml b/com.discord/res/drawable-anydpi-v24/ic_call_disconnect_24dp.xml
index 84f7325839..373e7bfb0d 100644
--- a/com.discord/res/drawable-anydpi-v24/ic_call_disconnect_24dp.xml
+++ b/com.discord/res/drawable-anydpi-v24/ic_call_disconnect_24dp.xml
@@ -1,5 +1,7 @@
-
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable-anydpi-v24/ic_header_members_add_grey_24dp.xml b/com.discord/res/drawable-anydpi-v24/ic_header_members_add_grey_24dp.xml
new file mode 100644
index 0000000000..41ff222d16
--- /dev/null
+++ b/com.discord/res/drawable-anydpi-v24/ic_header_members_add_grey_24dp.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable-anydpi-v24/ic_members_24dp.xml b/com.discord/res/drawable-anydpi-v24/ic_members_24dp.xml
deleted file mode 100644
index c2e62df01a..0000000000
--- a/com.discord/res/drawable-anydpi-v24/ic_members_24dp.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/drawable-hdpi/ic_call_24dp.png b/com.discord/res/drawable-hdpi/ic_call_24dp.png
deleted file mode 100644
index 98c5e23eb1..0000000000
Binary files a/com.discord/res/drawable-hdpi/ic_call_24dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-hdpi/ic_call_audio_stop_grey_24dp.png b/com.discord/res/drawable-hdpi/ic_call_audio_stop_grey_24dp.png
new file mode 100644
index 0000000000..d8a8b5d6bb
Binary files /dev/null and b/com.discord/res/drawable-hdpi/ic_call_audio_stop_grey_24dp.png differ
diff --git a/com.discord/res/drawable-hdpi/ic_call_audio_stop_white_24dp.png b/com.discord/res/drawable-hdpi/ic_call_audio_stop_white_24dp.png
new file mode 100644
index 0000000000..4dd5394d98
Binary files /dev/null and b/com.discord/res/drawable-hdpi/ic_call_audio_stop_white_24dp.png differ
diff --git a/com.discord/res/drawable-hdpi/ic_call_disconnect_24dp.png b/com.discord/res/drawable-hdpi/ic_call_disconnect_24dp.png
index 0b5d1a100a..565a39cd1e 100644
Binary files a/com.discord/res/drawable-hdpi/ic_call_disconnect_24dp.png and b/com.discord/res/drawable-hdpi/ic_call_disconnect_24dp.png differ
diff --git a/com.discord/res/drawable-hdpi/ic_header_members_add_grey_24dp.png b/com.discord/res/drawable-hdpi/ic_header_members_add_grey_24dp.png
new file mode 100644
index 0000000000..a20a98583d
Binary files /dev/null and b/com.discord/res/drawable-hdpi/ic_header_members_add_grey_24dp.png differ
diff --git a/com.discord/res/drawable-hdpi/ic_members_24dp.png b/com.discord/res/drawable-hdpi/ic_members_24dp.png
deleted file mode 100644
index e7028f18c3..0000000000
Binary files a/com.discord/res/drawable-hdpi/ic_members_24dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-ldpi/ic_call_24dp.png b/com.discord/res/drawable-ldpi/ic_call_24dp.png
deleted file mode 100644
index e5171a66b8..0000000000
Binary files a/com.discord/res/drawable-ldpi/ic_call_24dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-ldpi/ic_call_audio_stop_grey_24dp.png b/com.discord/res/drawable-ldpi/ic_call_audio_stop_grey_24dp.png
new file mode 100644
index 0000000000..12dace57be
Binary files /dev/null and b/com.discord/res/drawable-ldpi/ic_call_audio_stop_grey_24dp.png differ
diff --git a/com.discord/res/drawable-ldpi/ic_call_audio_stop_white_24dp.png b/com.discord/res/drawable-ldpi/ic_call_audio_stop_white_24dp.png
new file mode 100644
index 0000000000..7ae44c87c2
Binary files /dev/null and b/com.discord/res/drawable-ldpi/ic_call_audio_stop_white_24dp.png differ
diff --git a/com.discord/res/drawable-ldpi/ic_call_disconnect_24dp.png b/com.discord/res/drawable-ldpi/ic_call_disconnect_24dp.png
index 75ebfb6fdd..77a779a394 100644
Binary files a/com.discord/res/drawable-ldpi/ic_call_disconnect_24dp.png and b/com.discord/res/drawable-ldpi/ic_call_disconnect_24dp.png differ
diff --git a/com.discord/res/drawable-ldpi/ic_header_members_add_grey_24dp.png b/com.discord/res/drawable-ldpi/ic_header_members_add_grey_24dp.png
new file mode 100644
index 0000000000..dfde5e6cce
Binary files /dev/null and b/com.discord/res/drawable-ldpi/ic_header_members_add_grey_24dp.png differ
diff --git a/com.discord/res/drawable-ldpi/ic_members_24dp.png b/com.discord/res/drawable-ldpi/ic_members_24dp.png
deleted file mode 100644
index 81f2fb36ed..0000000000
Binary files a/com.discord/res/drawable-ldpi/ic_members_24dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-mdpi/ic_call_24dp.png b/com.discord/res/drawable-mdpi/ic_call_24dp.png
deleted file mode 100644
index 6b61e0827d..0000000000
Binary files a/com.discord/res/drawable-mdpi/ic_call_24dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-mdpi/ic_call_audio_stop_grey_24dp.png b/com.discord/res/drawable-mdpi/ic_call_audio_stop_grey_24dp.png
new file mode 100644
index 0000000000..ef7eb6196c
Binary files /dev/null and b/com.discord/res/drawable-mdpi/ic_call_audio_stop_grey_24dp.png differ
diff --git a/com.discord/res/drawable-mdpi/ic_call_audio_stop_white_24dp.png b/com.discord/res/drawable-mdpi/ic_call_audio_stop_white_24dp.png
new file mode 100644
index 0000000000..65f57ac9f3
Binary files /dev/null and b/com.discord/res/drawable-mdpi/ic_call_audio_stop_white_24dp.png differ
diff --git a/com.discord/res/drawable-mdpi/ic_call_disconnect_24dp.png b/com.discord/res/drawable-mdpi/ic_call_disconnect_24dp.png
index dfb5410463..c5eea76044 100644
Binary files a/com.discord/res/drawable-mdpi/ic_call_disconnect_24dp.png and b/com.discord/res/drawable-mdpi/ic_call_disconnect_24dp.png differ
diff --git a/com.discord/res/drawable-mdpi/ic_header_members_add_grey_24dp.png b/com.discord/res/drawable-mdpi/ic_header_members_add_grey_24dp.png
new file mode 100644
index 0000000000..f5964885d6
Binary files /dev/null and b/com.discord/res/drawable-mdpi/ic_header_members_add_grey_24dp.png differ
diff --git a/com.discord/res/drawable-mdpi/ic_members_24dp.png b/com.discord/res/drawable-mdpi/ic_members_24dp.png
deleted file mode 100644
index 58f7d91ee7..0000000000
Binary files a/com.discord/res/drawable-mdpi/ic_members_24dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-xhdpi/ic_call_24dp.png b/com.discord/res/drawable-xhdpi/ic_call_24dp.png
deleted file mode 100644
index fd80809c2c..0000000000
Binary files a/com.discord/res/drawable-xhdpi/ic_call_24dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-xhdpi/ic_call_audio_stop_grey_24dp.png b/com.discord/res/drawable-xhdpi/ic_call_audio_stop_grey_24dp.png
new file mode 100644
index 0000000000..ffbf8160cb
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/ic_call_audio_stop_grey_24dp.png differ
diff --git a/com.discord/res/drawable-xhdpi/ic_call_audio_stop_white_24dp.png b/com.discord/res/drawable-xhdpi/ic_call_audio_stop_white_24dp.png
new file mode 100644
index 0000000000..67bb54130f
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/ic_call_audio_stop_white_24dp.png differ
diff --git a/com.discord/res/drawable-xhdpi/ic_call_disconnect_24dp.png b/com.discord/res/drawable-xhdpi/ic_call_disconnect_24dp.png
index 5390b73837..0e863f6702 100644
Binary files a/com.discord/res/drawable-xhdpi/ic_call_disconnect_24dp.png and b/com.discord/res/drawable-xhdpi/ic_call_disconnect_24dp.png differ
diff --git a/com.discord/res/drawable-xhdpi/ic_header_members_add_grey_24dp.png b/com.discord/res/drawable-xhdpi/ic_header_members_add_grey_24dp.png
new file mode 100644
index 0000000000..09081a3bb8
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/ic_header_members_add_grey_24dp.png differ
diff --git a/com.discord/res/drawable-xhdpi/ic_members_24dp.png b/com.discord/res/drawable-xhdpi/ic_members_24dp.png
deleted file mode 100644
index 7873b36c19..0000000000
Binary files a/com.discord/res/drawable-xhdpi/ic_members_24dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-xxhdpi/ic_call_24dp.png b/com.discord/res/drawable-xxhdpi/ic_call_24dp.png
deleted file mode 100644
index dbca2cefcd..0000000000
Binary files a/com.discord/res/drawable-xxhdpi/ic_call_24dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-xxhdpi/ic_call_audio_stop_grey_24dp.png b/com.discord/res/drawable-xxhdpi/ic_call_audio_stop_grey_24dp.png
new file mode 100644
index 0000000000..99baaff5b1
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/ic_call_audio_stop_grey_24dp.png differ
diff --git a/com.discord/res/drawable-xxhdpi/ic_call_audio_stop_white_24dp.png b/com.discord/res/drawable-xxhdpi/ic_call_audio_stop_white_24dp.png
new file mode 100644
index 0000000000..c3bf67c12e
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/ic_call_audio_stop_white_24dp.png differ
diff --git a/com.discord/res/drawable-xxhdpi/ic_call_disconnect_24dp.png b/com.discord/res/drawable-xxhdpi/ic_call_disconnect_24dp.png
index 9260e8b2f4..09c6a2840c 100644
Binary files a/com.discord/res/drawable-xxhdpi/ic_call_disconnect_24dp.png and b/com.discord/res/drawable-xxhdpi/ic_call_disconnect_24dp.png differ
diff --git a/com.discord/res/drawable-xxhdpi/ic_call_end_white_24dp.png b/com.discord/res/drawable-xxhdpi/ic_call_end_white_24dp.png
new file mode 100644
index 0000000000..e1831d7afd
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/ic_call_end_white_24dp.png differ
diff --git a/com.discord/res/drawable-xxhdpi/ic_header_members_add_grey_24dp.png b/com.discord/res/drawable-xxhdpi/ic_header_members_add_grey_24dp.png
new file mode 100644
index 0000000000..ab05bc41fe
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/ic_header_members_add_grey_24dp.png differ
diff --git a/com.discord/res/drawable-xxhdpi/ic_members_24dp.png b/com.discord/res/drawable-xxhdpi/ic_members_24dp.png
deleted file mode 100644
index 90ad06fd31..0000000000
Binary files a/com.discord/res/drawable-xxhdpi/ic_members_24dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-xxhdpi/img_loading_clyde.png b/com.discord/res/drawable-xxhdpi/img_loading_clyde.png
new file mode 100644
index 0000000000..123c3c8492
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/img_loading_clyde.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/ic_call_24dp.png b/com.discord/res/drawable-xxxhdpi/ic_call_24dp.png
deleted file mode 100644
index e417fed57b..0000000000
Binary files a/com.discord/res/drawable-xxxhdpi/ic_call_24dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-xxxhdpi/ic_call_audio_stop_grey_24dp.png b/com.discord/res/drawable-xxxhdpi/ic_call_audio_stop_grey_24dp.png
new file mode 100644
index 0000000000..a6dfe03a19
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/ic_call_audio_stop_grey_24dp.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/ic_call_audio_stop_white_24dp.png b/com.discord/res/drawable-xxxhdpi/ic_call_audio_stop_white_24dp.png
new file mode 100644
index 0000000000..e5fdcfd79d
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/ic_call_audio_stop_white_24dp.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/ic_call_disconnect_24dp.png b/com.discord/res/drawable-xxxhdpi/ic_call_disconnect_24dp.png
index e282ead47b..3cce5634c9 100644
Binary files a/com.discord/res/drawable-xxxhdpi/ic_call_disconnect_24dp.png and b/com.discord/res/drawable-xxxhdpi/ic_call_disconnect_24dp.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/ic_call_end_white_24dp.png b/com.discord/res/drawable-xxxhdpi/ic_call_end_white_24dp.png
new file mode 100644
index 0000000000..8801d0ded4
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/ic_call_end_white_24dp.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/ic_header_members_add_grey_24dp.png b/com.discord/res/drawable-xxxhdpi/ic_header_members_add_grey_24dp.png
new file mode 100644
index 0000000000..2edaab89a2
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/ic_header_members_add_grey_24dp.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/ic_members_24dp.png b/com.discord/res/drawable-xxxhdpi/ic_members_24dp.png
deleted file mode 100644
index 42f96389ca..0000000000
Binary files a/com.discord/res/drawable-xxxhdpi/ic_members_24dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-xxxhdpi/img_loading_clyde.png b/com.discord/res/drawable-xxxhdpi/img_loading_clyde.png
new file mode 100644
index 0000000000..c2ef60eab8
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/img_loading_clyde.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/img_loading_logo.png b/com.discord/res/drawable-xxxhdpi/img_loading_logo.png
deleted file mode 100644
index a5f1ff1596..0000000000
Binary files a/com.discord/res/drawable-xxxhdpi/img_loading_logo.png and /dev/null differ
diff --git a/com.discord/res/drawable/drawable_bg_loading.xml b/com.discord/res/drawable/drawable_bg_loading.xml
index 3196f2d6fe..b2739d7e66 100644
--- a/com.discord/res/drawable/drawable_bg_loading.xml
+++ b/com.discord/res/drawable/drawable_bg_loading.xml
@@ -7,6 +7,6 @@
-
-
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_attachment_grey_24dp.xml b/com.discord/res/drawable/ic_attachment_grey_24dp.xml
new file mode 100644
index 0000000000..9dc61f50a4
--- /dev/null
+++ b/com.discord/res/drawable/ic_attachment_grey_24dp.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_audit_logs_24dp.xml b/com.discord/res/drawable/ic_audit_logs_dark_a60_24dp.xml
similarity index 86%
rename from com.discord/res/drawable/ic_audit_logs_24dp.xml
rename to com.discord/res/drawable/ic_audit_logs_dark_a60_24dp.xml
index 5a0e3b069d..a89c523126 100644
--- a/com.discord/res/drawable/ic_audit_logs_24dp.xml
+++ b/com.discord/res/drawable/ic_audit_logs_dark_a60_24dp.xml
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_audit_logs_light_a60_24dp.xml b/com.discord/res/drawable/ic_audit_logs_light_a60_24dp.xml
new file mode 100644
index 0000000000..552552931a
--- /dev/null
+++ b/com.discord/res/drawable/ic_audit_logs_light_a60_24dp.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_hammer_24dp.xml b/com.discord/res/drawable/ic_bans_dark_a60_24dp.xml
similarity index 87%
rename from com.discord/res/drawable/ic_hammer_24dp.xml
rename to com.discord/res/drawable/ic_bans_dark_a60_24dp.xml
index 8ba7488c5f..3470874521 100644
--- a/com.discord/res/drawable/ic_hammer_24dp.xml
+++ b/com.discord/res/drawable/ic_bans_dark_a60_24dp.xml
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_bans_light_a60_24dp.xml b/com.discord/res/drawable/ic_bans_light_a60_24dp.xml
new file mode 100644
index 0000000000..0065d3e3a4
--- /dev/null
+++ b/com.discord/res/drawable/ic_bans_light_a60_24dp.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_call_end_red_24dp.xml b/com.discord/res/drawable/ic_call_end_red_24dp.xml
new file mode 100644
index 0000000000..1227d4adab
--- /dev/null
+++ b/com.discord/res/drawable/ic_call_end_red_24dp.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_call_green_24dp.xml b/com.discord/res/drawable/ic_call_green_24dp.xml
new file mode 100644
index 0000000000..5f605efd3d
--- /dev/null
+++ b/com.discord/res/drawable/ic_call_green_24dp.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_call_grey_24dp.xml b/com.discord/res/drawable/ic_call_grey_24dp.xml
new file mode 100644
index 0000000000..ed10376418
--- /dev/null
+++ b/com.discord/res/drawable/ic_call_grey_24dp.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_call_missed_grey_24dp.xml b/com.discord/res/drawable/ic_call_missed_grey_24dp.xml
new file mode 100644
index 0000000000..7b6995bcaa
--- /dev/null
+++ b/com.discord/res/drawable/ic_call_missed_grey_24dp.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_call_white_24dp.xml b/com.discord/res/drawable/ic_call_white_24dp.xml
new file mode 100644
index 0000000000..fc7f8224d3
--- /dev/null
+++ b/com.discord/res/drawable/ic_call_white_24dp.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_channels_24dp.xml b/com.discord/res/drawable/ic_channels_dark_a60_24dp.xml
similarity index 81%
rename from com.discord/res/drawable/ic_channels_24dp.xml
rename to com.discord/res/drawable/ic_channels_dark_a60_24dp.xml
index cb3a20559c..3547d23a35 100644
--- a/com.discord/res/drawable/ic_channels_24dp.xml
+++ b/com.discord/res/drawable/ic_channels_dark_a60_24dp.xml
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_channels_light_a60_24dp.xml b/com.discord/res/drawable/ic_channels_light_a60_24dp.xml
new file mode 100644
index 0000000000..a7b8b2a2ad
--- /dev/null
+++ b/com.discord/res/drawable/ic_channels_light_a60_24dp.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_clear_all_grey_24dp.xml b/com.discord/res/drawable/ic_clear_all_grey_24dp.xml
new file mode 100644
index 0000000000..83aa047e29
--- /dev/null
+++ b/com.discord/res/drawable/ic_clear_all_grey_24dp.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_clear_grey_24dp.xml b/com.discord/res/drawable/ic_clear_grey_24dp.xml
new file mode 100644
index 0000000000..ec8b83b4ac
--- /dev/null
+++ b/com.discord/res/drawable/ic_clear_grey_24dp.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_community_24dp.xml b/com.discord/res/drawable/ic_community_24dp.xml
index 2a795c4746..a5a00de48a 100644
--- a/com.discord/res/drawable/ic_community_24dp.xml
+++ b/com.discord/res/drawable/ic_community_24dp.xml
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_controller_24dp.xml b/com.discord/res/drawable/ic_controller_24dp.xml
deleted file mode 100644
index ad9439bc15..0000000000
--- a/com.discord/res/drawable/ic_controller_24dp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_embed_grey_24dp.xml b/com.discord/res/drawable/ic_embed_grey_24dp.xml
new file mode 100644
index 0000000000..fc31a7fbb8
--- /dev/null
+++ b/com.discord/res/drawable/ic_embed_grey_24dp.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_emoji_24dp.xml b/com.discord/res/drawable/ic_emoji_24dp.xml
index c5816e6047..248590c83c 100644
--- a/com.discord/res/drawable/ic_emoji_24dp.xml
+++ b/com.discord/res/drawable/ic_emoji_24dp.xml
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_flag_24dp.xml b/com.discord/res/drawable/ic_flag_24dp.xml
deleted file mode 100644
index fe952415a7..0000000000
--- a/com.discord/res/drawable/ic_flag_24dp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_group_add_grey_24dp.xml b/com.discord/res/drawable/ic_group_add_grey_24dp.xml
new file mode 100644
index 0000000000..e7d5aff7ad
--- /dev/null
+++ b/com.discord/res/drawable/ic_group_add_grey_24dp.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_history_grey_24dp.xml b/com.discord/res/drawable/ic_history_grey_24dp.xml
new file mode 100644
index 0000000000..104d16c441
--- /dev/null
+++ b/com.discord/res/drawable/ic_history_grey_24dp.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_info_24dp.xml b/com.discord/res/drawable/ic_info_24dp.xml
index 4d77d94a99..98b7a2e86d 100644
--- a/com.discord/res/drawable/ic_info_24dp.xml
+++ b/com.discord/res/drawable/ic_info_24dp.xml
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_info_dark_a60_24dp.xml b/com.discord/res/drawable/ic_info_dark_a60_24dp.xml
new file mode 100644
index 0000000000..df577c67c3
--- /dev/null
+++ b/com.discord/res/drawable/ic_info_dark_a60_24dp.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_info_light_a60_24dp.xml b/com.discord/res/drawable/ic_info_light_a60_24dp.xml
new file mode 100644
index 0000000000..dfb68af6bf
--- /dev/null
+++ b/com.discord/res/drawable/ic_info_light_a60_24dp.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_integrations_dark_a60_24dp.xml b/com.discord/res/drawable/ic_integrations_dark_a60_24dp.xml
new file mode 100644
index 0000000000..cd610eecdf
--- /dev/null
+++ b/com.discord/res/drawable/ic_integrations_dark_a60_24dp.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_integrations_light_a60_24dp.xml b/com.discord/res/drawable/ic_integrations_light_a60_24dp.xml
new file mode 100644
index 0000000000..71884b2faa
--- /dev/null
+++ b/com.discord/res/drawable/ic_integrations_light_a60_24dp.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_diag_link_24dp.xml b/com.discord/res/drawable/ic_invites_dark_a60_24dp.xml
similarity index 92%
rename from com.discord/res/drawable/ic_diag_link_24dp.xml
rename to com.discord/res/drawable/ic_invites_dark_a60_24dp.xml
index 71ae2ed353..d8864de42f 100644
--- a/com.discord/res/drawable/ic_diag_link_24dp.xml
+++ b/com.discord/res/drawable/ic_invites_dark_a60_24dp.xml
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_invites_light_a60_24dp.xml b/com.discord/res/drawable/ic_invites_light_a60_24dp.xml
new file mode 100644
index 0000000000..0def079e24
--- /dev/null
+++ b/com.discord/res/drawable/ic_invites_light_a60_24dp.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_link_dark_a60_24dp.xml b/com.discord/res/drawable/ic_link_dark_a60_24dp.xml
new file mode 100644
index 0000000000..f4db27794e
--- /dev/null
+++ b/com.discord/res/drawable/ic_link_dark_a60_24dp.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_link_light_a60_24dp.xml b/com.discord/res/drawable/ic_link_light_a60_24dp.xml
new file mode 100644
index 0000000000..9b88f5244c
--- /dev/null
+++ b/com.discord/res/drawable/ic_link_light_a60_24dp.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_members_dark_a60_24dp.xml b/com.discord/res/drawable/ic_members_dark_a60_24dp.xml
new file mode 100644
index 0000000000..faafa92dab
--- /dev/null
+++ b/com.discord/res/drawable/ic_members_dark_a60_24dp.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_members_dark_grey_24dp.xml b/com.discord/res/drawable/ic_members_dark_grey_24dp.xml
new file mode 100644
index 0000000000..df878fcc3d
--- /dev/null
+++ b/com.discord/res/drawable/ic_members_dark_grey_24dp.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_members_grey_24dp.xml b/com.discord/res/drawable/ic_members_grey_24dp.xml
new file mode 100644
index 0000000000..8113bd2784
--- /dev/null
+++ b/com.discord/res/drawable/ic_members_grey_24dp.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_members_light_a60_24dp.xml b/com.discord/res/drawable/ic_members_light_a60_24dp.xml
new file mode 100644
index 0000000000..3240cf8c6a
--- /dev/null
+++ b/com.discord/res/drawable/ic_members_light_a60_24dp.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_members_white_24dp.xml b/com.discord/res/drawable/ic_members_white_24dp.xml
new file mode 100644
index 0000000000..3cd01a59ec
--- /dev/null
+++ b/com.discord/res/drawable/ic_members_white_24dp.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_mentions_grey_24dp.xml b/com.discord/res/drawable/ic_mentions_grey_24dp.xml
new file mode 100644
index 0000000000..d2637f20e4
--- /dev/null
+++ b/com.discord/res/drawable/ic_mentions_grey_24dp.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_overlay_grey_24dp.xml b/com.discord/res/drawable/ic_overlay_grey_24dp.xml
new file mode 100644
index 0000000000..f9be3602c6
--- /dev/null
+++ b/com.discord/res/drawable/ic_overlay_grey_24dp.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_overview_dark_a60_24dp.xml b/com.discord/res/drawable/ic_overview_dark_a60_24dp.xml
new file mode 100644
index 0000000000..a10c3ff9b1
--- /dev/null
+++ b/com.discord/res/drawable/ic_overview_dark_a60_24dp.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_overview_light_a60_24dp.xml b/com.discord/res/drawable/ic_overview_light_a60_24dp.xml
new file mode 100644
index 0000000000..276c62081c
--- /dev/null
+++ b/com.discord/res/drawable/ic_overview_light_a60_24dp.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_people_grey_24dp.xml b/com.discord/res/drawable/ic_people_grey_24dp.xml
new file mode 100644
index 0000000000..5a37fd4d5c
--- /dev/null
+++ b/com.discord/res/drawable/ic_people_grey_24dp.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_photo_white_24dp.xml b/com.discord/res/drawable/ic_photo_white_24dp.xml
new file mode 100644
index 0000000000..a78fab1ee3
--- /dev/null
+++ b/com.discord/res/drawable/ic_photo_white_24dp.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_pin_24dp.xml b/com.discord/res/drawable/ic_pin_24dp.xml
deleted file mode 100644
index c06fd11655..0000000000
--- a/com.discord/res/drawable/ic_pin_24dp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_pins_dark_a60_24dp.xml b/com.discord/res/drawable/ic_pins_dark_a60_24dp.xml
new file mode 100644
index 0000000000..796ef3be02
--- /dev/null
+++ b/com.discord/res/drawable/ic_pins_dark_a60_24dp.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_pins_light_a60_24dp.xml b/com.discord/res/drawable/ic_pins_light_a60_24dp.xml
new file mode 100644
index 0000000000..675a784db4
--- /dev/null
+++ b/com.discord/res/drawable/ic_pins_light_a60_24dp.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_play_circle_outline_grey_24dp.xml b/com.discord/res/drawable/ic_play_circle_outline_grey_24dp.xml
new file mode 100644
index 0000000000..372f2a2093
--- /dev/null
+++ b/com.discord/res/drawable/ic_play_circle_outline_grey_24dp.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_roles_dark_a60_24dp.xml b/com.discord/res/drawable/ic_roles_dark_a60_24dp.xml
new file mode 100644
index 0000000000..50ed6c9666
--- /dev/null
+++ b/com.discord/res/drawable/ic_roles_dark_a60_24dp.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_roles_light_a60_24dp.xml b/com.discord/res/drawable/ic_roles_light_a60_24dp.xml
new file mode 100644
index 0000000000..dcc882ccac
--- /dev/null
+++ b/com.discord/res/drawable/ic_roles_light_a60_24dp.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_security_dark_a60_24dp.xml b/com.discord/res/drawable/ic_security_dark_a60_24dp.xml
new file mode 100644
index 0000000000..f2ad6cb95c
--- /dev/null
+++ b/com.discord/res/drawable/ic_security_dark_a60_24dp.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_security_light_a60_24dp.xml b/com.discord/res/drawable/ic_security_light_a60_24dp.xml
new file mode 100644
index 0000000000..10dff622b1
--- /dev/null
+++ b/com.discord/res/drawable/ic_security_light_a60_24dp.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_text_channel_grey_24dp.xml b/com.discord/res/drawable/ic_text_channel_grey_24dp.xml
new file mode 100644
index 0000000000..d4883c56f4
--- /dev/null
+++ b/com.discord/res/drawable/ic_text_channel_grey_24dp.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_volume_up_grey_24dp.xml b/com.discord/res/drawable/ic_volume_up_grey_24dp.xml
new file mode 100644
index 0000000000..ffc396fb50
--- /dev/null
+++ b/com.discord/res/drawable/ic_volume_up_grey_24dp.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout-land/view_overlay_menu.xml b/com.discord/res/layout-land/view_overlay_menu.xml
index f255a517d8..6994660a79 100644
--- a/com.discord/res/layout-land/view_overlay_menu.xml
+++ b/com.discord/res/layout-land/view_overlay_menu.xml
@@ -5,7 +5,7 @@
-
+
diff --git a/com.discord/res/layout/anchored_voice_controls_view.xml b/com.discord/res/layout/anchored_voice_controls_view.xml
index a3992f7ecd..d404ac0486 100644
--- a/com.discord/res/layout/anchored_voice_controls_view.xml
+++ b/com.discord/res/layout/anchored_voice_controls_view.xml
@@ -6,7 +6,7 @@
-
+
\ No newline at end of file
diff --git a/com.discord/res/layout/private_channel_side_bar_actions_view.xml b/com.discord/res/layout/private_channel_side_bar_actions_view.xml
index cfbdcc1a93..741d6f3541 100644
--- a/com.discord/res/layout/private_channel_side_bar_actions_view.xml
+++ b/com.discord/res/layout/private_channel_side_bar_actions_view.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/com.discord/res/layout/user_profile_header_view.xml b/com.discord/res/layout/user_profile_header_view.xml
index 51ba6ffd56..5f211e9e92 100644
--- a/com.discord/res/layout/user_profile_header_view.xml
+++ b/com.discord/res/layout/user_profile_header_view.xml
@@ -1,5 +1,5 @@
-
diff --git a/com.discord/res/layout/view_overlay_menu.xml b/com.discord/res/layout/view_overlay_menu.xml
index 1f6ba83ad4..949c9a3e40 100644
--- a/com.discord/res/layout/view_overlay_menu.xml
+++ b/com.discord/res/layout/view_overlay_menu.xml
@@ -6,7 +6,7 @@
-
+
\ No newline at end of file
diff --git a/com.discord/res/layout/view_overlay_menu_content.xml b/com.discord/res/layout/view_overlay_menu_content.xml
index 6180a008e7..72ca968c57 100644
--- a/com.discord/res/layout/view_overlay_menu_content.xml
+++ b/com.discord/res/layout/view_overlay_menu_content.xml
@@ -7,7 +7,7 @@
-
+
diff --git a/com.discord/res/layout/view_setting_check.xml b/com.discord/res/layout/view_setting_check.xml
index 1e515e6bde..2e581227ed 100644
--- a/com.discord/res/layout/view_setting_check.xml
+++ b/com.discord/res/layout/view_setting_check.xml
@@ -1,11 +1,11 @@
-
+
-
+
\ No newline at end of file
diff --git a/com.discord/res/layout/view_setting_radio.xml b/com.discord/res/layout/view_setting_radio.xml
index ed86a547c7..3bbb6768e2 100644
--- a/com.discord/res/layout/view_setting_radio.xml
+++ b/com.discord/res/layout/view_setting_radio.xml
@@ -1,11 +1,11 @@
-
+
-
+
\ No newline at end of file
diff --git a/com.discord/res/layout/view_setting_switch.xml b/com.discord/res/layout/view_setting_switch.xml
index da3aa7bebd..3cce5654d5 100644
--- a/com.discord/res/layout/view_setting_switch.xml
+++ b/com.discord/res/layout/view_setting_switch.xml
@@ -1,11 +1,11 @@
-
+
-
+
\ No newline at end of file
diff --git a/com.discord/res/layout/view_user_list_item.xml b/com.discord/res/layout/view_user_list_item.xml
index b224b1f06c..2b075b5458 100644
--- a/com.discord/res/layout/view_user_list_item.xml
+++ b/com.discord/res/layout/view_user_list_item.xml
@@ -3,6 +3,6 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-
-
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/voice_user_list_item_invite.xml b/com.discord/res/layout/voice_user_list_item_invite.xml
index 1a45487630..a149fc9dcb 100644
--- a/com.discord/res/layout/voice_user_list_item_invite.xml
+++ b/com.discord/res/layout/voice_user_list_item_invite.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/com.discord/res/layout/voice_user_list_item_user.xml b/com.discord/res/layout/voice_user_list_item_user.xml
index 4d280996b2..25de6c75c5 100644
--- a/com.discord/res/layout/voice_user_list_item_user.xml
+++ b/com.discord/res/layout/voice_user_list_item_user.xml
@@ -9,7 +9,6 @@
-
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_accept_gift_dialog.xml b/com.discord/res/layout/widget_accept_gift_dialog.xml
index defc88c718..d4e741912a 100644
--- a/com.discord/res/layout/widget_accept_gift_dialog.xml
+++ b/com.discord/res/layout/widget_accept_gift_dialog.xml
@@ -1,20 +1,15 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_channel_members_list_item_header.xml b/com.discord/res/layout/widget_channel_members_list_item_header.xml
index e421693ba6..bb9dd8b65f 100644
--- a/com.discord/res/layout/widget_channel_members_list_item_header.xml
+++ b/com.discord/res/layout/widget_channel_members_list_item_header.xml
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_channel_selector_item.xml b/com.discord/res/layout/widget_channel_selector_item.xml
index e94426aec2..9ec7834aa6 100644
--- a/com.discord/res/layout/widget_channel_selector_item.xml
+++ b/com.discord/res/layout/widget_channel_selector_item.xml
@@ -1,3 +1,3 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_channels_list_item_category.xml b/com.discord/res/layout/widget_channels_list_item_category.xml
index 347edf01cb..824eae3da2 100644
--- a/com.discord/res/layout/widget_channels_list_item_category.xml
+++ b/com.discord/res/layout/widget_channels_list_item_category.xml
@@ -1,7 +1,7 @@
-
-
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_chat_list_actions.xml b/com.discord/res/layout/widget_chat_list_actions.xml
index 7925ffa5fd..55239bd7be 100644
--- a/com.discord/res/layout/widget_chat_list_actions.xml
+++ b/com.discord/res/layout/widget_chat_list_actions.xml
@@ -1,6 +1,6 @@
+ xmlns:android="http://schemas.android.com/apk/res/android">
@@ -8,7 +8,7 @@
-
+
diff --git a/com.discord/res/layout/widget_chat_list_adapter_item_text.xml b/com.discord/res/layout/widget_chat_list_adapter_item_text.xml
index faeca571f7..09b8d46f31 100644
--- a/com.discord/res/layout/widget_chat_list_adapter_item_text.xml
+++ b/com.discord/res/layout/widget_chat_list_adapter_item_text.xml
@@ -4,7 +4,7 @@
-
+
diff --git a/com.discord/res/layout/widget_home.xml b/com.discord/res/layout/widget_home.xml
index 77270ad725..760aab7032 100644
--- a/com.discord/res/layout/widget_home.xml
+++ b/com.discord/res/layout/widget_home.xml
@@ -1,10 +1,10 @@
+
-
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_home_panel_loading.xml b/com.discord/res/layout/widget_home_panel_loading.xml
index a5e3dc84b1..d79f03ba7d 100644
--- a/com.discord/res/layout/widget_home_panel_loading.xml
+++ b/com.discord/res/layout/widget_home_panel_loading.xml
@@ -1,5 +1,5 @@
-
-
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_private_call_controls_view.xml b/com.discord/res/layout/widget_private_call_controls_view.xml
index 1cc0d2f660..135f0681d2 100644
--- a/com.discord/res/layout/widget_private_call_controls_view.xml
+++ b/com.discord/res/layout/widget_private_call_controls_view.xml
@@ -7,6 +7,6 @@
-
-
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_remote_auth.xml b/com.discord/res/layout/widget_remote_auth.xml
index 9dafd89905..75b125c7c2 100644
--- a/com.discord/res/layout/widget_remote_auth.xml
+++ b/com.discord/res/layout/widget_remote_auth.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/com.discord/res/layout/widget_search_suggestion_item_header_history.xml b/com.discord/res/layout/widget_search_suggestion_item_header_history.xml
index 70bf517bb1..126b714af2 100644
--- a/com.discord/res/layout/widget_search_suggestion_item_header_history.xml
+++ b/com.discord/res/layout/widget_search_suggestion_item_header_history.xml
@@ -2,6 +2,6 @@
-
-
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_search_suggestions_item_channel.xml b/com.discord/res/layout/widget_search_suggestions_item_channel.xml
index 1b3d092bd2..55f0f6eb68 100644
--- a/com.discord/res/layout/widget_search_suggestions_item_channel.xml
+++ b/com.discord/res/layout/widget_search_suggestions_item_channel.xml
@@ -1,6 +1,6 @@
-
-
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_search_suggestions_item_has.xml b/com.discord/res/layout/widget_search_suggestions_item_has.xml
index e2c5e9f190..12e3389dd8 100644
--- a/com.discord/res/layout/widget_search_suggestions_item_has.xml
+++ b/com.discord/res/layout/widget_search_suggestions_item_has.xml
@@ -1,6 +1,6 @@
-
-
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_search_suggestions_item_recent_query.xml b/com.discord/res/layout/widget_search_suggestions_item_recent_query.xml
index e54a733570..990fd33be7 100644
--- a/com.discord/res/layout/widget_search_suggestions_item_recent_query.xml
+++ b/com.discord/res/layout/widget_search_suggestions_item_recent_query.xml
@@ -1,6 +1,6 @@
-
-
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_search_suggestions_item_suggestion.xml b/com.discord/res/layout/widget_search_suggestions_item_suggestion.xml
index 27237103d8..d2d9b64d7d 100644
--- a/com.discord/res/layout/widget_search_suggestions_item_suggestion.xml
+++ b/com.discord/res/layout/widget_search_suggestions_item_suggestion.xml
@@ -1,7 +1,7 @@
-
-
-
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_server_settings.xml b/com.discord/res/layout/widget_server_settings.xml
index 1e34c4d005..b775935dcd 100644
--- a/com.discord/res/layout/widget_server_settings.xml
+++ b/com.discord/res/layout/widget_server_settings.xml
@@ -17,27 +17,27 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
-
-
-
-
+
+
+
+
diff --git a/com.discord/res/layout/widget_settings.xml b/com.discord/res/layout/widget_settings.xml
index 9a8662189b..d5ba55af05 100644
--- a/com.discord/res/layout/widget_settings.xml
+++ b/com.discord/res/layout/widget_settings.xml
@@ -9,7 +9,7 @@
-
+
@@ -23,13 +23,13 @@
-
+
-
+
diff --git a/com.discord/res/layout/widget_settings_premium.xml b/com.discord/res/layout/widget_settings_premium.xml
index 644c24c5ba..4b73d6c272 100644
--- a/com.discord/res/layout/widget_settings_premium.xml
+++ b/com.discord/res/layout/widget_settings_premium.xml
@@ -14,7 +14,7 @@
-
+
diff --git a/com.discord/res/layout/widget_settings_voice.xml b/com.discord/res/layout/widget_settings_voice.xml
index 0772ef56e1..b6391a54f7 100644
--- a/com.discord/res/layout/widget_settings_voice.xml
+++ b/com.discord/res/layout/widget_settings_voice.xml
@@ -28,7 +28,7 @@
-
+
@@ -48,12 +48,10 @@
-
-
-
-
-
-
+
+
+
+
diff --git a/com.discord/res/layout/widget_text_channel_settings.xml b/com.discord/res/layout/widget_text_channel_settings.xml
index 1c71677e8f..6f606ce3f5 100644
--- a/com.discord/res/layout/widget_text_channel_settings.xml
+++ b/com.discord/res/layout/widget_text_channel_settings.xml
@@ -18,14 +18,14 @@
-
+
-
+
diff --git a/com.discord/res/layout/widget_user_set_custom_status.xml b/com.discord/res/layout/widget_user_set_custom_status.xml
index c66021c495..4cc4c4ac3d 100644
--- a/com.discord/res/layout/widget_user_set_custom_status.xml
+++ b/com.discord/res/layout/widget_user_set_custom_status.xml
@@ -11,7 +11,7 @@
-
+
diff --git a/com.discord/res/layout/widget_user_sheet.xml b/com.discord/res/layout/widget_user_sheet.xml
index eb4ef49d30..cf7a96f069 100644
--- a/com.discord/res/layout/widget_user_sheet.xml
+++ b/com.discord/res/layout/widget_user_sheet.xml
@@ -5,7 +5,7 @@
-
+
diff --git a/com.discord/res/layout/widget_voice_call_incoming.xml b/com.discord/res/layout/widget_voice_call_incoming.xml
index 3aeff80e08..5ccce1fa66 100644
--- a/com.discord/res/layout/widget_voice_call_incoming.xml
+++ b/com.discord/res/layout/widget_voice_call_incoming.xml
@@ -8,11 +8,11 @@
-
+
-
+
diff --git a/com.discord/res/layout/widget_voice_channel_settings.xml b/com.discord/res/layout/widget_voice_channel_settings.xml
index 4f6c9d6fbf..867a1976e0 100644
--- a/com.discord/res/layout/widget_voice_channel_settings.xml
+++ b/com.discord/res/layout/widget_voice_channel_settings.xml
@@ -1,6 +1,6 @@
+ xmlns:android="http://schemas.android.com/apk/res/android">
@@ -26,7 +26,7 @@
-
+
diff --git a/com.discord/res/menu/menu_auth_mfa.xml b/com.discord/res/menu/menu_auth_mfa.xml
index 526dfb2dd0..82be0f0200 100644
--- a/com.discord/res/menu/menu_auth_mfa.xml
+++ b/com.discord/res/menu/menu_auth_mfa.xml
@@ -1,6 +1,6 @@
\ No newline at end of file
diff --git a/com.discord/res/menu/menu_call_fullscreen.xml b/com.discord/res/menu/menu_call_fullscreen.xml
index c448741e60..41f5cb5944 100644
--- a/com.discord/res/menu/menu_call_fullscreen.xml
+++ b/com.discord/res/menu/menu_call_fullscreen.xml
@@ -1,12 +1,12 @@
\ No newline at end of file
diff --git a/com.discord/res/menu/menu_channel_create.xml b/com.discord/res/menu/menu_channel_create.xml
index e24e32d3c0..825d520db9 100644
--- a/com.discord/res/menu/menu_channel_create.xml
+++ b/com.discord/res/menu/menu_channel_create.xml
@@ -1,5 +1,5 @@
\ No newline at end of file
diff --git a/com.discord/res/menu/menu_chat_toolbar.xml b/com.discord/res/menu/menu_chat_toolbar.xml
index 1496781dee..6f54b079db 100644
--- a/com.discord/res/menu/menu_chat_toolbar.xml
+++ b/com.discord/res/menu/menu_chat_toolbar.xml
@@ -1,11 +1,11 @@
\ No newline at end of file
diff --git a/com.discord/res/menu/menu_friends.xml b/com.discord/res/menu/menu_friends.xml
index fcd1c85152..158b6f5a7e 100644
--- a/com.discord/res/menu/menu_friends.xml
+++ b/com.discord/res/menu/menu_friends.xml
@@ -1,6 +1,6 @@
\ No newline at end of file
diff --git a/com.discord/res/menu/menu_settings.xml b/com.discord/res/menu/menu_settings.xml
index 7c1bd18ba5..c051212739 100644
--- a/com.discord/res/menu/menu_settings.xml
+++ b/com.discord/res/menu/menu_settings.xml
@@ -1,6 +1,6 @@
\ No newline at end of file
diff --git a/com.discord/res/menu/menu_user_mentions.xml b/com.discord/res/menu/menu_user_mentions.xml
index 42d0532141..2af5743527 100644
--- a/com.discord/res/menu/menu_user_mentions.xml
+++ b/com.discord/res/menu/menu_user_mentions.xml
@@ -1,5 +1,5 @@
\ No newline at end of file
diff --git a/com.discord/res/values-v23/styles.xml b/com.discord/res/values-v23/styles.xml
index 7d18dacd15..f4dd7deab4 100644
--- a/com.discord/res/values-v23/styles.xml
+++ b/com.discord/res/values-v23/styles.xml
@@ -11,7 +11,6 @@
-
-
@@ -4690,7 +4755,7 @@
- @dimen/uikit_spacing_xsmall