Changes of com.discord v843

2019-02-06 21:30:57 +01:00 · 2019-02-06 21:30:57 +01:00 · 4ebc9533f9
commit 4ebc9533f9
parent c580c71895
4465 changed files with 93383 additions and 87906 deletions
--- a/com.discord/AndroidManifest.xml
+++ b/com.discord/AndroidManifest.xml
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="28" android:compileSdkVersionCodename="9" android:installLocation="auto" package="com.discord" platformBuildVersionCode="842" platformBuildVersionName="8.4.2g">
+<?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="28" android:compileSdkVersionCodename="9" android:installLocation="auto" package="com.discord" platformBuildVersionCode="843" platformBuildVersionName="8.4.3g">
    <uses-feature android:name="android.hardware.camera" android:required="false"/>
    <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
    <uses-feature android:name="android.hardware.faketouch" android:required="false"/>
--- a/com.discord/apktool.yml
+++ b/com.discord/apktool.yml
@ -1,5 +1,5 @@
 !!brut.androlib.meta.MetaInfo
-apkFileName: com.discord-842.apk
+apkFileName: com.discord-843.apk
 compressionType: false
 doNotCompress:
 - arsc
@ -345,5 +345,5 @@ usesFramework:
  tag: null
 version: 2.4.0-896569-SNAPSHOT
 versionInfo:
-  versionCode: '842'
-  versionName: 8.4.2g
+  versionCode: '843'
+  versionName: 8.4.3g
--- a/com.discord/assets/crashlytics-build.properties
+++ b/com.discord/assets/crashlytics-build.properties
@ -3,9 +3,9 @@
 #
 #Do NOT modify, delete, or commit to source control!
 #
-#Mon Feb 04 22:30:05 UTC 2019
-version_name=8.4.2g
+#Wed Feb 06 18:54:33 UTC 2019
+version_name=8.4.3g
 package_name=com.discord
-build_id=45e7e39d-c2ed-4ec4-8a88-656dee25a9b2
-version_code=842
+build_id=265e2fdb-c0a2-457b-b56d-c791e400356f
+version_code=843
 app_name=com.discord
--- a/com.discord/lib/arm64-v8a/libgifimage.so
+++ b/com.discord/lib/arm64-v8a/libgifimage.so
--- a/com.discord/lib/arm64-v8a/libimagepipeline.so
+++ b/com.discord/lib/arm64-v8a/libimagepipeline.so
--- a/com.discord/lib/arm64-v8a/libnative-filters.so
+++ b/com.discord/lib/arm64-v8a/libnative-filters.so
--- a/com.discord/lib/arm64-v8a/libnative-imagetranscoder.so
+++ b/com.discord/lib/arm64-v8a/libnative-imagetranscoder.so
--- a/com.discord/lib/arm64-v8a/libstatic-webp.so
+++ b/com.discord/lib/arm64-v8a/libstatic-webp.so
--- a/com.discord/lib/armeabi-v7a/libgifimage.so
+++ b/com.discord/lib/armeabi-v7a/libgifimage.so
--- a/com.discord/lib/armeabi-v7a/libimagepipeline.so
+++ b/com.discord/lib/armeabi-v7a/libimagepipeline.so
--- a/com.discord/lib/armeabi-v7a/libnative-filters.so
+++ b/com.discord/lib/armeabi-v7a/libnative-filters.so
--- a/com.discord/lib/armeabi-v7a/libnative-imagetranscoder.so
+++ b/com.discord/lib/armeabi-v7a/libnative-imagetranscoder.so
--- a/com.discord/lib/armeabi-v7a/libstatic-webp.so
+++ b/com.discord/lib/armeabi-v7a/libstatic-webp.so
--- a/com.discord/lib/x86/libgifimage.so
+++ b/com.discord/lib/x86/libgifimage.so
--- a/com.discord/lib/x86/libimagepipeline.so
+++ b/com.discord/lib/x86/libimagepipeline.so
--- a/com.discord/lib/x86/libnative-filters.so
+++ b/com.discord/lib/x86/libnative-filters.so
--- a/com.discord/lib/x86/libnative-imagetranscoder.so
+++ b/com.discord/lib/x86/libnative-imagetranscoder.so
--- a/com.discord/lib/x86/libstatic-webp.so
+++ b/com.discord/lib/x86/libstatic-webp.so
--- a/com.discord/lib/x86_64/libgifimage.so
+++ b/com.discord/lib/x86_64/libgifimage.so
--- a/com.discord/lib/x86_64/libimagepipeline.so
+++ b/com.discord/lib/x86_64/libimagepipeline.so
--- a/com.discord/lib/x86_64/libnative-filters.so
+++ b/com.discord/lib/x86_64/libnative-filters.so
--- a/com.discord/lib/x86_64/libnative-imagetranscoder.so
+++ b/com.discord/lib/x86_64/libnative-imagetranscoder.so
--- a/com.discord/lib/x86_64/libstatic-webp.so
+++ b/com.discord/lib/x86_64/libstatic-webp.so
--- a/com.discord/original/AndroidManifest.xml
+++ b/com.discord/original/AndroidManifest.xml
--- a/com.discord/res/drawable-anydpi-v21/ic_check_brand_24dp.xml
+++ b/com.discord/res/drawable-anydpi-v21/ic_check_brand_24dp.xml
@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="24.0dip" android:width="24.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ff738bd7" android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z" />
+</vector>
--- a/com.discord/res/drawable-anydpi-v21/ic_small_lock_green_24dp.xml
+++ b/com.discord/res/drawable-anydpi-v21/ic_small_lock_green_24dp.xml
@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="18.0dip" android:width="18.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ff43b581" android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z" />
+</vector>
--- a/com.discord/res/drawable-hdpi/ic_check_brand_24dp.png
+++ b/com.discord/res/drawable-hdpi/ic_check_brand_24dp.png
--- a/com.discord/res/drawable-hdpi/ic_small_lock_green_24dp.png
+++ b/com.discord/res/drawable-hdpi/ic_small_lock_green_24dp.png
--- a/com.discord/res/drawable-ldpi/ic_check_brand_24dp.png
+++ b/com.discord/res/drawable-ldpi/ic_check_brand_24dp.png
--- a/com.discord/res/drawable-ldpi/ic_small_lock_green_24dp.png
+++ b/com.discord/res/drawable-ldpi/ic_small_lock_green_24dp.png
--- a/com.discord/res/drawable-mdpi/ic_check_brand_24dp.png
+++ b/com.discord/res/drawable-mdpi/ic_check_brand_24dp.png
--- a/com.discord/res/drawable-mdpi/ic_small_lock_green_24dp.png
+++ b/com.discord/res/drawable-mdpi/ic_small_lock_green_24dp.png
--- a/com.discord/res/drawable-xhdpi/ic_check_brand_24dp.png
+++ b/com.discord/res/drawable-xhdpi/ic_check_brand_24dp.png
--- a/com.discord/res/drawable-xhdpi/ic_small_lock_green_24dp.png
+++ b/com.discord/res/drawable-xhdpi/ic_small_lock_green_24dp.png
--- a/com.discord/res/drawable-xxhdpi/ic_check_brand_24dp.png
+++ b/com.discord/res/drawable-xxhdpi/ic_check_brand_24dp.png
--- a/com.discord/res/drawable-xxhdpi/ic_small_lock_green_24dp.png
+++ b/com.discord/res/drawable-xxhdpi/ic_small_lock_green_24dp.png
--- a/com.discord/res/drawable-xxxhdpi/ic_check_brand_24dp.png
+++ b/com.discord/res/drawable-xxxhdpi/ic_check_brand_24dp.png
--- a/com.discord/res/drawable-xxxhdpi/ic_small_lock_green_24dp.png
+++ b/com.discord/res/drawable-xxxhdpi/ic_small_lock_green_24dp.png
--- a/com.discord/res/drawable/img_gifting_pattern_bg_dark.xml
+++ b/com.discord/res/drawable/img_gifting_pattern_bg_dark.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layer-list android:paddingBottom="@dimen/uikit_spacing_xxlarge"
+<layer-list android:paddingBottom="@dimen/uikit_spacing_xxxlarge"
  xmlns:android="http://schemas.android.com/apk/res/android">
    <item android:gravity="top" android:drawable="@drawable/img_gifting_pattern_dark" />
    <item android:drawable="@color/primary_630_alpha_60" />
--- a/com.discord/res/drawable/img_gifting_pattern_bg_light.xml
+++ b/com.discord/res/drawable/img_gifting_pattern_bg_light.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layer-list android:paddingBottom="@dimen/uikit_spacing_xxlarge"
+<layer-list android:paddingBottom="@dimen/uikit_spacing_xxxlarge"
  xmlns:android="http://schemas.android.com/apk/res/android">
    <item android:gravity="top" android:drawable="@drawable/img_gifting_pattern_light" />
    <item android:drawable="@color/primary_100_alpha_60" />
--- a/com.discord/res/layout-v17/view_global_search_item.xml
+++ b/com.discord/res/layout-v17/view_global_search_item.xml
@ -5,7 +5,7 @@
    <ImageView android:id="@id/item_unread" android:src="@drawable/ic_unread_white_9dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ImageView" />
    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/item_icon_iv" android:padding="@dimen/uikit_spacing_xsmall" android:layout_width="@dimen/avatar_size_standard" android:layout_height="@dimen/avatar_size_standard" android:layout_margin="@dimen/uikit_spacing_small" android:contentDescription="@string/text_channel" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintDimensionRatio="1:1" app:layout_constraintEnd_toStartOf="@id/guideline" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:placeholderImage="@drawable/ic_channel_text_grey_18dp" app:placeholderImageScaleType="centerInside" app:roundAsCircle="true" style="@style/UiKit.ImageView" />
    <TextView android:textSize="@dimen/uikit_textsize_medium" android:id="@id/item_name_tv" android:layout_width="0.0dip" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toTopOf="@id/item_description_tv" app:layout_constraintEnd_toStartOf="@id/item_group_tv" app:layout_constraintStart_toStartOf="@id/guideline" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" style="@style/UiKit.TextView.Large.SingleLine" />
-    <TextView android:id="@id/item_description_tv" android:visibility="gone" android:layout_width="0.0dip" android:textAllCaps="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/item_group_tv" app:layout_constraintStart_toStartOf="@id/item_name_tv" app:layout_constraintTop_toBottomOf="@id/item_name_tv" app:layout_constraintWidth_min="@dimen/uikit_spacing_xxlarge" style="@style/UiKit.TextView.Subtext.Semibold.SingleLine" />
-    <TextView android:gravity="end" android:id="@id/item_group_tv" android:layout_marginRight="@dimen/uikit_spacing_medium" android:textAlignment="viewEnd" android:layout_marginEnd="@dimen/uikit_spacing_medium" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/item_mentions_tv" app:layout_constraintRight_toLeftOf="@id/item_mentions_tv" app:layout_constraintTop_toTopOf="parent" app:layout_constraintWidth_max="140.0dip" app:layout_constraintWidth_min="@dimen/uikit_spacing_xxlarge" app:layout_goneMarginEnd="@dimen/uikit_spacing_medium" app:layout_goneMarginRight="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView.Subtext.SingleLine" />
+    <TextView android:id="@id/item_description_tv" android:visibility="gone" android:layout_width="0.0dip" android:textAllCaps="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/item_group_tv" app:layout_constraintStart_toStartOf="@id/item_name_tv" app:layout_constraintTop_toBottomOf="@id/item_name_tv" app:layout_constraintWidth_min="@dimen/uikit_spacing_xxxlarge" style="@style/UiKit.TextView.Subtext.Semibold.SingleLine" />
+    <TextView android:gravity="end" android:id="@id/item_group_tv" android:layout_marginRight="@dimen/uikit_spacing_medium" android:textAlignment="viewEnd" android:layout_marginEnd="@dimen/uikit_spacing_medium" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/item_mentions_tv" app:layout_constraintRight_toLeftOf="@id/item_mentions_tv" app:layout_constraintTop_toTopOf="parent" app:layout_constraintWidth_max="140.0dip" app:layout_constraintWidth_min="@dimen/uikit_spacing_xxxlarge" app:layout_goneMarginEnd="@dimen/uikit_spacing_medium" app:layout_goneMarginRight="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView.Subtext.SingleLine" />
    <TextView android:id="@id/item_mentions_tv" android:visibility="gone" android:layout_marginRight="@dimen/uikit_spacing_medium" android:text="@string/sample_number_99" android:layout_marginEnd="@dimen/uikit_spacing_medium" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/Icon.Mentions.Large" />
 </merge>
--- a/com.discord/res/layout-v17/widget_channel_group_dm_settings.xml
+++ b/com.discord/res/layout-v17/widget_channel_group_dm_settings.xml
@ -8,7 +8,7 @@
        <LinearLayout android:paddingBottom="@dimen/padding_bottom_fab_screen" style="@style/UiKit.ViewGroup.LinearLayout">
            <androidx.constraintlayout.widget.ConstraintLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.ConstraintLayout">
                <com.facebook.drawee.view.SimpleDraweeView android:id="@id/settings_group_icon" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" app:placeholderImage="@color/brand_500" app:roundAsCircle="true" style="@style/Avatar.Large.ExtraExtra" />
-                <ImageView android:background="@drawable/drawable_uikit_white_circle" android:layout_width="@dimen/uikit_spacing_xlarge" android:layout_height="@dimen/uikit_spacing_xlarge" android:src="@drawable/ic_upload_image_40dp" android:contentDescription="@string/edit" app:layout_constraintEnd_toEndOf="@id/settings_group_icon" app:layout_constraintRight_toRightOf="@id/settings_group_icon" app:layout_constraintTop_toTopOf="@id/settings_group_icon" style="@style/UiKit.ImageView" />
+                <ImageView android:background="@drawable/drawable_uikit_white_circle" android:layout_width="@dimen/uikit_spacing_xxlarge" android:layout_height="@dimen/uikit_spacing_xxlarge" android:src="@drawable/ic_upload_image_40dp" android:contentDescription="@string/edit" app:layout_constraintEnd_toEndOf="@id/settings_group_icon" app:layout_constraintRight_toRightOf="@id/settings_group_icon" app:layout_constraintTop_toTopOf="@id/settings_group_icon" style="@style/UiKit.ImageView" />
                <com.discord.app.AppTextView android:textSize="@dimen/uikit_textsize_small" android:gravity="center_horizontal" android:id="@id/settings_group_icon_label" android:layout_width="wrap_content" android:text="@string/minimum_size" android:maxLines="2" android:layout_centerHorizontal="true" android:textAlignment="center" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="@id/settings_group_icon" app:layout_constraintLeft_toLeftOf="@id/settings_group_icon" app:layout_constraintRight_toRightOf="@id/settings_group_icon" app:layout_constraintStart_toStartOf="@id/settings_group_icon" app:layout_constraintTop_toBottomOf="@id/settings_group_icon" style="@style/UiKit.TextView.Subtext.Semibold" />
                <TextView android:textColor="@color/brand_500" android:id="@id/settings_group_icon_remove" android:background="?selectableItemBackground" android:padding="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="wrap_content" android:text="@string/remove" android:layout_centerHorizontal="true" app:layout_constraintEnd_toEndOf="@id/settings_group_icon" app:layout_constraintLeft_toLeftOf="@id/settings_group_icon" app:layout_constraintRight_toRightOf="@id/settings_group_icon" app:layout_constraintStart_toStartOf="@id/settings_group_icon" app:layout_constraintTop_toBottomOf="@id/settings_group_icon_label" style="@style/UiKit.TextView.Subtext.Semibold" />
                <com.google.android.material.textfield.TextInputLayout android:layout_width="0.0dip" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="0.0dip" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/settings_group_icon" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/settings_group_icon" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.Form.Field.EditText.Wrap">
