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