--- a/com.discord/res/layout-v17/widget_chat_detached.xml
+++ b/com.discord/res/layout-v17/widget_chat_detached.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout android:background="@color/status_grey_500" android:visibility="gone" android:layout_height="@dimen/uikit_spacing_xlarge" style="@style/UiKit.ViewGroup.RelativeLayout"
+<RelativeLayout android:background="@color/status_grey_500" android:visibility="gone" android:layout_height="@dimen/uikit_spacing_xxlarge" style="@style/UiKit.ViewGroup.RelativeLayout"
  xmlns:android="http://schemas.android.com/apk/res/android">
    <ImageView android:id="@id/chat_detached_icon" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:src="@drawable/ic_message_white_18dp" android:layout_centerVertical="true" android:contentDescription="@string/sample_empty_string" style="@style/UiKit.ImageView" />
    <TextView android:textColor="@color/white" android:text="@string/youre_viewing_older_messages" android:layout_toLeftOf="@id/chat_detached_arrow" android:layout_toRightOf="@id/chat_detached_icon" android:layout_centerVertical="true" android:layout_toStartOf="@id/chat_detached_arrow" android:layout_toEndOf="@id/chat_detached_icon" style="@style/UiKit.TextView.Subtext" />
--- a/com.discord/res/layout-v17/widget_chat_input_emoji_picker.xml
+++ b/com.discord/res/layout-v17/widget_chat_input_emoji_picker.xml
@ -6,7 +6,7 @@
      xmlns:android="http://schemas.android.com/apk/res/android" />
    <RelativeLayout android:id="@id/emoji_picker_bottom_bar" android:background="?colorPrimary" android:layout_width="fill_parent" android:layout_height="48.0dip" android:layout_alignParentBottom="true">
        <ImageView android:id="@id/emoji_picker_search_icon" android:src="?theme_search_menu_icon" android:layout_alignParentLeft="true" android:contentDescription="@string/search" android:layout_alignParentStart="true" style="@style/EmojiPickerButtonIcon" />
-        <com.google.android.material.tabs.TabLayout android:id="@id/emoji_picker_tab_layout" android:layout_width="wrap_content" android:layout_height="fill_parent" android:layout_toLeftOf="@id/emoji_picker_backspace_icon" android:layout_toRightOf="@id/emoji_picker_search_icon" android:layout_alignParentBottom="true" android:layout_alignWithParentIfMissing="true" android:layout_toStartOf="@id/emoji_picker_backspace_icon" android:layout_toEndOf="@id/emoji_picker_search_icon" app:tabMaxWidth="@dimen/uikit_spacing_xxlarge" app:tabMode="scrollable" app:tabPaddingEnd="@dimen/uikit_spacing_small" app:tabPaddingStart="@dimen/uikit_spacing_small" />
+        <com.google.android.material.tabs.TabLayout android:id="@id/emoji_picker_tab_layout" android:layout_width="wrap_content" android:layout_height="fill_parent" android:layout_toLeftOf="@id/emoji_picker_backspace_icon" android:layout_toRightOf="@id/emoji_picker_search_icon" android:layout_alignParentBottom="true" android:layout_alignWithParentIfMissing="true" android:layout_toStartOf="@id/emoji_picker_backspace_icon" android:layout_toEndOf="@id/emoji_picker_search_icon" app:tabMaxWidth="@dimen/uikit_spacing_xxxlarge" app:tabMode="scrollable" app:tabPaddingEnd="@dimen/uikit_spacing_small" app:tabPaddingStart="@dimen/uikit_spacing_small" />
        <ImageView android:id="@id/emoji_picker_backspace_icon" android:src="?theme_backspace_icon" android:layout_alignParentRight="true" android:contentDescription="@string/delete" android:layout_alignParentEnd="true" style="@style/EmojiPickerButtonIcon" />
    </RelativeLayout>
 </RelativeLayout>
--- a/com.discord/res/layout-v17/widget_edit_role.xml
+++ b/com.discord/res/layout-v17/widget_edit_role.xml
@ -13,9 +13,9 @@
            </FrameLayout>
            <View style="@style/UiKit.Settings.Divider" />
            <TextView android:text="@string/form_label_role_color" style="@style/UiKit.Settings.Item.Header" />
-            <RelativeLayout android:id="@id/role_settings_color_selector_container" android:background="?selectableItemBackground" android:focusable="true" android:clickable="true" android:layout_width="fill_parent" android:layout_height="@dimen/uikit_spacing_xxlarge">
+            <RelativeLayout android:id="@id/role_settings_color_selector_container" android:background="?selectableItemBackground" android:focusable="true" android:clickable="true" android:layout_width="fill_parent" android:layout_height="@dimen/uikit_spacing_xxxlarge">
                <TextView android:layout_margin="@dimen/uikit_spacing_large" android:text="@string/form_label_role_color" android:layout_alignParentLeft="true" android:layout_centerVertical="true" android:layout_alignParentStart="true" style="@style/UiKit.TextView" />
-                <View android:id="@id/role_settings_current_color_display" android:background="@drawable/drawable_circle_purple_brand" android:layout_width="@dimen/uikit_spacing_xlarge" android:layout_height="@dimen/uikit_spacing_xlarge" android:layout_margin="@dimen/uikit_spacing_large" android:layout_alignParentRight="true" android:layout_alignParentEnd="true" />
+                <View android:id="@id/role_settings_current_color_display" android:background="@drawable/drawable_circle_purple_brand" android:layout_width="@dimen/uikit_spacing_xxlarge" android:layout_height="@dimen/uikit_spacing_xxlarge" android:layout_margin="@dimen/uikit_spacing_large" android:layout_alignParentRight="true" android:layout_alignParentEnd="true" />
                <View android:id="@id/role_settings_color_disabled_overlay" android:background="@color/white_alpha_30" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="fill_parent" />
            </RelativeLayout>
            <View style="@style/UiKit.Settings.Divider" />
--- a/com.discord/res/layout-v17/widget_friends_nearby.xml
+++ b/com.discord/res/layout-v17/widget_friends_nearby.xml
@ -10,7 +10,7 @@
            <TextView android:gravity="center" android:layout_gravity="center" android:id="@id/nearby_friends_error" android:layout_margin="@dimen/uikit_spacing_large" android:text="@string/add_friend_nearby_enable_settings_android" android:drawableTop="?img_addfriends_notconnected" android:drawablePadding="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView" />
            <LinearLayout android:gravity="center" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout">
                <com.airbnb.lottie.LottieAnimationView android:id="@id/nearby_friends_searching_lottie" android:layout_width="220.0dip" android:layout_height="220.0dip" android:layout_marginBottom="@dimen/uikit_spacing_medium" app:lottie_autoPlay="false" app:lottie_fileName="animations/anim_friends_add_nearby_looking.json" app:lottie_loop="true" />
-                <TextView android:gravity="center" android:id="@id/nearby_friends_searching" android:layout_marginLeft="@dimen/uikit_spacing_xlarge" android:layout_marginRight="@dimen/uikit_spacing_xlarge" android:text="@string/add_friend_nearby_looking" style="@style/UiKit.TextView" />
+                <TextView android:gravity="center" android:id="@id/nearby_friends_searching" android:layout_marginLeft="@dimen/uikit_spacing_xxlarge" android:layout_marginRight="@dimen/uikit_spacing_xxlarge" android:text="@string/add_friend_nearby_looking" style="@style/UiKit.TextView" />
            </LinearLayout>
            <androidx.recyclerview.widget.RecyclerView android:id="@id/nearby_friends_recycler" android:padding="@dimen/uikit_spacing_small" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.RecyclerView" />
        </com.discord.app.AppViewFlipper>
--- a/com.discord/res/layout-v17/widget_global_search.xml
+++ b/com.discord/res/layout-v17/widget_global_search.xml
@ -6,8 +6,8 @@
        <androidx.recyclerview.widget.RecyclerView android:id="@id/global_search_guild_list" style="@style/UiKit.GuildsList.Horiz" />
    </com.google.android.material.appbar.AppBarLayout>
    <com.discord.app.AppViewFlipper android:id="@id/global_search_view_flipper" android:background="?colorPrimary" style="@style/AppTheme.AppBarScrollingViewBehavior">
-        <androidx.recyclerview.widget.RecyclerView android:id="@id/global_search_recycler" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_xxlarge" android:scrollbars="vertical" android:clipToPadding="false" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.RecyclerView" />
-        <TextView android:textColor="?primary_400" android:gravity="center" android:layout_width="fill_parent" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/quickswitcher_tutorial_message_search" android:drawableTop="?img_empty_search_defaults" android:drawablePadding="@dimen/uikit_spacing_large" android:textAlignment="center" style="@style/UiKit.TextView.H2" />
+        <androidx.recyclerview.widget.RecyclerView android:id="@id/global_search_recycler" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_xxxlarge" android:scrollbars="vertical" android:clipToPadding="false" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.RecyclerView" />
+        <TextView android:textColor="?primary_400" android:gravity="center" android:layout_width="fill_parent" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_xxxlarge" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/quickswitcher_tutorial_message_search" android:drawableTop="?img_empty_search_defaults" android:drawablePadding="@dimen/uikit_spacing_large" android:textAlignment="center" style="@style/UiKit.TextView.H2" />
        <androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView">
            <LinearLayout android:gravity="center_horizontal" android:paddingBottom="@dimen/list_bottom_padding" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
                <ImageView android:layout_width="80.0dip" android:layout_height="80.0dip" android:layout_margin="@dimen/uikit_spacing_large" android:src="?img_empty_search" android:contentDescription="@string/search_no_results" style="@style/UiKit.ImageView" />
--- a/com.discord/res/layout-v17/widget_guild_invite_share.xml
+++ b/com.discord/res/layout-v17/widget_guild_invite_share.xml
@ -6,7 +6,7 @@
    </com.google.android.material.appbar.AppBarLayout>
    <LinearLayout android:clipChildren="false" android:clipToPadding="false" android:layout_height="fill_parent" app:layout_behavior="@string/action_bar_scrolling_view_behavior" style="@style/UiKit.ViewGroup.Page.LinearLayout">
        <com.discord.app.AppViewFlipper android:id="@id/guild_invite_suggestions_flipper" android:layout_width="fill_parent" android:layout_height="0.0dip" android:layout_weight="1.0">
-            <ImageView android:layout_gravity="center" android:layout_margin="@dimen/uikit_spacing_xlarge" android:src="?img_empty_server_invites" android:scaleType="centerInside" android:importantForAccessibility="no" app:layout_behavior="@string/action_bar_scrolling_view_behavior" style="@style/UiKit.ImageView" />
+            <ImageView android:layout_gravity="center" android:layout_margin="@dimen/uikit_spacing_xxlarge" android:src="?img_empty_server_invites" android:scaleType="centerInside" android:importantForAccessibility="no" app:layout_behavior="@string/action_bar_scrolling_view_behavior" style="@style/UiKit.ImageView" />
            <LinearLayout android:layout_width="fill_parent" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout">
                <include layout="@layout/layout_search" />
                <androidx.recyclerview.widget.RecyclerView android:id="@id/guild_invite_suggestion_list" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:layout_weight="1.0" style="@style/UiKit.ViewGroup.RecyclerView" />
--- a/com.discord/res/layout-v17/widget_guild_invite_share_item.xml
+++ b/com.discord/res/layout-v17/widget_guild_invite_share_item.xml
@ -3,6 +3,6 @@
  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/item_icon_iv" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large" app:placeholderImage="?colorPrimaryCircle" style="@style/Avatar.Standard" />
    <TextView android:textSize="@dimen/uikit_textsize_large" android:id="@id/item_name_tv" android:layout_weight="1.0" style="@style/UiKit.TextView.Subtext.Semibold.SingleLine" />
-    <TextView android:textColor="@color/status_green_500" android:id="@id/item_invite_btn" android:paddingTop="0.0dip" android:paddingBottom="0.0dip" android:minWidth="@dimen/uikit_spacing_xxlarge" android:text="@string/invite_friend_modal_invite" android:textAllCaps="false" style="@style/UiKit.Button.Green.Fit.Outline" />
-    <TextView android:textColor="?primary_300_alpha_30" android:id="@id/item_sent" android:paddingTop="0.0dip" android:paddingBottom="0.0dip" android:visibility="gone" android:minWidth="@dimen/uikit_spacing_xxlarge" android:text="@string/invite_friend_modal_sent" android:textAllCaps="false" style="@style/UiKit.Button.Transparent.Fit" />
+    <TextView android:textColor="@color/status_green_500" android:id="@id/item_invite_btn" android:paddingTop="0.0dip" android:paddingBottom="0.0dip" android:minWidth="@dimen/uikit_spacing_xxxlarge" android:text="@string/invite_friend_modal_invite" android:textAllCaps="false" style="@style/UiKit.Button.Green.Fit.Outline" />
+    <TextView android:textColor="?primary_300_alpha_30" android:id="@id/item_sent" android:paddingTop="0.0dip" android:paddingBottom="0.0dip" android:visibility="gone" android:minWidth="@dimen/uikit_spacing_xxxlarge" android:text="@string/invite_friend_modal_sent" android:textAllCaps="false" style="@style/UiKit.Button.Transparent.Fit" />
 </LinearLayout>
--- a/com.discord/res/layout-v17/widget_notice_dialog.xml
+++ b/com.discord/res/layout-v17/widget_notice_dialog.xml
@ -7,7 +7,7 @@
    </LinearLayout>
    <androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView">
        <LinearLayout android:gravity="center" android:id="@id/notice_body_container" style="@style/UiKit.ViewGroup.LinearLayout">
-            <TextView android:gravity="center" android:layout_gravity="start" android:id="@id/notice_body_text" android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
+            <TextView android:gravity="start" android:layout_gravity="start" android:id="@id/notice_body_text" android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
        </LinearLayout>
    </androidx.core.widget.NestedScrollView>
    <View style="@style/UiKit.Settings.Divider" />
--- a/com.discord/res/layout-v17/widget_notice_popup_channel.xml
+++ b/com.discord/res/layout-v17/widget_notice_popup_channel.xml
@ -4,10 +4,10 @@
    <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
        <com.facebook.drawee.view.SimpleDraweeView android:id="@id/popup_icon" android:visibility="gone" android:layout_margin="@dimen/uikit_spacing_medium" style="@style/Avatar.Notification" />
        <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="0.0dip" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:layout_weight="1.0" style="@style/UiKit.ViewGroup">
-            <TextView android:id="@id/popup_title" android:lineSpacingMultiplier="1.0" app:layout_constrainedWidth="true" app:layout_constraintEnd_toStartOf="@id/popup_subtitle" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="spread_inside" app:layout_constraintStart_toStartOf="parent" app:layout_constraintWidth_min="@dimen/uikit_spacing_xlarge" style="@style/UiKit.TextView.Subtext.Semibold.SingleLine" />
+            <TextView android:id="@id/popup_title" android:lineSpacingMultiplier="1.0" app:layout_constrainedWidth="true" app:layout_constraintEnd_toStartOf="@id/popup_subtitle" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="spread_inside" app:layout_constraintStart_toStartOf="parent" app:layout_constraintWidth_min="@dimen/uikit_spacing_xxlarge" style="@style/UiKit.TextView.Subtext.Semibold.SingleLine" />
            <TextView android:id="@id/popup_subtitle" android:layout_marginLeft="4.0dip" android:lineSpacingMultiplier="1.0" android:layout_marginStart="4.0dip" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@id/popup_title" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/popup_title" style="@style/UiKit.TextView.Subtext.Semibold.SingleLine" />
            <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:textColor="?primary_200" android:ellipsize="end" android:id="@id/popup_body" android:layout_width="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_xsmall" android:maxLines="3" android:lineSpacingMultiplier="1.0" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="@id/popup_title" app:layout_constraintTop_toBottomOf="@id/popup_title" style="@style/UiKit.TextView" />
-            <com.facebook.drawee.view.SimpleDraweeView android:id="@id/popup_attachment" android:background="?primary_600_bg" android:visibility="gone" android:layout_width="@dimen/uikit_spacing_xxlarge" android:layout_height="@dimen/uikit_spacing_xxlarge" app:actualImageScaleType="centerCrop" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="@id/popup_title" app:layout_constraintTop_toBottomOf="@id/popup_body" app:placeholderImage="?ic_insert_drive_file" app:placeholderImageScaleType="centerInside" />
+            <com.facebook.drawee.view.SimpleDraweeView android:id="@id/popup_attachment" android:background="?primary_600_bg" android:visibility="gone" android:layout_width="@dimen/uikit_spacing_xxxlarge" android:layout_height="@dimen/uikit_spacing_xxxlarge" app:actualImageScaleType="centerCrop" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="@id/popup_title" app:layout_constraintTop_toBottomOf="@id/popup_body" app:placeholderImage="?ic_insert_drive_file" app:placeholderImageScaleType="centerInside" />
        </androidx.constraintlayout.widget.ConstraintLayout>
        <ImageView android:layout_gravity="center|top" android:id="@id/popup_close_btn" android:src="?ic_settings" android:contentDescription="@string/dismiss" style="@style/UiKit.ImageView.Clickable.Corner.TopEnd" />
    </LinearLayout>
--- a/com.discord/res/layout-v17/widget_server_settings_audit_log_listitem.xml
+++ b/com.discord/res/layout-v17/widget_server_settings_audit_log_listitem.xml
@ -9,7 +9,7 @@
            </FrameLayout>
            <com.facebook.drawee.view.SimpleDraweeView android:id="@id/audit_log_listitem_avatar" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:layout_toRightOf="@id/audit_log_listitem_action_container" android:layout_centerVertical="true" style="@style/Avatar.Standard" />
            <com.discord.app.AppTextView android:ellipsize="end" android:id="@id/audit_log_listitem_header_text" android:layout_marginTop="@dimen/uikit_spacing_medium" android:maxLines="2" android:layout_toLeftOf="@id/audit_log_listitem_arrow" android:layout_toRightOf="@id/audit_log_listitem_avatar" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView" />
-            <TextView android:textColor="?primary_400" android:ellipsize="end" android:id="@id/audit_log_listitem_date_text" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_xlarge" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:maxLines="2" android:layout_toRightOf="@id/audit_log_listitem_avatar" android:layout_below="@id/audit_log_listitem_header_text" style="@style/UiKit.TextView" />
+            <TextView android:textColor="?primary_400" android:ellipsize="end" android:id="@id/audit_log_listitem_date_text" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_xxlarge" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:maxLines="2" android:layout_toRightOf="@id/audit_log_listitem_avatar" android:layout_below="@id/audit_log_listitem_header_text" style="@style/UiKit.TextView" />
            <ImageView android:id="@id/audit_log_listitem_arrow" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:src="@drawable/ic_chevron_right_grey_12dp" android:layout_alignParentRight="true" android:layout_centerVertical="true" android:contentDescription="@string/more" android:layout_alignParentEnd="true" style="@style/UiKit.ImageView" />
        </RelativeLayout>
        <TextView android:textColor="?primary_400" android:id="@id/audit_log_listitem_change_text" android:padding="@dimen/uikit_spacing_large" android:visibility="gone" android:layout_width="fill_parent" style="@style/UiKit.TextView" />
--- a/com.discord/res/layout-v17/widget_server_settings_edit_integration.xml
+++ b/com.discord/res/layout-v17/widget_server_settings_edit_integration.xml
@ -40,7 +40,7 @@
                    <com.discord.views.CheckedSetting android:id="@id/edit_integration_custom_emotes_toggle" app:cs_text="@string/enable_twitch_emoji_sync" style="@style/UiKit.CheckedSetting.Themed" />
                </LinearLayout>
            </LinearLayout>
-            <Space android:layout_width="fill_parent" android:layout_height="@dimen/uikit_spacing_xxlarge" />
+            <Space android:layout_width="fill_parent" android:layout_height="@dimen/uikit_spacing_xxxlarge" />
        </LinearLayout>
    </androidx.core.widget.NestedScrollView>
    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/edit_integration_save" style="@style/Settings.FloatingActionButton.Save" />
--- a/com.discord/res/layout-v17/widget_server_settings_instant_invite_list_item.xml
+++ b/com.discord/res/layout-v17/widget_server_settings_instant_invite_list_item.xml
@ -7,7 +7,7 @@
                <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_100" android:id="@id/invite_code" style="@style/UiKit.TextView" />
                <TextView android:id="@id/invite_channel" style="@style/UiKit.TextView" />
            </LinearLayout>
-            <LinearLayout android:id="@id/invite_expiration_container" android:layout_width="wrap_content" android:layout_marginRight="@dimen/uikit_spacing_xlarge" android:layout_toLeftOf="@id/invite_settings_icon" android:layout_marginEnd="@dimen/uikit_spacing_xlarge" android:layout_toStartOf="@id/invite_settings_icon" style="@style/UiKit.ViewGroup.LinearLayout">
+            <LinearLayout android:id="@id/invite_expiration_container" android:layout_width="wrap_content" android:layout_marginRight="@dimen/uikit_spacing_xxlarge" android:layout_toLeftOf="@id/invite_settings_icon" android:layout_marginEnd="@dimen/uikit_spacing_xxlarge" android:layout_toStartOf="@id/invite_settings_icon" style="@style/UiKit.ViewGroup.LinearLayout">
                <TextView android:textSize="@dimen/uikit_textsize_large" android:id="@id/invite_expires_label" android:text="@string/expires_in" style="@style/UiKit.TextView" />
                <TextView android:id="@id/invite_expiration_time" style="@style/UiKit.TextView" />
            </LinearLayout>
--- a/com.discord/res/layout-v17/widget_server_settings_overview.xml
+++ b/com.discord/res/layout-v17/widget_server_settings_overview.xml
@ -8,7 +8,7 @@
        <LinearLayout android:focusableInTouchMode="true" style="@style/UiKit.ViewGroup.LinearLayout">
            <androidx.constraintlayout.widget.ConstraintLayout android:id="@id/server_settings_overview_icon_name_container" android:background="?selectableItemBackground" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:clipToPadding="false" style="@style/UiKit.ViewGroup.ConstraintLayout">
                <com.facebook.drawee.view.SimpleDraweeView android:id="@id/server_settings_overview_icon" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" app:placeholderImage="@color/brand_500" app:roundAsCircle="true" style="@style/Avatar.Large.ExtraExtra" />
-                <ImageView android:background="@drawable/drawable_uikit_white_circle" android:layout_width="@dimen/uikit_spacing_xlarge" android:layout_height="@dimen/uikit_spacing_xlarge" android:src="@drawable/ic_upload_image_40dp" android:contentDescription="@string/sample_empty_string" app:layout_constraintEnd_toEndOf="@id/server_settings_overview_icon" app:layout_constraintRight_toRightOf="@id/server_settings_overview_icon" app:layout_constraintTop_toTopOf="@id/server_settings_overview_icon" style="@style/UiKit.ImageView" />
+                <ImageView android:background="@drawable/drawable_uikit_white_circle" android:layout_width="@dimen/uikit_spacing_xxlarge" android:layout_height="@dimen/uikit_spacing_xxlarge" android:src="@drawable/ic_upload_image_40dp" android:contentDescription="@string/sample_empty_string" app:layout_constraintEnd_toEndOf="@id/server_settings_overview_icon" app:layout_constraintRight_toRightOf="@id/server_settings_overview_icon" app:layout_constraintTop_toTopOf="@id/server_settings_overview_icon" style="@style/UiKit.ImageView" />
                <TextView android:textSize="42.0sp" android:textColor="@color/primary_100" android:ellipsize="none" android:gravity="center" android:id="@id/server_settings_overview_icon_text" android:layout_width="0.0dip" android:layout_height="0.0dip" android:layout_margin="@dimen/uikit_spacing_medium" android:singleLine="true" app:layout_constraintBottom_toBottomOf="@id/server_settings_overview_icon" app:layout_constraintEnd_toEndOf="@id/server_settings_overview_icon" app:layout_constraintLeft_toLeftOf="@id/server_settings_overview_icon" app:layout_constraintRight_toRightOf="@id/server_settings_overview_icon" app:layout_constraintStart_toStartOf="@id/server_settings_overview_icon" app:layout_constraintTop_toTopOf="@id/server_settings_overview_icon" app:textAllCaps="true" style="@style/UiKit.TextView" />
                <com.discord.app.AppTextView android:textSize="@dimen/uikit_textsize_small" android:gravity="center_horizontal" android:id="@id/server_settings_overview_icon_label" android:layout_width="wrap_content" android:text="@string/minimum_size" android:maxLines="2" android:layout_centerHorizontal="true" android:textAlignment="center" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="@id/server_settings_overview_icon" app:layout_constraintLeft_toLeftOf="@id/server_settings_overview_icon" app:layout_constraintRight_toRightOf="@id/server_settings_overview_icon" app:layout_constraintStart_toStartOf="@id/server_settings_overview_icon" app:layout_constraintTop_toBottomOf="@id/server_settings_overview_icon" style="@style/UiKit.TextView.Subtext.Semibold" />
                <TextView android:textColor="@color/brand_500" android:id="@id/server_settings_overview_icon_remove" android:background="?selectableItemBackground" android:padding="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="wrap_content" android:text="@string/remove" android:layout_centerHorizontal="true" app:layout_constraintEnd_toEndOf="@id/server_settings_overview_icon" app:layout_constraintLeft_toLeftOf="@id/server_settings_overview_icon" app:layout_constraintRight_toRightOf="@id/server_settings_overview_icon" app:layout_constraintStart_toStartOf="@id/server_settings_overview_icon" app:layout_constraintTop_toBottomOf="@id/server_settings_overview_icon_label" style="@style/UiKit.TextView.Subtext.Semibold" />
--- a/com.discord/res/layout-v17/widget_server_settings_role_item.xml
+++ b/com.discord/res/layout-v17/widget_server_settings_role_item.xml
@ -5,7 +5,7 @@
    <View android:id="@id/server_settings_role_item_divider_targeted" android:background="@color/purple_brand" android:visibility="invisible" android:layout_width="fill_parent" android:layout_height="3.0dip" android:layout_alignParentTop="true" />
    <FrameLayout android:gravity="center_vertical" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_centerVertical="true" android:layout_marginStart="@dimen/uikit_spacing_medium" android:layout_marginEnd="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup">
        <ImageView android:layout_gravity="start|center" android:id="@id/server_settings_role_item_lock_indicator" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:src="?ic_lock" android:contentDescription="@string/help_role_locked" android:layout_marginStart="@dimen/uikit_spacing_medium" style="@style/UiKit.ImageView" />
-        <TextView android:layout_gravity="center_vertical" android:id="@id/server_settings_role_item_name" android:layout_marginLeft="@dimen/uikit_spacing_xxlarge" android:singleLine="true" android:layout_marginStart="@dimen/uikit_spacing_xxlarge" style="@style/UiKit.TextView.Semibold" />
+        <TextView android:layout_gravity="center_vertical" android:id="@id/server_settings_role_item_name" android:layout_marginLeft="@dimen/uikit_spacing_xxxlarge" android:singleLine="true" android:layout_marginStart="@dimen/uikit_spacing_xxxlarge" style="@style/UiKit.TextView.Semibold" />
    </FrameLayout>
    <View android:id="@id/server_settings_role_item_bottom_divider" android:layout_alignParentBottom="true" style="@style/UiKit.Settings.Divider" />
 </RelativeLayout>
--- a/com.discord/res/layout-v17/widget_server_settings_vanity_url.xml
+++ b/com.discord/res/layout-v17/widget_server_settings_vanity_url.xml
@ -6,14 +6,14 @@
    </com.google.android.material.appbar.AppBarLayout>
    <androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
        <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
-            <RelativeLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_xlarge" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.RelativeLayout">
+            <RelativeLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_xxlarge" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.RelativeLayout">
                <TextView android:text="@string/vanity_url" android:textAllCaps="true" style="@style/UiKit.TextView.Bold" />
                <TextView android:textColor="@color/status_red_500" android:id="@id/server_settings_vanity_url_remove" android:visibility="gone" android:text="@string/remove" android:layout_alignParentRight="true" android:layout_alignParentEnd="true" style="@style/UiKit.TextView.Bold" />
            </RelativeLayout>
            <RelativeLayout android:id="@id/server_settings_vanity_url_input_container" android:padding="@dimen/uikit_spacing_large" android:focusable="true" android:focusableInTouchMode="true" android:descendantFocusability="beforeDescendants" style="@style/UiKit.ViewGroup.RelativeLayout">
                <TextView android:textSize="@dimen/uikit_textsize_large" android:id="@id/server_settings_vanity_url_prefix" android:text="@string/discord_gg" android:layout_alignParentLeft="true" android:layout_centerVertical="true" android:layout_alignParentStart="true" style="@style/UiKit.TextView" />
                <com.discord.app.AppEditText android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_100" android:id="@id/server_settings_vanity_input" android:background="@android:color/transparent" android:layout_width="fill_parent" android:hint="@string/vanity_url_hint_mobile" android:singleLine="true" android:digits="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890-" android:layout_toLeftOf="@id/server_settings_vanity_url_loading_indicator" android:layout_toRightOf="@id/server_settings_vanity_url_prefix" android:layout_centerVertical="true" android:inputType="textNoSuggestions" android:imeOptions="actionDone" android:layout_toStartOf="@id/server_settings_vanity_url_loading_indicator" android:layout_toEndOf="@id/server_settings_vanity_url_prefix" style="@style/UiKit.TextView" />
-                <ProgressBar android:id="@id/server_settings_vanity_url_loading_indicator" android:layout_width="@dimen/uikit_spacing_xlarge" android:layout_height="@dimen/uikit_spacing_xlarge" android:indeterminate="true" android:layout_alignParentRight="true" android:layout_centerVertical="true" android:layout_alignParentEnd="true" />
+                <ProgressBar android:id="@id/server_settings_vanity_url_loading_indicator" android:layout_width="@dimen/uikit_spacing_xxlarge" android:layout_height="@dimen/uikit_spacing_xxlarge" android:indeterminate="true" android:layout_alignParentRight="true" android:layout_centerVertical="true" android:layout_alignParentEnd="true" />
            </RelativeLayout>
            <View style="@style/UiKit.Settings.Divider" />
            <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/status_red_500" android:id="@id/server_settings_vanity_url_error_text" android:visibility="gone" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/change_vanity_url_error" style="@style/UiKit.TextView" />
--- a/com.discord/res/layout-v17/widget_settings_account.xml
+++ b/com.discord/res/layout-v17/widget_settings_account.xml
@ -10,7 +10,7 @@
                <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/primary_100" android:text="@string/unverified_account_title" android:layout_centerInParent="true" style="@style/UiKit.TextView.Semibold" />
                <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/primary_100" android:id="@id/settings_account_verification_resend" android:background="@drawable/drawable_button_white" android:paddingLeft="12.0dip" android:paddingTop="@dimen/uikit_spacing_small" android:paddingRight="12.0dip" android:paddingBottom="@dimen/uikit_spacing_small" android:layout_margin="@dimen/uikit_spacing_medium" android:text="@string/verify_account" android:layout_alignParentRight="true" android:layout_centerVertical="true" android:layout_alignParentEnd="true" style="@style/UiKit.TextView" />
            </RelativeLayout>
-            <RelativeLayout android:background="?primary_630" android:paddingTop="@dimen/uikit_spacing_xlarge" android:paddingBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.RelativeLayout">
+            <RelativeLayout android:background="?primary_630" android:paddingTop="@dimen/uikit_spacing_xxlarge" android:paddingBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.RelativeLayout">
                <LinearLayout android:gravity="center_horizontal" android:id="@id/settings_account_avatar_wrap" style="@style/UiKit.ViewGroup.LinearLayout">
                    <RelativeLayout android:background="@drawable/drawable_circle_white_5" android:layout_width="wrap_content" android:layout_height="wrap_content">
                        <com.facebook.drawee.view.SimpleDraweeView android:id="@id/settings_account_avatar" app:roundWithOverlayColor="?primary_630" style="@style/Avatar.Hero" />
@ -35,8 +35,14 @@
                <TextView android:id="@id/settings_account_change_password" android:text="@string/change_password" android:drawableRight="@drawable/ic_chevron_right_grey_12dp" android:drawableEnd="@drawable/ic_chevron_right_grey_12dp" style="@style/UiKit.Settings.Item.Header" />
            </LinearLayout>
            <View style="@style/UiKit.Divider" />
-            <TextView android:id="@id/settings_account_private_data_header" android:focusable="true" android:focusableInTouchMode="false" android:clickable="true" android:text="@string/account_management" android:drawableRight="?ic_plus_a60" android:drawableEnd="?ic_plus_a60" style="@style/UiKit.Settings.Item.Header" />
-            <LinearLayout android:id="@id/settings_account_private_data_wrap" android:visibility="gone" style="@style/UiKit.ViewGroup.LinearLayout">
+            <FrameLayout android:id="@id/settings_account_mfa_container" android:visibility="gone" style="@style/UiKit.ViewGroup">
+                <TextView android:text="@string/two_fa" style="@style/UiKit.Settings.Item.Header" />
+                <TextView android:textColor="@color/status_green_500" android:layout_gravity="end|center" android:id="@id/settings_account_mfa_enabled_header" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="Enabled" android:drawableLeft="@drawable/ic_small_lock_green_24dp" android:textAllCaps="true" android:drawableStart="@drawable/ic_small_lock_green_24dp" android:layout_marginEnd="@dimen/uikit_spacing_large" style="@style/UiKit.TextView.Semibold" />
+            </FrameLayout>
+            <TextView android:id="@id/settings_account_view_backup_codes" android:text="@string/two_fa_view_backup_codes" android:drawableRight="@drawable/ic_chevron_right_grey_24dp" android:drawableEnd="@drawable/ic_chevron_right_grey_24dp" style="@style/UiKit.Settings.Item" />
+            <View style="@style/UiKit.Divider" />
+            <TextView android:text="@string/account_management" style="@style/UiKit.Settings.Item.Header" />
+            <LinearLayout android:id="@id/settings_account_private_data_wrap" style="@style/UiKit.ViewGroup.LinearLayout">
                <TextView android:textColor="@color/status_red_500" android:id="@id/settings_account_private_data_disable" android:text="@string/disable_account" style="@style/UiKit.Settings.Item" />
                <TextView android:textColor="@color/status_red_500" android:id="@id/settings_account_private_data_delete" android:text="@string/delete_account" style="@style/UiKit.Settings.Item" />
            </LinearLayout>
--- a/com.discord/res/layout-v21/widget_channel_group_dm_settings.xml
+++ b/com.discord/res/layout-v21/widget_channel_group_dm_settings.xml
@ -8,7 +8,7 @@
        <LinearLayout android:paddingBottom="@dimen/padding_bottom_fab_screen" style="@style/UiKit.ViewGroup.LinearLayout">
            <androidx.constraintlayout.widget.ConstraintLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.ConstraintLayout">
                <com.facebook.drawee.view.SimpleDraweeView android:id="@id/settings_group_icon" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" app:placeholderImage="@color/brand_500" app:roundAsCircle="true" style="@style/Avatar.Large.ExtraExtra" />
-                <ImageView android:background="@drawable/drawable_uikit_white_circle" android:layout_width="@dimen/uikit_spacing_xlarge" android:layout_height="@dimen/uikit_spacing_xlarge" android:src="@drawable/ic_upload_image_40dp" android:contentDescription="@string/edit" android:elevation="@dimen/app_elevation" app:layout_constraintEnd_toEndOf="@id/settings_group_icon" app:layout_constraintRight_toRightOf="@id/settings_group_icon" app:layout_constraintTop_toTopOf="@id/settings_group_icon" style="@style/UiKit.ImageView" />
+                <ImageView android:background="@drawable/drawable_uikit_white_circle" android:layout_width="@dimen/uikit_spacing_xxlarge" android:layout_height="@dimen/uikit_spacing_xxlarge" android:src="@drawable/ic_upload_image_40dp" android:contentDescription="@string/edit" android:elevation="@dimen/app_elevation" app:layout_constraintEnd_toEndOf="@id/settings_group_icon" app:layout_constraintRight_toRightOf="@id/settings_group_icon" app:layout_constraintTop_toTopOf="@id/settings_group_icon" style="@style/UiKit.ImageView" />
                <com.discord.app.AppTextView android:textSize="@dimen/uikit_textsize_small" android:gravity="center_horizontal" android:id="@id/settings_group_icon_label" android:layout_width="wrap_content" android:text="@string/minimum_size" android:maxLines="2" android:layout_centerHorizontal="true" android:textAlignment="center" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="@id/settings_group_icon" app:layout_constraintLeft_toLeftOf="@id/settings_group_icon" app:layout_constraintRight_toRightOf="@id/settings_group_icon" app:layout_constraintStart_toStartOf="@id/settings_group_icon" app:layout_constraintTop_toBottomOf="@id/settings_group_icon" style="@style/UiKit.TextView.Subtext.Semibold" />
                <TextView android:textColor="@color/brand_500" android:id="@id/settings_group_icon_remove" android:background="?selectableItemBackground" android:padding="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="wrap_content" android:text="@string/remove" android:layout_centerHorizontal="true" app:layout_constraintEnd_toEndOf="@id/settings_group_icon" app:layout_constraintLeft_toLeftOf="@id/settings_group_icon" app:layout_constraintRight_toRightOf="@id/settings_group_icon" app:layout_constraintStart_toStartOf="@id/settings_group_icon" app:layout_constraintTop_toBottomOf="@id/settings_group_icon_label" style="@style/UiKit.TextView.Subtext.Semibold" />
                <com.google.android.material.textfield.TextInputLayout android:layout_width="0.0dip" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="0.0dip" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/settings_group_icon" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/settings_group_icon" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.Form.Field.EditText.Wrap">
--- a/com.discord/res/layout-v21/widget_chat_input_emoji_picker.xml
+++ b/com.discord/res/layout-v21/widget_chat_input_emoji_picker.xml
@ -6,7 +6,7 @@
      xmlns:android="http://schemas.android.com/apk/res/android" />
    <RelativeLayout android:id="@id/emoji_picker_bottom_bar" android:background="?colorPrimary" android:layout_width="fill_parent" android:layout_height="48.0dip" android:layout_alignParentBottom="true" android:elevation="@dimen/uikit_spacing_medium">
        <ImageView android:id="@id/emoji_picker_search_icon" android:src="?theme_search_menu_icon" android:layout_alignParentLeft="true" android:contentDescription="@string/search" android:layout_alignParentStart="true" style="@style/EmojiPickerButtonIcon" />
-        <com.google.android.material.tabs.TabLayout android:id="@id/emoji_picker_tab_layout" android:layout_width="wrap_content" android:layout_height="fill_parent" android:layout_toLeftOf="@id/emoji_picker_backspace_icon" android:layout_toRightOf="@id/emoji_picker_search_icon" android:layout_alignParentBottom="true" android:layout_alignWithParentIfMissing="true" android:layout_toStartOf="@id/emoji_picker_backspace_icon" android:layout_toEndOf="@id/emoji_picker_search_icon" app:tabMaxWidth="@dimen/uikit_spacing_xxlarge" app:tabMode="scrollable" app:tabPaddingEnd="@dimen/uikit_spacing_small" app:tabPaddingStart="@dimen/uikit_spacing_small" />
+        <com.google.android.material.tabs.TabLayout android:id="@id/emoji_picker_tab_layout" android:layout_width="wrap_content" android:layout_height="fill_parent" android:layout_toLeftOf="@id/emoji_picker_backspace_icon" android:layout_toRightOf="@id/emoji_picker_search_icon" android:layout_alignParentBottom="true" android:layout_alignWithParentIfMissing="true" android:layout_toStartOf="@id/emoji_picker_backspace_icon" android:layout_toEndOf="@id/emoji_picker_search_icon" app:tabMaxWidth="@dimen/uikit_spacing_xxxlarge" app:tabMode="scrollable" app:tabPaddingEnd="@dimen/uikit_spacing_small" app:tabPaddingStart="@dimen/uikit_spacing_small" />
        <ImageView android:id="@id/emoji_picker_backspace_icon" android:src="?theme_backspace_icon" android:layout_alignParentRight="true" android:contentDescription="@string/delete" android:layout_alignParentEnd="true" style="@style/EmojiPickerButtonIcon" />
    </RelativeLayout>
 </RelativeLayout>
--- a/com.discord/res/layout-v21/widget_edit_role.xml
+++ b/com.discord/res/layout-v21/widget_edit_role.xml
@ -13,9 +13,9 @@
            </FrameLayout>
            <View style="@style/UiKit.Settings.Divider" />
            <TextView android:text="@string/form_label_role_color" style="@style/UiKit.Settings.Item.Header" />
-            <RelativeLayout android:id="@id/role_settings_color_selector_container" android:background="?selectableItemBackground" android:focusable="true" android:clickable="true" android:layout_width="fill_parent" android:layout_height="@dimen/uikit_spacing_xxlarge">
+            <RelativeLayout android:id="@id/role_settings_color_selector_container" android:background="?selectableItemBackground" android:focusable="true" android:clickable="true" android:layout_width="fill_parent" android:layout_height="@dimen/uikit_spacing_xxxlarge">
                <TextView android:layout_margin="@dimen/uikit_spacing_large" android:text="@string/form_label_role_color" android:layout_alignParentLeft="true" android:layout_centerVertical="true" android:layout_alignParentStart="true" style="@style/UiKit.TextView" />
-                <View android:id="@id/role_settings_current_color_display" android:background="@drawable/drawable_circle_purple_brand" android:layout_width="@dimen/uikit_spacing_xlarge" android:layout_height="@dimen/uikit_spacing_xlarge" android:layout_margin="@dimen/uikit_spacing_large" android:layout_alignParentRight="true" android:layout_alignParentEnd="true" android:elevation="2.0dip" />
+                <View android:id="@id/role_settings_current_color_display" android:background="@drawable/drawable_circle_purple_brand" android:layout_width="@dimen/uikit_spacing_xxlarge" android:layout_height="@dimen/uikit_spacing_xxlarge" android:layout_margin="@dimen/uikit_spacing_large" android:layout_alignParentRight="true" android:layout_alignParentEnd="true" android:elevation="2.0dip" />
                <View android:id="@id/role_settings_color_disabled_overlay" android:background="@color/white_alpha_30" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="fill_parent" />
            </RelativeLayout>
            <View style="@style/UiKit.Settings.Divider" />
--- a/com.discord/res/layout-v21/widget_server_settings_audit_log_listitem.xml
+++ b/com.discord/res/layout-v21/widget_server_settings_audit_log_listitem.xml
@ -9,7 +9,7 @@
            </FrameLayout>
            <com.facebook.drawee.view.SimpleDraweeView android:id="@id/audit_log_listitem_avatar" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:layout_toRightOf="@id/audit_log_listitem_action_container" android:layout_centerVertical="true" style="@style/Avatar.Standard" />
            <com.discord.app.AppTextView android:ellipsize="end" android:id="@id/audit_log_listitem_header_text" android:layout_marginTop="@dimen/uikit_spacing_medium" android:maxLines="2" android:layout_toLeftOf="@id/audit_log_listitem_arrow" android:layout_toRightOf="@id/audit_log_listitem_avatar" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView" />
-            <TextView android:textColor="?primary_400" android:ellipsize="end" android:id="@id/audit_log_listitem_date_text" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_xlarge" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:maxLines="2" android:layout_toRightOf="@id/audit_log_listitem_avatar" android:layout_below="@id/audit_log_listitem_header_text" style="@style/UiKit.TextView" />
+            <TextView android:textColor="?primary_400" android:ellipsize="end" android:id="@id/audit_log_listitem_date_text" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_xxlarge" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:maxLines="2" android:layout_toRightOf="@id/audit_log_listitem_avatar" android:layout_below="@id/audit_log_listitem_header_text" style="@style/UiKit.TextView" />
            <ImageView android:id="@id/audit_log_listitem_arrow" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:src="@drawable/ic_chevron_right_grey_12dp" android:layout_alignParentRight="true" android:layout_centerVertical="true" android:contentDescription="@string/more" android:layout_alignParentEnd="true" style="@style/UiKit.ImageView" />
        </RelativeLayout>
        <TextView android:textColor="?primary_400" android:id="@id/audit_log_listitem_change_text" android:padding="@dimen/uikit_spacing_large" android:visibility="gone" android:layout_width="fill_parent" style="@style/UiKit.TextView" />
--- a/com.discord/res/layout-v21/widget_server_settings_overview.xml
+++ b/com.discord/res/layout-v21/widget_server_settings_overview.xml
@ -8,7 +8,7 @@
        <LinearLayout android:focusableInTouchMode="true" style="@style/UiKit.ViewGroup.LinearLayout">
            <androidx.constraintlayout.widget.ConstraintLayout android:id="@id/server_settings_overview_icon_name_container" android:background="?selectableItemBackground" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:clipToPadding="false" style="@style/UiKit.ViewGroup.ConstraintLayout">
                <com.facebook.drawee.view.SimpleDraweeView android:id="@id/server_settings_overview_icon" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" app:placeholderImage="@color/brand_500" app:roundAsCircle="true" style="@style/Avatar.Large.ExtraExtra" />
-                <ImageView android:background="@drawable/drawable_uikit_white_circle" android:layout_width="@dimen/uikit_spacing_xlarge" android:layout_height="@dimen/uikit_spacing_xlarge" android:src="@drawable/ic_upload_image_40dp" android:contentDescription="@string/sample_empty_string" android:elevation="@dimen/app_elevation" app:layout_constraintEnd_toEndOf="@id/server_settings_overview_icon" app:layout_constraintRight_toRightOf="@id/server_settings_overview_icon" app:layout_constraintTop_toTopOf="@id/server_settings_overview_icon" style="@style/UiKit.ImageView" />
+                <ImageView android:background="@drawable/drawable_uikit_white_circle" android:layout_width="@dimen/uikit_spacing_xxlarge" android:layout_height="@dimen/uikit_spacing_xxlarge" android:src="@drawable/ic_upload_image_40dp" android:contentDescription="@string/sample_empty_string" android:elevation="@dimen/app_elevation" app:layout_constraintEnd_toEndOf="@id/server_settings_overview_icon" app:layout_constraintRight_toRightOf="@id/server_settings_overview_icon" app:layout_constraintTop_toTopOf="@id/server_settings_overview_icon" style="@style/UiKit.ImageView" />
                <TextView android:textSize="42.0sp" android:textColor="@color/primary_100" android:ellipsize="none" android:gravity="center" android:id="@id/server_settings_overview_icon_text" android:layout_width="0.0dip" android:layout_height="0.0dip" android:layout_margin="@dimen/uikit_spacing_medium" android:singleLine="true" app:layout_constraintBottom_toBottomOf="@id/server_settings_overview_icon" app:layout_constraintEnd_toEndOf="@id/server_settings_overview_icon" app:layout_constraintLeft_toLeftOf="@id/server_settings_overview_icon" app:layout_constraintRight_toRightOf="@id/server_settings_overview_icon" app:layout_constraintStart_toStartOf="@id/server_settings_overview_icon" app:layout_constraintTop_toTopOf="@id/server_settings_overview_icon" app:textAllCaps="true" style="@style/UiKit.TextView" />
                <com.discord.app.AppTextView android:textSize="@dimen/uikit_textsize_small" android:gravity="center_horizontal" android:id="@id/server_settings_overview_icon_label" android:layout_width="wrap_content" android:text="@string/minimum_size" android:maxLines="2" android:layout_centerHorizontal="true" android:textAlignment="center" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="@id/server_settings_overview_icon" app:layout_constraintLeft_toLeftOf="@id/server_settings_overview_icon" app:layout_constraintRight_toRightOf="@id/server_settings_overview_icon" app:layout_constraintStart_toStartOf="@id/server_settings_overview_icon" app:layout_constraintTop_toBottomOf="@id/server_settings_overview_icon" style="@style/UiKit.TextView.Subtext.Semibold" />
                <TextView android:textColor="@color/brand_500" android:id="@id/server_settings_overview_icon_remove" android:background="?selectableItemBackground" android:padding="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="wrap_content" android:text="@string/remove" android:layout_centerHorizontal="true" app:layout_constraintEnd_toEndOf="@id/server_settings_overview_icon" app:layout_constraintLeft_toLeftOf="@id/server_settings_overview_icon" app:layout_constraintRight_toRightOf="@id/server_settings_overview_icon" app:layout_constraintStart_toStartOf="@id/server_settings_overview_icon" app:layout_constraintTop_toBottomOf="@id/server_settings_overview_icon_label" style="@style/UiKit.TextView.Subtext.Semibold" />
--- a/com.discord/res/layout-v22/widget_notice_popup_channel.xml
+++ b/com.discord/res/layout-v22/widget_notice_popup_channel.xml
@ -4,10 +4,10 @@
    <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
        <com.facebook.drawee.view.SimpleDraweeView android:id="@id/popup_icon" android:visibility="gone" android:layout_margin="@dimen/uikit_spacing_medium" style="@style/Avatar.Notification" />
        <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="0.0dip" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:layout_weight="1.0" style="@style/UiKit.ViewGroup">
-            <TextView android:id="@id/popup_title" android:lineSpacingMultiplier="1.0" app:layout_constrainedWidth="true" app:layout_constraintEnd_toStartOf="@id/popup_subtitle" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="spread_inside" app:layout_constraintStart_toStartOf="parent" app:layout_constraintWidth_min="@dimen/uikit_spacing_xlarge" style="@style/UiKit.TextView.Subtext.Semibold.SingleLine" />
+            <TextView android:id="@id/popup_title" android:lineSpacingMultiplier="1.0" app:layout_constrainedWidth="true" app:layout_constraintEnd_toStartOf="@id/popup_subtitle" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="spread_inside" app:layout_constraintStart_toStartOf="parent" app:layout_constraintWidth_min="@dimen/uikit_spacing_xxlarge" style="@style/UiKit.TextView.Subtext.Semibold.SingleLine" />
            <TextView android:id="@id/popup_subtitle" android:layout_marginLeft="4.0dip" android:lineSpacingMultiplier="1.0" android:layout_marginStart="4.0dip" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@id/popup_title" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/popup_title" style="@style/UiKit.TextView.Subtext.Semibold.SingleLine" />
            <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:textColor="?primary_200" android:ellipsize="end" android:id="@id/popup_body" android:layout_width="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_xsmall" android:maxLines="3" android:lineSpacingMultiplier="1.0" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="@id/popup_title" app:layout_constraintTop_toBottomOf="@id/popup_title" style="@style/UiKit.TextView" />
-            <com.facebook.drawee.view.SimpleDraweeView android:id="@id/popup_attachment" android:background="?primary_600_bg" android:visibility="gone" android:layout_width="@dimen/uikit_spacing_xxlarge" android:layout_height="@dimen/uikit_spacing_xxlarge" app:actualImageScaleType="centerCrop" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="@id/popup_title" app:layout_constraintTop_toBottomOf="@id/popup_body" app:placeholderImage="?ic_insert_drive_file" app:placeholderImageScaleType="centerInside" />
+            <com.facebook.drawee.view.SimpleDraweeView android:id="@id/popup_attachment" android:background="?primary_600_bg" android:visibility="gone" android:layout_width="@dimen/uikit_spacing_xxxlarge" android:layout_height="@dimen/uikit_spacing_xxxlarge" app:actualImageScaleType="centerCrop" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="@id/popup_title" app:layout_constraintTop_toBottomOf="@id/popup_body" app:placeholderImage="?ic_insert_drive_file" app:placeholderImageScaleType="centerInside" />
        </androidx.constraintlayout.widget.ConstraintLayout>
        <ImageView android:layout_gravity="center|top" android:id="@id/popup_close_btn" android:src="?ic_settings" android:contentDescription="@string/dismiss" style="@style/UiKit.ImageView.Clickable.Corner.TopEnd" />
    </LinearLayout>
--- a/com.discord/res/layout-v22/widget_settings_account.xml
+++ b/com.discord/res/layout-v22/widget_settings_account.xml
@ -10,7 +10,7 @@
                <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/primary_100" android:text="@string/unverified_account_title" android:layout_centerInParent="true" style="@style/UiKit.TextView.Semibold" />
                <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/primary_100" android:id="@id/settings_account_verification_resend" android:background="@drawable/drawable_button_white" android:paddingLeft="12.0dip" android:paddingTop="@dimen/uikit_spacing_small" android:paddingRight="12.0dip" android:paddingBottom="@dimen/uikit_spacing_small" android:layout_margin="@dimen/uikit_spacing_medium" android:text="@string/verify_account" android:layout_alignParentRight="true" android:layout_centerVertical="true" android:layout_alignParentEnd="true" style="@style/UiKit.TextView" />
            </RelativeLayout>
-            <RelativeLayout android:background="?primary_630" android:paddingTop="@dimen/uikit_spacing_xlarge" android:paddingBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.RelativeLayout">
+            <RelativeLayout android:background="?primary_630" android:paddingTop="@dimen/uikit_spacing_xxlarge" android:paddingBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.RelativeLayout">
                <LinearLayout android:gravity="center_horizontal" android:id="@id/settings_account_avatar_wrap" style="@style/UiKit.ViewGroup.LinearLayout">
                    <RelativeLayout android:background="@drawable/drawable_circle_white_5" android:layout_width="wrap_content" android:layout_height="wrap_content">
                        <com.facebook.drawee.view.SimpleDraweeView android:id="@id/settings_account_avatar" app:roundWithOverlayColor="?primary_630" style="@style/Avatar.Hero" />
@ -35,8 +35,14 @@
                <TextView android:id="@id/settings_account_change_password" android:text="@string/change_password" android:drawableRight="@drawable/ic_chevron_right_grey_12dp" android:drawableEnd="@drawable/ic_chevron_right_grey_12dp" style="@style/UiKit.Settings.Item.Header" />
            </LinearLayout>
            <View style="@style/UiKit.Divider" />
-            <TextView android:id="@id/settings_account_private_data_header" android:focusable="true" android:focusableInTouchMode="false" android:clickable="true" android:text="@string/account_management" android:drawableRight="?ic_plus_a60" android:drawableEnd="?ic_plus_a60" style="@style/UiKit.Settings.Item.Header" />
-            <LinearLayout android:id="@id/settings_account_private_data_wrap" android:visibility="gone" style="@style/UiKit.ViewGroup.LinearLayout">
+            <FrameLayout android:id="@id/settings_account_mfa_container" android:visibility="gone" style="@style/UiKit.ViewGroup">
+                <TextView android:text="@string/two_fa" style="@style/UiKit.Settings.Item.Header" />
+                <TextView android:textColor="@color/status_green_500" android:layout_gravity="end|center" android:id="@id/settings_account_mfa_enabled_header" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="Enabled" android:drawableLeft="@drawable/ic_small_lock_green_24dp" android:textAllCaps="true" android:drawableStart="@drawable/ic_small_lock_green_24dp" android:layout_marginEnd="@dimen/uikit_spacing_large" style="@style/UiKit.TextView.Semibold" />
+            </FrameLayout>
+            <TextView android:id="@id/settings_account_view_backup_codes" android:text="@string/two_fa_view_backup_codes" android:drawableRight="@drawable/ic_chevron_right_grey_24dp" android:drawableEnd="@drawable/ic_chevron_right_grey_24dp" style="@style/UiKit.Settings.Item" />
+            <View style="@style/UiKit.Divider" />
+            <TextView android:text="@string/account_management" style="@style/UiKit.Settings.Item.Header" />
+            <LinearLayout android:id="@id/settings_account_private_data_wrap" style="@style/UiKit.ViewGroup.LinearLayout">
                <TextView android:textColor="@color/status_red_500" android:id="@id/settings_account_private_data_disable" android:text="@string/disable_account" style="@style/UiKit.Settings.Item" />
                <TextView android:textColor="@color/status_red_500" android:id="@id/settings_account_private_data_delete" android:text="@string/delete_account" style="@style/UiKit.Settings.Item" />
            </LinearLayout>
--- a/com.discord/res/layout/view_confirm_password_input_modal.xml
+++ b/com.discord/res/layout/view_confirm_password_input_modal.xml
@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<EditText android:id="@id/confirm_password_modal_edittext" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:hint="@string/form_label_password" style="@style/UiKit.Form.Field.EditText.Password"
+  xmlns:android="http://schemas.android.com/apk/res/android" />
--- a/com.discord/res/layout/view_global_search_item.xml
+++ b/com.discord/res/layout/view_global_search_item.xml
@ -5,7 +5,7 @@
    <ImageView android:id="@id/item_unread" android:src="@drawable/ic_unread_white_9dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ImageView" />
    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/item_icon_iv" android:padding="@dimen/uikit_spacing_xsmall" android:layout_width="@dimen/avatar_size_standard" android:layout_height="@dimen/avatar_size_standard" android:layout_margin="@dimen/uikit_spacing_small" android:contentDescription="@string/text_channel" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintDimensionRatio="1:1" app:layout_constraintEnd_toStartOf="@id/guideline" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:placeholderImage="@drawable/ic_channel_text_grey_18dp" app:placeholderImageScaleType="centerInside" app:roundAsCircle="true" style="@style/UiKit.ImageView" />
    <TextView android:textSize="@dimen/uikit_textsize_medium" android:id="@id/item_name_tv" android:layout_width="0.0dip" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toTopOf="@id/item_description_tv" app:layout_constraintEnd_toStartOf="@id/item_group_tv" app:layout_constraintStart_toStartOf="@id/guideline" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" style="@style/UiKit.TextView.Large.SingleLine" />
-    <TextView android:id="@id/item_description_tv" android:visibility="gone" android:layout_width="0.0dip" android:textAllCaps="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/item_group_tv" app:layout_constraintStart_toStartOf="@id/item_name_tv" app:layout_constraintTop_toBottomOf="@id/item_name_tv" app:layout_constraintWidth_min="@dimen/uikit_spacing_xxlarge" style="@style/UiKit.TextView.Subtext.Semibold.SingleLine" />
-    <TextView android:gravity="end" android:id="@id/item_group_tv" android:layout_marginRight="@dimen/uikit_spacing_medium" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/item_mentions_tv" app:layout_constraintRight_toLeftOf="@id/item_mentions_tv" app:layout_constraintTop_toTopOf="parent" app:layout_constraintWidth_max="140.0dip" app:layout_constraintWidth_min="@dimen/uikit_spacing_xxlarge" app:layout_goneMarginEnd="@dimen/uikit_spacing_medium" app:layout_goneMarginRight="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView.Subtext.SingleLine" />
+    <TextView android:id="@id/item_description_tv" android:visibility="gone" android:layout_width="0.0dip" android:textAllCaps="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/item_group_tv" app:layout_constraintStart_toStartOf="@id/item_name_tv" app:layout_constraintTop_toBottomOf="@id/item_name_tv" app:layout_constraintWidth_min="@dimen/uikit_spacing_xxxlarge" style="@style/UiKit.TextView.Subtext.Semibold.SingleLine" />
+    <TextView android:gravity="end" android:id="@id/item_group_tv" android:layout_marginRight="@dimen/uikit_spacing_medium" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/item_mentions_tv" app:layout_constraintRight_toLeftOf="@id/item_mentions_tv" app:layout_constraintTop_toTopOf="parent" app:layout_constraintWidth_max="140.0dip" app:layout_constraintWidth_min="@dimen/uikit_spacing_xxxlarge" app:layout_goneMarginEnd="@dimen/uikit_spacing_medium" app:layout_goneMarginRight="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView.Subtext.SingleLine" />
    <TextView android:id="@id/item_mentions_tv" android:visibility="gone" android:layout_marginRight="@dimen/uikit_spacing_medium" android:text="@string/sample_number_99" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/Icon.Mentions.Large" />
 </merge>
--- a/com.discord/res/layout/widget_auth_undelete_account.xml
+++ b/com.discord/res/layout/widget_auth_undelete_account.xml
@ -14,7 +14,7 @@
                        <TextView android:gravity="center" android:id="@id/auth_undelete_body" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/account_scheduled_for_deletion_description" style="@style/UiKit.TextView" />
                    </LinearLayout>
                </LinearLayout>
-                <Button android:id="@id/auth_undelete_delete" android:layout_marginTop="@dimen/uikit_spacing_xlarge" android:text="@string/return_to_login" style="@style/UiKit.Button" />
+                <Button android:id="@id/auth_undelete_delete" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:text="@string/return_to_login" style="@style/UiKit.Button" />
                <Button android:id="@id/auth_undelete_cancel" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/account_scheduled_for_deletion_cancel_mobile" style="@style/UiKit.Button.Outline" />
            </LinearLayout>
        </androidx.core.widget.NestedScrollView>
--- a/com.discord/res/layout/widget_channel_group_dm_settings.xml
+++ b/com.discord/res/layout/widget_channel_group_dm_settings.xml
@ -8,7 +8,7 @@
        <LinearLayout android:paddingBottom="@dimen/padding_bottom_fab_screen" style="@style/UiKit.ViewGroup.LinearLayout">
            <androidx.constraintlayout.widget.ConstraintLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.ConstraintLayout">
                <com.facebook.drawee.view.SimpleDraweeView android:id="@id/settings_group_icon" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" app:placeholderImage="@color/brand_500" app:roundAsCircle="true" style="@style/Avatar.Large.ExtraExtra" />
-                <ImageView android:background="@drawable/drawable_uikit_white_circle" android:layout_width="@dimen/uikit_spacing_xlarge" android:layout_height="@dimen/uikit_spacing_xlarge" android:src="@drawable/ic_upload_image_40dp" android:contentDescription="@string/edit" app:layout_constraintEnd_toEndOf="@id/settings_group_icon" app:layout_constraintRight_toRightOf="@id/settings_group_icon" app:layout_constraintTop_toTopOf="@id/settings_group_icon" style="@style/UiKit.ImageView" />
+                <ImageView android:background="@drawable/drawable_uikit_white_circle" android:layout_width="@dimen/uikit_spacing_xxlarge" android:layout_height="@dimen/uikit_spacing_xxlarge" android:src="@drawable/ic_upload_image_40dp" android:contentDescription="@string/edit" app:layout_constraintEnd_toEndOf="@id/settings_group_icon" app:layout_constraintRight_toRightOf="@id/settings_group_icon" app:layout_constraintTop_toTopOf="@id/settings_group_icon" style="@style/UiKit.ImageView" />
                <com.discord.app.AppTextView android:textSize="@dimen/uikit_textsize_small" android:gravity="center_horizontal" android:id="@id/settings_group_icon_label" android:layout_width="wrap_content" android:text="@string/minimum_size" android:maxLines="2" android:layout_centerHorizontal="true" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="@id/settings_group_icon" app:layout_constraintLeft_toLeftOf="@id/settings_group_icon" app:layout_constraintRight_toRightOf="@id/settings_group_icon" app:layout_constraintStart_toStartOf="@id/settings_group_icon" app:layout_constraintTop_toBottomOf="@id/settings_group_icon" style="@style/UiKit.TextView.Subtext.Semibold" />
                <TextView android:textColor="@color/brand_500" android:id="@id/settings_group_icon_remove" android:background="?selectableItemBackground" android:padding="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="wrap_content" android:text="@string/remove" android:layout_centerHorizontal="true" app:layout_constraintEnd_toEndOf="@id/settings_group_icon" app:layout_constraintLeft_toLeftOf="@id/settings_group_icon" app:layout_constraintRight_toRightOf="@id/settings_group_icon" app:layout_constraintStart_toStartOf="@id/settings_group_icon" app:layout_constraintTop_toBottomOf="@id/settings_group_icon_label" style="@style/UiKit.TextView.Subtext.Semibold" />
                <com.google.android.material.textfield.TextInputLayout android:layout_width="0.0dip" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="0.0dip" android:layout_marginRight="@dimen/uikit_spacing_large" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/settings_group_icon" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/settings_group_icon" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.Form.Field.EditText.Wrap">
--- a/com.discord/res/layout/widget_channel_settings_edit_permissions.xml
+++ b/com.discord/res/layout/widget_channel_settings_edit_permissions.xml
@ -43,7 +43,7 @@
                <com.discord.views.TernaryCheckBox android:id="@id/channel_permission_voice_move_members" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/move_members" app:tcs_subtext="@string/move_members_description" />
                <com.discord.views.TernaryCheckBox android:id="@id/channel_permission_voice_use_vad" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/use_vad" app:tcs_subtext="@string/use_vad_description" />
            </LinearLayout>
-            <Space android:layout_width="fill_parent" android:layout_height="@dimen/uikit_spacing_xxlarge" />
+            <Space android:layout_width="fill_parent" android:layout_height="@dimen/uikit_spacing_xxxlarge" />
        </LinearLayout>
    </androidx.core.widget.NestedScrollView>
    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/channel_permissions_save" android:focusable="true" android:visibility="gone" android:src="@drawable/icon_save" style="@style/Settings.FloatingActionButton" />
--- a/com.discord/res/layout/widget_channel_settings_permissions_overview.xml
+++ b/com.discord/res/layout/widget_channel_settings_permissions_overview.xml
@ -5,7 +5,7 @@
        <androidx.appcompat.widget.Toolbar style="@style/AppTheme.Toolbar" />
    </com.google.android.material.appbar.AppBarLayout>
    <androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
-        <LinearLayout android:paddingBottom="@dimen/uikit_spacing_xxlarge" android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
+        <LinearLayout android:paddingBottom="@dimen/uikit_spacing_xxxlarge" android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
            <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_300" android:id="@id/channel_settings_permissions_overview_add_role" android:focusable="true" android:clickable="true" android:text="@string/add_a_role" android:drawableLeft="?ic_plus_a60" android:drawableStart="?ic_plus_a60" style="@style/UiKit.Settings.Item.Icon" />
            <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_300" android:id="@id/channel_settings_permissions_overview_add_member" android:focusable="true" android:clickable="true" android:text="@string/add_a_member" android:drawableLeft="?ic_plus_a60" android:drawableStart="?ic_plus_a60" style="@style/UiKit.Settings.Item.Icon" />
            <LinearLayout android:id="@id/channel_settings_permissions_overview_roles_container" style="@style/UiKit.ViewGroup.LinearLayout">
--- a/com.discord/res/layout/widget_chat_detached.xml
+++ b/com.discord/res/layout/widget_chat_detached.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout android:background="@color/status_grey_500" android:visibility="gone" android:layout_height="@dimen/uikit_spacing_xlarge" style="@style/UiKit.ViewGroup.RelativeLayout"
+<RelativeLayout android:background="@color/status_grey_500" android:visibility="gone" android:layout_height="@dimen/uikit_spacing_xxlarge" style="@style/UiKit.ViewGroup.RelativeLayout"
  xmlns:android="http://schemas.android.com/apk/res/android">
    <ImageView android:id="@id/chat_detached_icon" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:src="@drawable/ic_message_white_18dp" android:layout_centerVertical="true" android:contentDescription="@string/sample_empty_string" style="@style/UiKit.ImageView" />
    <TextView android:textColor="@color/white" android:text="@string/youre_viewing_older_messages" android:layout_toLeftOf="@id/chat_detached_arrow" android:layout_toRightOf="@id/chat_detached_icon" android:layout_centerVertical="true" style="@style/UiKit.TextView.Subtext" />
--- a/com.discord/res/layout/widget_chat_input_emoji_picker.xml
+++ b/com.discord/res/layout/widget_chat_input_emoji_picker.xml
@ -6,7 +6,7 @@
      xmlns:android="http://schemas.android.com/apk/res/android" />
    <RelativeLayout android:id="@id/emoji_picker_bottom_bar" android:background="?colorPrimary" android:layout_width="fill_parent" android:layout_height="48.0dip" android:layout_alignParentBottom="true">
        <ImageView android:id="@id/emoji_picker_search_icon" android:src="?theme_search_menu_icon" android:layout_alignParentLeft="true" android:contentDescription="@string/search" style="@style/EmojiPickerButtonIcon" />
-        <com.google.android.material.tabs.TabLayout android:id="@id/emoji_picker_tab_layout" android:layout_width="wrap_content" android:layout_height="fill_parent" android:layout_toLeftOf="@id/emoji_picker_backspace_icon" android:layout_toRightOf="@id/emoji_picker_search_icon" android:layout_alignParentBottom="true" android:layout_alignWithParentIfMissing="true" app:tabMaxWidth="@dimen/uikit_spacing_xxlarge" app:tabMode="scrollable" app:tabPaddingEnd="@dimen/uikit_spacing_small" app:tabPaddingStart="@dimen/uikit_spacing_small" />
+        <com.google.android.material.tabs.TabLayout android:id="@id/emoji_picker_tab_layout" android:layout_width="wrap_content" android:layout_height="fill_parent" android:layout_toLeftOf="@id/emoji_picker_backspace_icon" android:layout_toRightOf="@id/emoji_picker_search_icon" android:layout_alignParentBottom="true" android:layout_alignWithParentIfMissing="true" app:tabMaxWidth="@dimen/uikit_spacing_xxxlarge" app:tabMode="scrollable" app:tabPaddingEnd="@dimen/uikit_spacing_small" app:tabPaddingStart="@dimen/uikit_spacing_small" />
        <ImageView android:id="@id/emoji_picker_backspace_icon" android:src="?theme_backspace_icon" android:layout_alignParentRight="true" android:contentDescription="@string/delete" style="@style/EmojiPickerButtonIcon" />
    </RelativeLayout>
 </RelativeLayout>
--- a/com.discord/res/layout/widget_chat_voice_list_item_user.xml
+++ b/com.discord/res/layout/widget_chat_voice_list_item_user.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout android:layout_width="@dimen/uikit_spacing_xlarge" android:layout_height="@dimen/uikit_spacing_xlarge" android:layout_margin="@dimen/uikit_spacing_xsmall"
+<RelativeLayout android:layout_width="@dimen/uikit_spacing_xxlarge" android:layout_height="@dimen/uikit_spacing_xxlarge" android:layout_margin="@dimen/uikit_spacing_xsmall"
  xmlns:android="http://schemas.android.com/apk/res/android">
    <View android:background="@drawable/drawable_circle_speaking" android:layout_width="fill_parent" android:layout_height="fill_parent" />
    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/voice_list_item_user" android:layout_centerInParent="true" style="@style/Avatar.Medium" />
--- a/com.discord/res/layout/widget_edit_role.xml
+++ b/com.discord/res/layout/widget_edit_role.xml
@ -13,9 +13,9 @@
            </FrameLayout>
            <View style="@style/UiKit.Settings.Divider" />
            <TextView android:text="@string/form_label_role_color" style="@style/UiKit.Settings.Item.Header" />
-            <RelativeLayout android:id="@id/role_settings_color_selector_container" android:background="?selectableItemBackground" android:focusable="true" android:clickable="true" android:layout_width="fill_parent" android:layout_height="@dimen/uikit_spacing_xxlarge">
+            <RelativeLayout android:id="@id/role_settings_color_selector_container" android:background="?selectableItemBackground" android:focusable="true" android:clickable="true" android:layout_width="fill_parent" android:layout_height="@dimen/uikit_spacing_xxxlarge">
                <TextView android:layout_margin="@dimen/uikit_spacing_large" android:text="@string/form_label_role_color" android:layout_alignParentLeft="true" android:layout_centerVertical="true" style="@style/UiKit.TextView" />
-                <View android:id="@id/role_settings_current_color_display" android:background="@drawable/drawable_circle_purple_brand" android:layout_width="@dimen/uikit_spacing_xlarge" android:layout_height="@dimen/uikit_spacing_xlarge" android:layout_margin="@dimen/uikit_spacing_large" android:layout_alignParentRight="true" />
+                <View android:id="@id/role_settings_current_color_display" android:background="@drawable/drawable_circle_purple_brand" android:layout_width="@dimen/uikit_spacing_xxlarge" android:layout_height="@dimen/uikit_spacing_xxlarge" android:layout_margin="@dimen/uikit_spacing_large" android:layout_alignParentRight="true" />
                <View android:id="@id/role_settings_color_disabled_overlay" android:background="@color/white_alpha_30" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="fill_parent" />
            </RelativeLayout>
            <View style="@style/UiKit.Settings.Divider" />
--- a/com.discord/res/layout/widget_friends_nearby.xml
+++ b/com.discord/res/layout/widget_friends_nearby.xml
@ -10,7 +10,7 @@
            <TextView android:gravity="center" android:layout_gravity="center" android:id="@id/nearby_friends_error" android:layout_margin="@dimen/uikit_spacing_large" android:text="@string/add_friend_nearby_enable_settings_android" android:drawableTop="?img_addfriends_notconnected" android:drawablePadding="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView" />
            <LinearLayout android:gravity="center" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout">
                <com.airbnb.lottie.LottieAnimationView android:id="@id/nearby_friends_searching_lottie" android:layout_width="220.0dip" android:layout_height="220.0dip" android:layout_marginBottom="@dimen/uikit_spacing_medium" app:lottie_autoPlay="false" app:lottie_fileName="animations/anim_friends_add_nearby_looking.json" app:lottie_loop="true" />
-                <TextView android:gravity="center" android:id="@id/nearby_friends_searching" android:layout_marginLeft="@dimen/uikit_spacing_xlarge" android:layout_marginRight="@dimen/uikit_spacing_xlarge" android:text="@string/add_friend_nearby_looking" style="@style/UiKit.TextView" />
+                <TextView android:gravity="center" android:id="@id/nearby_friends_searching" android:layout_marginLeft="@dimen/uikit_spacing_xxlarge" android:layout_marginRight="@dimen/uikit_spacing_xxlarge" android:text="@string/add_friend_nearby_looking" style="@style/UiKit.TextView" />
            </LinearLayout>
            <androidx.recyclerview.widget.RecyclerView android:id="@id/nearby_friends_recycler" android:padding="@dimen/uikit_spacing_small" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.RecyclerView" />
        </com.discord.app.AppViewFlipper>
--- a/com.discord/res/layout/widget_global_search.xml
+++ b/com.discord/res/layout/widget_global_search.xml
@ -6,8 +6,8 @@
        <androidx.recyclerview.widget.RecyclerView android:id="@id/global_search_guild_list" style="@style/UiKit.GuildsList.Horiz" />
    </com.google.android.material.appbar.AppBarLayout>
    <com.discord.app.AppViewFlipper android:id="@id/global_search_view_flipper" android:background="?colorPrimary" style="@style/AppTheme.AppBarScrollingViewBehavior">
-        <androidx.recyclerview.widget.RecyclerView android:id="@id/global_search_recycler" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_xxlarge" android:scrollbars="vertical" android:clipToPadding="false" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.RecyclerView" />
-        <TextView android:textColor="?primary_400" android:gravity="center" android:layout_width="fill_parent" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/quickswitcher_tutorial_message_search" android:drawableTop="?img_empty_search_defaults" android:drawablePadding="@dimen/uikit_spacing_large" style="@style/UiKit.TextView.H2" />
+        <androidx.recyclerview.widget.RecyclerView android:id="@id/global_search_recycler" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_xxxlarge" android:scrollbars="vertical" android:clipToPadding="false" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.RecyclerView" />
+        <TextView android:textColor="?primary_400" android:gravity="center" android:layout_width="fill_parent" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_xxxlarge" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/quickswitcher_tutorial_message_search" android:drawableTop="?img_empty_search_defaults" android:drawablePadding="@dimen/uikit_spacing_large" style="@style/UiKit.TextView.H2" />
        <androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView">
            <LinearLayout android:gravity="center_horizontal" android:paddingBottom="@dimen/list_bottom_padding" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
                <ImageView android:layout_width="80.0dip" android:layout_height="80.0dip" android:layout_margin="@dimen/uikit_spacing_large" android:src="?img_empty_search" android:contentDescription="@string/search_no_results" style="@style/UiKit.ImageView" />
--- a/com.discord/res/layout/widget_guild_invite_share.xml
+++ b/com.discord/res/layout/widget_guild_invite_share.xml
@ -6,7 +6,7 @@
    </com.google.android.material.appbar.AppBarLayout>
    <LinearLayout android:clipChildren="false" android:clipToPadding="false" android:layout_height="fill_parent" app:layout_behavior="@string/action_bar_scrolling_view_behavior" style="@style/UiKit.ViewGroup.Page.LinearLayout">
        <com.discord.app.AppViewFlipper android:id="@id/guild_invite_suggestions_flipper" android:layout_width="fill_parent" android:layout_height="0.0dip" android:layout_weight="1.0">
-            <ImageView android:layout_gravity="center" android:layout_margin="@dimen/uikit_spacing_xlarge" android:src="?img_empty_server_invites" android:scaleType="centerInside" android:importantForAccessibility="no" app:layout_behavior="@string/action_bar_scrolling_view_behavior" style="@style/UiKit.ImageView" />
+            <ImageView android:layout_gravity="center" android:layout_margin="@dimen/uikit_spacing_xxlarge" android:src="?img_empty_server_invites" android:scaleType="centerInside" android:importantForAccessibility="no" app:layout_behavior="@string/action_bar_scrolling_view_behavior" style="@style/UiKit.ImageView" />
            <LinearLayout android:layout_width="fill_parent" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout">
                <include layout="@layout/layout_search" />
                <androidx.recyclerview.widget.RecyclerView android:id="@id/guild_invite_suggestion_list" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:layout_weight="1.0" style="@style/UiKit.ViewGroup.RecyclerView" />
--- a/com.discord/res/layout/widget_guild_invite_share_item.xml
+++ b/com.discord/res/layout/widget_guild_invite_share_item.xml
@ -3,6 +3,6 @@
  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/item_icon_iv" android:layout_marginRight="@dimen/uikit_spacing_large" app:placeholderImage="?colorPrimaryCircle" style="@style/Avatar.Standard" />
    <TextView android:textSize="@dimen/uikit_textsize_large" android:id="@id/item_name_tv" android:layout_weight="1.0" style="@style/UiKit.TextView.Subtext.Semibold.SingleLine" />
-    <TextView android:textColor="@color/status_green_500" android:id="@id/item_invite_btn" android:paddingTop="0.0dip" android:paddingBottom="0.0dip" android:minWidth="@dimen/uikit_spacing_xxlarge" android:text="@string/invite_friend_modal_invite" android:textAllCaps="false" style="@style/UiKit.Button.Green.Fit.Outline" />
-    <TextView android:textColor="?primary_300_alpha_30" android:id="@id/item_sent" android:paddingTop="0.0dip" android:paddingBottom="0.0dip" android:visibility="gone" android:minWidth="@dimen/uikit_spacing_xxlarge" android:text="@string/invite_friend_modal_sent" android:textAllCaps="false" style="@style/UiKit.Button.Transparent.Fit" />
+    <TextView android:textColor="@color/status_green_500" android:id="@id/item_invite_btn" android:paddingTop="0.0dip" android:paddingBottom="0.0dip" android:minWidth="@dimen/uikit_spacing_xxxlarge" android:text="@string/invite_friend_modal_invite" android:textAllCaps="false" style="@style/UiKit.Button.Green.Fit.Outline" />
+    <TextView android:textColor="?primary_300_alpha_30" android:id="@id/item_sent" android:paddingTop="0.0dip" android:paddingBottom="0.0dip" android:visibility="gone" android:minWidth="@dimen/uikit_spacing_xxxlarge" android:text="@string/invite_friend_modal_sent" android:textAllCaps="false" style="@style/UiKit.Button.Transparent.Fit" />
 </LinearLayout>
--- a/com.discord/res/layout/widget_notice_dialog.xml
+++ b/com.discord/res/layout/widget_notice_dialog.xml
@ -7,7 +7,7 @@
    </LinearLayout>
    <androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView">
        <LinearLayout android:gravity="center" android:id="@id/notice_body_container" style="@style/UiKit.ViewGroup.LinearLayout">
-            <TextView android:gravity="center" android:layout_gravity="start" android:id="@id/notice_body_text" android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
+            <TextView android:gravity="start" android:layout_gravity="start" android:id="@id/notice_body_text" android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
        </LinearLayout>
    </androidx.core.widget.NestedScrollView>
    <View style="@style/UiKit.Settings.Divider" />
--- a/com.discord/res/layout/widget_notice_popup_channel.xml
+++ b/com.discord/res/layout/widget_notice_popup_channel.xml
@ -4,10 +4,10 @@
    <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
        <com.facebook.drawee.view.SimpleDraweeView android:id="@id/popup_icon" android:visibility="gone" android:layout_margin="@dimen/uikit_spacing_medium" style="@style/Avatar.Notification" />
        <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="0.0dip" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:layout_weight="1.0" style="@style/UiKit.ViewGroup">
-            <TextView android:id="@id/popup_title" android:lineSpacingMultiplier="1.0" app:layout_constrainedWidth="true" app:layout_constraintEnd_toStartOf="@id/popup_subtitle" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="spread_inside" app:layout_constraintStart_toStartOf="parent" app:layout_constraintWidth_min="@dimen/uikit_spacing_xlarge" style="@style/UiKit.TextView.Subtext.Semibold.SingleLine" />
+            <TextView android:id="@id/popup_title" android:lineSpacingMultiplier="1.0" app:layout_constrainedWidth="true" app:layout_constraintEnd_toStartOf="@id/popup_subtitle" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="spread_inside" app:layout_constraintStart_toStartOf="parent" app:layout_constraintWidth_min="@dimen/uikit_spacing_xxlarge" style="@style/UiKit.TextView.Subtext.Semibold.SingleLine" />
            <TextView android:id="@id/popup_subtitle" android:layout_marginLeft="4.0dip" android:lineSpacingMultiplier="1.0" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@id/popup_title" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/popup_title" style="@style/UiKit.TextView.Subtext.Semibold.SingleLine" />
            <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:textColor="?primary_200" android:ellipsize="end" android:id="@id/popup_body" android:layout_width="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_xsmall" android:maxLines="3" android:lineSpacingMultiplier="1.0" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="@id/popup_title" app:layout_constraintTop_toBottomOf="@id/popup_title" style="@style/UiKit.TextView" />
-            <com.facebook.drawee.view.SimpleDraweeView android:id="@id/popup_attachment" android:background="?primary_600_bg" android:visibility="gone" android:layout_width="@dimen/uikit_spacing_xxlarge" android:layout_height="@dimen/uikit_spacing_xxlarge" app:actualImageScaleType="centerCrop" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="@id/popup_title" app:layout_constraintTop_toBottomOf="@id/popup_body" app:placeholderImage="?ic_insert_drive_file" app:placeholderImageScaleType="centerInside" />
+            <com.facebook.drawee.view.SimpleDraweeView android:id="@id/popup_attachment" android:background="?primary_600_bg" android:visibility="gone" android:layout_width="@dimen/uikit_spacing_xxxlarge" android:layout_height="@dimen/uikit_spacing_xxxlarge" app:actualImageScaleType="centerCrop" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="@id/popup_title" app:layout_constraintTop_toBottomOf="@id/popup_body" app:placeholderImage="?ic_insert_drive_file" app:placeholderImageScaleType="centerInside" />
        </androidx.constraintlayout.widget.ConstraintLayout>
        <ImageView android:layout_gravity="center|top" android:id="@id/popup_close_btn" android:src="?ic_settings" android:contentDescription="@string/dismiss" style="@style/UiKit.ImageView.Clickable.Corner.TopEnd" />
    </LinearLayout>
--- a/com.discord/res/layout/widget_search_results.xml
+++ b/com.discord/res/layout/widget_search_results.xml
@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.recyclerview.widget.RecyclerView android:id="@id/search_results_list" android:paddingBottom="@dimen/uikit_spacing_xxlarge" android:scrollbars="vertical" android:clipToPadding="false" style="@style/AppTheme.AppBarScrollingViewBehavior"
+<androidx.recyclerview.widget.RecyclerView android:id="@id/search_results_list" android:paddingBottom="@dimen/uikit_spacing_xxxlarge" android:scrollbars="vertical" android:clipToPadding="false" style="@style/AppTheme.AppBarScrollingViewBehavior"
  xmlns:android="http://schemas.android.com/apk/res/android" />
--- a/com.discord/res/layout/widget_server_settings.xml
+++ b/com.discord/res/layout/widget_server_settings.xml
@ -3,7 +3,7 @@
  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
    <com.google.android.material.appbar.AppBarLayout android:background="?primary_630" style="@style/AppTheme.AppBarLayout">
        <com.google.android.material.appbar.CollapsingToolbarLayout style="@style/AppTheme.CollapsingToolbarLayout">
-            <LinearLayout android:gravity="center" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_xlarge" android:layout_marginTop="?actionBarSize" style="@style/UiKit.ViewGroup.LinearLayout">
+            <LinearLayout android:gravity="center" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_xxlarge" android:layout_marginTop="?actionBarSize" style="@style/UiKit.ViewGroup.LinearLayout">
                <RelativeLayout android:layout_gravity="center_horizontal" android:layout_width="@dimen/avatar_size_hero" android:layout_height="@dimen/avatar_size_hero" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.RelativeLayout">
                    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/server_settings_server_icon" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_alignParentTop="true" android:layout_centerHorizontal="true" app:placeholderImage="@color/brand_500" app:roundAsCircle="true" style="@style/Avatar.Hero" />
                    <TextView android:textSize="42.0sp" android:textColor="@color/primary_100" android:ellipsize="none" android:gravity="center_horizontal" android:id="@id/server_settings_server_icon_text" android:padding="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:layout_centerInParent="true" style="@style/UiKit.TextView.Large.SingleLine" />
--- a/com.discord/res/layout/widget_server_settings_audit_log_listitem.xml
+++ b/com.discord/res/layout/widget_server_settings_audit_log_listitem.xml
@ -9,7 +9,7 @@
            </FrameLayout>
            <com.facebook.drawee.view.SimpleDraweeView android:id="@id/audit_log_listitem_avatar" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:layout_toRightOf="@id/audit_log_listitem_action_container" android:layout_centerVertical="true" style="@style/Avatar.Standard" />
            <com.discord.app.AppTextView android:ellipsize="end" android:id="@id/audit_log_listitem_header_text" android:layout_marginTop="@dimen/uikit_spacing_medium" android:maxLines="2" android:layout_toLeftOf="@id/audit_log_listitem_arrow" android:layout_toRightOf="@id/audit_log_listitem_avatar" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView" />
-            <TextView android:textColor="?primary_400" android:ellipsize="end" android:id="@id/audit_log_listitem_date_text" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_xlarge" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:maxLines="2" android:layout_toRightOf="@id/audit_log_listitem_avatar" android:layout_below="@id/audit_log_listitem_header_text" style="@style/UiKit.TextView" />
+            <TextView android:textColor="?primary_400" android:ellipsize="end" android:id="@id/audit_log_listitem_date_text" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_xxlarge" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:maxLines="2" android:layout_toRightOf="@id/audit_log_listitem_avatar" android:layout_below="@id/audit_log_listitem_header_text" style="@style/UiKit.TextView" />
            <ImageView android:id="@id/audit_log_listitem_arrow" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:src="@drawable/ic_chevron_right_grey_12dp" android:layout_alignParentRight="true" android:layout_centerVertical="true" android:contentDescription="@string/more" style="@style/UiKit.ImageView" />
        </RelativeLayout>
        <TextView android:textColor="?primary_400" android:id="@id/audit_log_listitem_change_text" android:padding="@dimen/uikit_spacing_large" android:visibility="gone" android:layout_width="fill_parent" style="@style/UiKit.TextView" />
--- a/com.discord/res/layout/widget_server_settings_edit_integration.xml
+++ b/com.discord/res/layout/widget_server_settings_edit_integration.xml
@ -40,7 +40,7 @@
                    <com.discord.views.CheckedSetting android:id="@id/edit_integration_custom_emotes_toggle" app:cs_text="@string/enable_twitch_emoji_sync" style="@style/UiKit.CheckedSetting.Themed" />
                </LinearLayout>
            </LinearLayout>
-            <Space android:layout_width="fill_parent" android:layout_height="@dimen/uikit_spacing_xxlarge" />
+            <Space android:layout_width="fill_parent" android:layout_height="@dimen/uikit_spacing_xxxlarge" />
        </LinearLayout>
    </androidx.core.widget.NestedScrollView>
    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/edit_integration_save" style="@style/Settings.FloatingActionButton.Save" />
--- a/com.discord/res/layout/widget_server_settings_instant_invite_list_item.xml
+++ b/com.discord/res/layout/widget_server_settings_instant_invite_list_item.xml
@ -7,7 +7,7 @@
                <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_100" android:id="@id/invite_code" style="@style/UiKit.TextView" />
                <TextView android:id="@id/invite_channel" style="@style/UiKit.TextView" />
            </LinearLayout>
-            <LinearLayout android:id="@id/invite_expiration_container" android:layout_width="wrap_content" android:layout_marginRight="@dimen/uikit_spacing_xlarge" android:layout_toLeftOf="@id/invite_settings_icon" style="@style/UiKit.ViewGroup.LinearLayout">
+            <LinearLayout android:id="@id/invite_expiration_container" android:layout_width="wrap_content" android:layout_marginRight="@dimen/uikit_spacing_xxlarge" android:layout_toLeftOf="@id/invite_settings_icon" style="@style/UiKit.ViewGroup.LinearLayout">
                <TextView android:textSize="@dimen/uikit_textsize_large" android:id="@id/invite_expires_label" android:text="@string/expires_in" style="@style/UiKit.TextView" />
                <TextView android:id="@id/invite_expiration_time" style="@style/UiKit.TextView" />
            </LinearLayout>
--- a/com.discord/res/layout/widget_server_settings_overview.xml
+++ b/com.discord/res/layout/widget_server_settings_overview.xml
@ -8,7 +8,7 @@
        <LinearLayout android:focusableInTouchMode="true" style="@style/UiKit.ViewGroup.LinearLayout">
            <androidx.constraintlayout.widget.ConstraintLayout android:id="@id/server_settings_overview_icon_name_container" android:background="?selectableItemBackground" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:clipToPadding="false" style="@style/UiKit.ViewGroup.ConstraintLayout">
                <com.facebook.drawee.view.SimpleDraweeView android:id="@id/server_settings_overview_icon" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" app:placeholderImage="@color/brand_500" app:roundAsCircle="true" style="@style/Avatar.Large.ExtraExtra" />
-                <ImageView android:background="@drawable/drawable_uikit_white_circle" android:layout_width="@dimen/uikit_spacing_xlarge" android:layout_height="@dimen/uikit_spacing_xlarge" android:src="@drawable/ic_upload_image_40dp" android:contentDescription="@string/sample_empty_string" app:layout_constraintEnd_toEndOf="@id/server_settings_overview_icon" app:layout_constraintRight_toRightOf="@id/server_settings_overview_icon" app:layout_constraintTop_toTopOf="@id/server_settings_overview_icon" style="@style/UiKit.ImageView" />
+                <ImageView android:background="@drawable/drawable_uikit_white_circle" android:layout_width="@dimen/uikit_spacing_xxlarge" android:layout_height="@dimen/uikit_spacing_xxlarge" android:src="@drawable/ic_upload_image_40dp" android:contentDescription="@string/sample_empty_string" app:layout_constraintEnd_toEndOf="@id/server_settings_overview_icon" app:layout_constraintRight_toRightOf="@id/server_settings_overview_icon" app:layout_constraintTop_toTopOf="@id/server_settings_overview_icon" style="@style/UiKit.ImageView" />
                <TextView android:textSize="42.0sp" android:textColor="@color/primary_100" android:ellipsize="none" android:gravity="center" android:id="@id/server_settings_overview_icon_text" android:layout_width="0.0dip" android:layout_height="0.0dip" android:layout_margin="@dimen/uikit_spacing_medium" android:singleLine="true" app:layout_constraintBottom_toBottomOf="@id/server_settings_overview_icon" app:layout_constraintEnd_toEndOf="@id/server_settings_overview_icon" app:layout_constraintLeft_toLeftOf="@id/server_settings_overview_icon" app:layout_constraintRight_toRightOf="@id/server_settings_overview_icon" app:layout_constraintStart_toStartOf="@id/server_settings_overview_icon" app:layout_constraintTop_toTopOf="@id/server_settings_overview_icon" app:textAllCaps="true" style="@style/UiKit.TextView" />
                <com.discord.app.AppTextView android:textSize="@dimen/uikit_textsize_small" android:gravity="center_horizontal" android:id="@id/server_settings_overview_icon_label" android:layout_width="wrap_content" android:text="@string/minimum_size" android:maxLines="2" android:layout_centerHorizontal="true" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="@id/server_settings_overview_icon" app:layout_constraintLeft_toLeftOf="@id/server_settings_overview_icon" app:layout_constraintRight_toRightOf="@id/server_settings_overview_icon" app:layout_constraintStart_toStartOf="@id/server_settings_overview_icon" app:layout_constraintTop_toBottomOf="@id/server_settings_overview_icon" style="@style/UiKit.TextView.Subtext.Semibold" />
                <TextView android:textColor="@color/brand_500" android:id="@id/server_settings_overview_icon_remove" android:background="?selectableItemBackground" android:padding="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="wrap_content" android:text="@string/remove" android:layout_centerHorizontal="true" app:layout_constraintEnd_toEndOf="@id/server_settings_overview_icon" app:layout_constraintLeft_toLeftOf="@id/server_settings_overview_icon" app:layout_constraintRight_toRightOf="@id/server_settings_overview_icon" app:layout_constraintStart_toStartOf="@id/server_settings_overview_icon" app:layout_constraintTop_toBottomOf="@id/server_settings_overview_icon_label" style="@style/UiKit.TextView.Subtext.Semibold" />
--- a/com.discord/res/layout/widget_server_settings_role_item.xml
+++ b/com.discord/res/layout/widget_server_settings_role_item.xml
@ -5,7 +5,7 @@
    <View android:id="@id/server_settings_role_item_divider_targeted" android:background="@color/purple_brand" android:visibility="invisible" android:layout_width="fill_parent" android:layout_height="3.0dip" android:layout_alignParentTop="true" />
    <FrameLayout android:gravity="center_vertical" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_centerVertical="true" style="@style/UiKit.ViewGroup">
        <ImageView android:layout_gravity="start|center" android:id="@id/server_settings_role_item_lock_indicator" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:src="?ic_lock" android:contentDescription="@string/help_role_locked" style="@style/UiKit.ImageView" />
-        <TextView android:layout_gravity="center_vertical" android:id="@id/server_settings_role_item_name" android:layout_marginLeft="@dimen/uikit_spacing_xxlarge" android:singleLine="true" style="@style/UiKit.TextView.Semibold" />
+        <TextView android:layout_gravity="center_vertical" android:id="@id/server_settings_role_item_name" android:layout_marginLeft="@dimen/uikit_spacing_xxxlarge" android:singleLine="true" style="@style/UiKit.TextView.Semibold" />
    </FrameLayout>
    <View android:id="@id/server_settings_role_item_bottom_divider" android:layout_alignParentBottom="true" style="@style/UiKit.Settings.Divider" />
 </RelativeLayout>
--- a/com.discord/res/layout/widget_server_settings_security.xml
+++ b/com.discord/res/layout/widget_server_settings_security.xml
@ -6,11 +6,11 @@
    </com.google.android.material.appbar.AppBarLayout>
    <LinearLayout android:layout_width="fill_parent" android:layout_height="fill_parent" app:layout_behavior="@string/action_bar_scrolling_view_behavior" style="@style/UiKit.ViewGroup.LinearLayout.Rotatable">
        <LinearLayout android:gravity="center" android:layout_gravity="center" android:layout_width="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
-            <TextView android:id="@id/server_settings_security_label" android:layout_marginTop="@dimen/uikit_spacing_xlarge" android:text="@string/guild_security_req_mfa_label" style="@style/UiKit.TextView.H2" />
+            <TextView android:id="@id/server_settings_security_label" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:text="@string/guild_security_req_mfa_label" style="@style/UiKit.TextView.H2" />
            <Button android:id="@id/server_settings_security_toggle_mfa_button" android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/guild_security_req_mfa_turn_on" style="@style/UiKit.Button.Green.Fit" />
        </LinearLayout>
-        <RelativeLayout android:gravity="center" android:layout_gravity="center_horizontal" android:layout_width="wrap_content" android:layout_height="fill_parent" android:layout_margin="@dimen/uikit_spacing_xlarge" app:layout_behavior="@string/appbar_scrolling_view_behavior" style="@style/UiKit.ViewGroup.RelativeLayout">
-            <ImageView android:layout_marginBottom="@dimen/uikit_spacing_xlarge" android:src="@drawable/asset_security" android:layout_above="@id/mfa_description_text" android:layout_centerHorizontal="true" android:contentDescription="@string/guild_security_req_mfa_turn_on" style="@style/UiKit.ImageView" />
+        <RelativeLayout android:gravity="center" android:layout_gravity="center_horizontal" android:layout_width="wrap_content" android:layout_height="fill_parent" android:layout_margin="@dimen/uikit_spacing_xxlarge" app:layout_behavior="@string/appbar_scrolling_view_behavior" style="@style/UiKit.ViewGroup.RelativeLayout">
+            <ImageView android:layout_marginBottom="@dimen/uikit_spacing_xxlarge" android:src="@drawable/asset_security" android:layout_above="@id/mfa_description_text" android:layout_centerHorizontal="true" android:contentDescription="@string/guild_security_req_mfa_turn_on" style="@style/UiKit.ImageView" />
            <com.discord.app.AppTextView android:id="@id/mfa_description_text" android:text="@string/guild_security_req_mfa_body" android:layout_alignParentBottom="true" style="@style/UiKit.TextView" />
        </RelativeLayout>
    </LinearLayout>
--- a/com.discord/res/layout/widget_server_settings_vanity_url.xml
+++ b/com.discord/res/layout/widget_server_settings_vanity_url.xml
@ -6,14 +6,14 @@
    </com.google.android.material.appbar.AppBarLayout>
    <androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
        <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
-            <RelativeLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_xlarge" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.RelativeLayout">
+            <RelativeLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_xxlarge" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.RelativeLayout">
                <TextView android:text="@string/vanity_url" android:textAllCaps="true" style="@style/UiKit.TextView.Bold" />
                <TextView android:textColor="@color/status_red_500" android:id="@id/server_settings_vanity_url_remove" android:visibility="gone" android:text="@string/remove" android:layout_alignParentRight="true" style="@style/UiKit.TextView.Bold" />
            </RelativeLayout>
            <RelativeLayout android:id="@id/server_settings_vanity_url_input_container" android:padding="@dimen/uikit_spacing_large" android:focusable="true" android:focusableInTouchMode="true" android:descendantFocusability="beforeDescendants" style="@style/UiKit.ViewGroup.RelativeLayout">
                <TextView android:textSize="@dimen/uikit_textsize_large" android:id="@id/server_settings_vanity_url_prefix" android:text="@string/discord_gg" android:layout_alignParentLeft="true" android:layout_centerVertical="true" style="@style/UiKit.TextView" />
                <com.discord.app.AppEditText android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_100" android:id="@id/server_settings_vanity_input" android:background="@android:color/transparent" android:layout_width="fill_parent" android:hint="@string/vanity_url_hint_mobile" android:singleLine="true" android:digits="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890-" android:layout_toLeftOf="@id/server_settings_vanity_url_loading_indicator" android:layout_toRightOf="@id/server_settings_vanity_url_prefix" android:layout_centerVertical="true" android:inputType="textNoSuggestions" android:imeOptions="actionDone" style="@style/UiKit.TextView" />
-                <ProgressBar android:id="@id/server_settings_vanity_url_loading_indicator" android:layout_width="@dimen/uikit_spacing_xlarge" android:layout_height="@dimen/uikit_spacing_xlarge" android:indeterminate="true" android:layout_alignParentRight="true" android:layout_centerVertical="true" />
+                <ProgressBar android:id="@id/server_settings_vanity_url_loading_indicator" android:layout_width="@dimen/uikit_spacing_xxlarge" android:layout_height="@dimen/uikit_spacing_xxlarge" android:indeterminate="true" android:layout_alignParentRight="true" android:layout_centerVertical="true" />
            </RelativeLayout>
            <View style="@style/UiKit.Settings.Divider" />
            <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/status_red_500" android:id="@id/server_settings_vanity_url_error_text" android:visibility="gone" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/change_vanity_url_error" style="@style/UiKit.TextView" />
--- a/com.discord/res/layout/widget_settings_account.xml
+++ b/com.discord/res/layout/widget_settings_account.xml
@ -10,7 +10,7 @@
                <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/primary_100" android:text="@string/unverified_account_title" android:layout_centerInParent="true" style="@style/UiKit.TextView.Semibold" />
                <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/primary_100" android:id="@id/settings_account_verification_resend" android:background="@drawable/drawable_button_white" android:paddingLeft="12.0dip" android:paddingTop="@dimen/uikit_spacing_small" android:paddingRight="12.0dip" android:paddingBottom="@dimen/uikit_spacing_small" android:layout_margin="@dimen/uikit_spacing_medium" android:text="@string/verify_account" android:layout_alignParentRight="true" android:layout_centerVertical="true" style="@style/UiKit.TextView" />
            </RelativeLayout>
-            <RelativeLayout android:background="?primary_630" android:paddingTop="@dimen/uikit_spacing_xlarge" android:paddingBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.RelativeLayout">
+            <RelativeLayout android:background="?primary_630" android:paddingTop="@dimen/uikit_spacing_xxlarge" android:paddingBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.RelativeLayout">
                <LinearLayout android:gravity="center_horizontal" android:id="@id/settings_account_avatar_wrap" style="@style/UiKit.ViewGroup.LinearLayout">
                    <RelativeLayout android:background="@drawable/drawable_circle_white_5" android:layout_width="wrap_content" android:layout_height="wrap_content">
                        <com.facebook.drawee.view.SimpleDraweeView android:id="@id/settings_account_avatar" app:roundWithOverlayColor="?primary_630" style="@style/Avatar.Hero" />
@ -35,8 +35,14 @@
                <TextView android:id="@id/settings_account_change_password" android:text="@string/change_password" android:drawableRight="@drawable/ic_chevron_right_grey_12dp" android:drawableEnd="@drawable/ic_chevron_right_grey_12dp" style="@style/UiKit.Settings.Item.Header" />
            </LinearLayout>
            <View style="@style/UiKit.Divider" />
-            <TextView android:id="@id/settings_account_private_data_header" android:focusable="true" android:focusableInTouchMode="false" android:clickable="true" android:text="@string/account_management" android:drawableRight="?ic_plus_a60" android:drawableEnd="?ic_plus_a60" style="@style/UiKit.Settings.Item.Header" />
-            <LinearLayout android:id="@id/settings_account_private_data_wrap" android:visibility="gone" style="@style/UiKit.ViewGroup.LinearLayout">
+            <FrameLayout android:id="@id/settings_account_mfa_container" android:visibility="gone" style="@style/UiKit.ViewGroup">
+                <TextView android:text="@string/two_fa" style="@style/UiKit.Settings.Item.Header" />
+                <TextView android:textColor="@color/status_green_500" android:layout_gravity="end|center" android:id="@id/settings_account_mfa_enabled_header" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="Enabled" android:drawableLeft="@drawable/ic_small_lock_green_24dp" android:textAllCaps="true" android:drawableStart="@drawable/ic_small_lock_green_24dp" style="@style/UiKit.TextView.Semibold" />
+            </FrameLayout>
+            <TextView android:id="@id/settings_account_view_backup_codes" android:text="@string/two_fa_view_backup_codes" android:drawableRight="@drawable/ic_chevron_right_grey_24dp" android:drawableEnd="@drawable/ic_chevron_right_grey_24dp" style="@style/UiKit.Settings.Item" />
+            <View style="@style/UiKit.Divider" />
+            <TextView android:text="@string/account_management" style="@style/UiKit.Settings.Item.Header" />
+            <LinearLayout android:id="@id/settings_account_private_data_wrap" style="@style/UiKit.ViewGroup.LinearLayout">
                <TextView android:textColor="@color/status_red_500" android:id="@id/settings_account_private_data_disable" android:text="@string/disable_account" style="@style/UiKit.Settings.Item" />
                <TextView android:textColor="@color/status_red_500" android:id="@id/settings_account_private_data_delete" android:text="@string/delete_account" style="@style/UiKit.Settings.Item" />
            </LinearLayout>
--- a/com.discord/res/layout/widget_settings_account_backup_codes.xml
+++ b/com.discord/res/layout/widget_settings_account_backup_codes.xml
@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout style="@style/UiKit.ViewGroup.Page"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme.AppBarLayout.Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme.Toolbar" />
+    </com.google.android.material.appbar.AppBarLayout>
+    <androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
+        <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
+            <com.discord.app.AppTextView android:id="@id/settings_backup_codes_info" android:layout_margin="@dimen/uikit_spacing_large" android:text="@string/two_fa_backup_codes_body" style="@style/UiKit.TextView" />
+            <View style="@style/UiKit.Divider" />
+            <androidx.recyclerview.widget.RecyclerView android:id="@id/settings_backup_codes_rv" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.RecyclerView" />
+            <Button android:id="@id/settings_backup_codes_generate" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" android:text="@string/two_fa_generate_codes" style="@style/UiKit.Button.Grey" />
+        </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
+    <com.discord.utilities.dimmer.DimmerView style="@style/UiKit.DimmerView" />
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/com.discord/res/layout/widget_settings_appearance.xml
+++ b/com.discord/res/layout/widget_settings_appearance.xml
@ -13,14 +13,6 @@
            <View style="@style/UiKit.Settings.Divider" />
            <TextView android:text="@string/sync" style="@style/UiKit.Settings.Item.Header" />
            <com.discord.views.CheckedSetting android:id="@id/settings_appearance_sync_switch" app:cs_text="@string/settings_sync" app:cs_view_type="switchview" style="@style/UiKit.CheckedSetting.Themed" />
-            <View style="@style/UiKit.Settings.Divider" />
-            <LinearLayout android:id="@id/settings_appearance_font_scaling_container" style="@style/UiKit.ViewGroup.LinearLayout">
-                <TextView android:text="@string/accessibility_font_scaling_label" style="@style/UiKit.Settings.Item.Header" />
-                <LinearLayout style="@style/UiKit.Settings.Item">
-                    <TextView android:id="@id/settings_appearance_current_font_scale" android:minWidth="30.0dip" style="@style/UiKit.TextView" />
-                    <SeekBar android:id="@id/settings_appearance_font_scaling_seekbar" android:max="70" style="@style/UiKit.SeekBar" />
-                </LinearLayout>
-            </LinearLayout>
        </LinearLayout>
    </androidx.core.widget.NestedScrollView>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/com.discord/res/layout/widget_settings_item_backup_code.xml
+++ b/com.discord/res/layout/widget_settings_item_backup_code.xml
@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView android:textColor="?primary_100" android:id="@id/item_backup_code_tv" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:foreground="?selectableItemBackground" app:font="@font/sourcecodepro_semibold" style="@style/UiKit.TextView.Large"
+  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" />
--- a/com.discord/res/layout/widget_settings_item_backup_code_header.xml
+++ b/com.discord/res/layout/widget_settings_item_backup_code_header.xml
@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView android:id="@id/item_header" style="@style/UiKit.Settings.Item.Header"
+  xmlns:android="http://schemas.android.com/apk/res/android" />
--- a/com.discord/res/layout/widget_user_info.xml
+++ b/com.discord/res/layout/widget_user_info.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.ScrollView.Page"
  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <LinearLayout android:paddingBottom="@dimen/uikit_spacing_xlarge" android:focusableInTouchMode="true" style="@style/UiKit.ViewGroup.LinearLayout">
+    <LinearLayout android:paddingBottom="@dimen/uikit_spacing_xxlarge" android:focusableInTouchMode="true" style="@style/UiKit.ViewGroup.LinearLayout">
        <FrameLayout android:id="@id/user_info_rich_presence_container" android:visibility="gone" style="@style/UiKit.ViewGroup" />
        <View android:id="@id/user_info_activity_divider" android:visibility="gone" android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/UiKit.Settings.Divider" />
        <TextView android:text="@string/note" style="@style/UiKit.Settings.Item.Header" />
@ -10,6 +10,6 @@
        </com.google.android.material.textfield.TextInputLayout>
        <View android:id="@id/user_info_identities_divider" style="@style/UiKit.Settings.Divider" />
        <TextView android:id="@id/user_info_identities_header" android:text="@string/connected_accounts" style="@style/UiKit.Settings.Item.Header" />
-        <androidx.recyclerview.widget.RecyclerView android:id="@id/platform_identities_list" android:paddingBottom="@dimen/uikit_spacing_xlarge" style="@style/UiKit.ViewGroup.RecyclerView" />
+        <androidx.recyclerview.widget.RecyclerView android:id="@id/platform_identities_list" android:paddingBottom="@dimen/uikit_spacing_xxlarge" style="@style/UiKit.ViewGroup.RecyclerView" />
    </LinearLayout>
 </androidx.core.widget.NestedScrollView>
--- a/com.discord/res/layout/widget_user_profile_adapter_item_empty.xml
+++ b/com.discord/res/layout/widget_user_profile_adapter_item_empty.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout android:gravity="center" android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout"
  xmlns:android="http://schemas.android.com/apk/res/android">
-    <ImageView android:id="@id/user_profile_adapter_item_empty" android:layout_marginTop="@dimen/uikit_spacing_xlarge" android:contentDescription="@string/sample_empty_string" style="@style/UiKit.ImageView" />
+    <ImageView android:id="@id/user_profile_adapter_item_empty" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:contentDescription="@string/sample_empty_string" style="@style/UiKit.ImageView" />
    <TextView android:id="@id/user_profile_adapter_item_empty_text" android:layout_margin="@dimen/uikit_spacing_large" style="@style/UiKit.TextView.H2" />
 </LinearLayout>
--- a/com.discord/res/values/dimens.xml
+++ b/com.discord/res/values/dimens.xml
@ -343,9 +343,10 @@
    <dimen name="uikit_spacing_large">16.0dip</dimen>
    <dimen name="uikit_spacing_medium">8.0dip</dimen>
    <dimen name="uikit_spacing_small">4.0dip</dimen>
-    <dimen name="uikit_spacing_xlarge">32.0dip</dimen>
+    <dimen name="uikit_spacing_xlarge">24.0dip</dimen>
    <dimen name="uikit_spacing_xsmall">2.0dip</dimen>
-    <dimen name="uikit_spacing_xxlarge">64.0dip</dimen>
+    <dimen name="uikit_spacing_xxlarge">32.0dip</dimen>
+    <dimen name="uikit_spacing_xxxlarge">64.0dip</dimen>
    <dimen name="uikit_textsize_large">16.0sp</dimen>
    <dimen name="uikit_textsize_medium">14.0sp</dimen>
    <dimen name="uikit_textsize_small">12.0sp</dimen>
--- a/com.discord/res/values/ids.xml
+++ b/com.discord/res/values/ids.xml
@ -379,6 +379,7 @@
    <item type="id" name="color_picker_done" />
    <item type="id" name="color_picker_gridview" />
    <item type="id" name="color_picker_reset" />
+    <item type="id" name="confirm_password_modal_edittext" />
    <item type="id" name="connected_account_disconnect" />
    <item type="id" name="connected_account_display_activity_switch" />
    <item type="id" name="connected_account_display_switch" />
@ -715,6 +716,7 @@
    <item type="id" name="invite_user_name" />
    <item type="id" name="invite_uses" />
    <item type="id" name="invite_uses_label" />
+    <item type="id" name="item_backup_code_tv" />
    <item type="id" name="item_check_indicator" />
    <item type="id" name="item_description_tv" />
    <item type="id" name="item_game_invite_application_name" />
@ -736,6 +738,7 @@
    <item type="id" name="item_group_tv" />
    <item type="id" name="item_guild_welcome_header" />
    <item type="id" name="item_guild_welcome_subheader" />
+    <item type="id" name="item_header" />
    <item type="id" name="item_header_tv" />
    <item type="id" name="item_icon_iv" />
    <item type="id" name="item_invite_btn" />
@ -1198,11 +1201,12 @@
    <item type="id" name="settings_account_claim_btn" />
    <item type="id" name="settings_account_credentials_wrap" />
    <item type="id" name="settings_account_email" />
+    <item type="id" name="settings_account_mfa_container" />
+    <item type="id" name="settings_account_mfa_enabled_header" />
    <item type="id" name="settings_account_password" />
    <item type="id" name="settings_account_password_wrap" />
    <item type="id" name="settings_account_private_data_delete" />
    <item type="id" name="settings_account_private_data_disable" />
-    <item type="id" name="settings_account_private_data_header" />
    <item type="id" name="settings_account_private_data_wrap" />
    <item type="id" name="settings_account_remove_avatar" />
    <item type="id" name="settings_account_save" />
@ -1211,16 +1215,17 @@
    <item type="id" name="settings_account_username" />
    <item type="id" name="settings_account_verification" />
    <item type="id" name="settings_account_verification_resend" />
+    <item type="id" name="settings_account_view_backup_codes" />
    <item type="id" name="settings_acknowledgements" />
    <item type="id" name="settings_app_info" />
    <item type="id" name="settings_appearance" />
-    <item type="id" name="settings_appearance_current_font_scale" />
-    <item type="id" name="settings_appearance_font_scaling_container" />
-    <item type="id" name="settings_appearance_font_scaling_seekbar" />
    <item type="id" name="settings_appearance_sync_switch" />
    <item type="id" name="settings_appearance_theme_dark_radio" />
    <item type="id" name="settings_appearance_theme_light_radio" />
    <item type="id" name="settings_appearance_theme_pure_evil_radio" />
+    <item type="id" name="settings_backup_codes_generate" />
+    <item type="id" name="settings_backup_codes_info" />
+    <item type="id" name="settings_backup_codes_rv" />
    <item type="id" name="settings_behavior" />
    <item type="id" name="settings_behavior_back_button_toggle" />
    <item type="id" name="settings_behavior_browser_switch" />
--- a/com.discord/res/values/public.xml
+++ b/com.discord/res/values/public.xml
--- a/Show more
+++ b/Show more