Changes of com.discord v846

com.discord/res/layout/view_application_news.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout android:background="?application_news_background" style="@style/UiKit.ViewGroup"
-  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <ImageView android:id="@id/application_news_loading" android:padding="@dimen/uikit_spacing_large" android:visibility="gone" android:layout_width="fill_parent" android:src="?application_news_loading" android:scaleType="fitXY" android:contentDescription="@string/loading" style="@style/UiKit.ImageView" />
-    <LinearLayout android:gravity="center" android:id="@id/application_news_error_container" android:padding="@dimen/uikit_spacing_xlarge" android:visibility="gone" style="@style/UiKit.ViewGroup.LinearLayout">
-        <ImageView android:layout_marginBottom="@dimen/uikit_spacing_large" android:src="?application_news_error" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
-        <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?application_news_title_text_color" android:gravity="center" android:layout_width="fill_parent" android:text="@string/application_news_error_title" style="@style/UiKit.TextView.Semibold" />
-        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?application_news_description_text_color" android:gravity="center" android:layout_width="fill_parent" android:text="@string/application_news_error_body" style="@style/UiKit.TextView" />
-        <Button android:id="@id/application_news_error_retry" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/try_again" style="@style/UiKit.Button.Theme" />
-    </LinearLayout>
-    <LinearLayout android:id="@id/application_news_content" android:visibility="visible" style="@style/UiKit.ViewGroup.LinearLayout">
-        <FrameLayout android:id="@id/application_news_header_container" android:background="?application_news_top_strip_color" android:layout_width="fill_parent" android:layout_height="@dimen/application_news_header_strip_height">
-            <com.facebook.drawee.view.SimpleDraweeView android:id="@id/application_news_splash" android:layout_width="fill_parent" android:layout_height="fill_parent" app:actualImageScaleType="fitCenter" app:roundBottomLeft="false" app:roundBottomRight="false" app:roundedCornerRadius="4.0dip" />
-        </FrameLayout>
-        <TextView android:textColor="?application_news_title_text_color" android:id="@id/application_news_title" android:layout_width="fill_parent" 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_medium" android:fontFamily="@font/whitney_semibold" style="@style/UiKit.TextView.Large" />
-        <TextView android:textColor="?application_news_description_text_color" android:id="@id/application_news_description" android:layout_width="fill_parent" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView" />
-        <View android:layout_marginTop="@dimen/uikit_spacing_medium" style="@style/UiKit.Divider.Thick" />
-        <RelativeLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup">
-            <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?application_news_footer_text_color" android:id="@id/application_news_footer_text" android:layout_toLeftOf="@id/application_news_icon" android:layout_alignParentLeft="true" android:layout_centerVertical="true" style="@style/UiKit.TextView.SingleLine" />
-            <com.facebook.drawee.view.SimpleDraweeView android:id="@id/application_news_icon" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:layout_alignParentRight="true" app:placeholderImage="@color/primary_600" style="@style/Icon.Game.Small" />
-        </RelativeLayout>
-    </LinearLayout>
-</FrameLayout>

com.discord/res/layout/view_game_detection_modal_image.xml

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ImageView android:layout_marginTop="@dimen/uikit_spacing_medium" android:src="?img_game_detection_permissions" android:contentDescription="@string/game_detection_service" style="@style/UiKit.ImageView"
-  xmlns:android="http://schemas.android.com/apk/res/android" />

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_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_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_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>

com.discord/res/layout/view_input_modal.xml

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<EditText android:id="@id/view_input" 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" />

com.discord/res/layout/view_steps.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout style="@style/UiKit.ViewGroup.Page"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <androidx.viewpager.widget.ViewPager android:id="@id/steps_viewpager" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_above="@id/steps_button_container" />
-    <ImageView android:id="@id/steps_close" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:foreground="?selectableItemBackgroundBorderless" android:src="?ic_close_24dp" android:layout_alignParentTop="true" android:layout_alignParentRight="true" style="@style/UiKit.ImageView" />
-    <LinearLayout android:id="@id/steps_button_container" android:layout_margin="@dimen/uikit_spacing_large" android:layout_alignParentBottom="true" style="@style/UiKit.ViewGroup.LinearLayout">
-        <Button android:id="@id/steps_done" android:visibility="gone" android:text="@string/done" style="@style/UiKit.Button.Grey" />
-        <Button android:id="@id/steps_next" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/next" style="@style/UiKit.Button" />
-        <TextView android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@id/steps_cancel" android:background="?selectableItemBackground" android:paddingTop="@dimen/uikit_spacing_small" android:paddingBottom="@dimen/uikit_spacing_small" android:layout_width="fill_parent" android:text="@string/cancel" style="@style/UiKit.TextView.Large.SingleLine" />
-    </LinearLayout>
-</RelativeLayout>

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_xxlarge" android:text="@string/return_to_login" style="@style/UiKit.Button" />
+                <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_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>

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_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" />
+                <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" />
                 <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">

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_xxxlarge" />
+            <Space android:layout_width="fill_parent" android:layout_height="@dimen/uikit_spacing_xxlarge" />
         </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" />

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_xxxlarge" android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
+        <LinearLayout android:paddingBottom="@dimen/uikit_spacing_xxlarge" 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">

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_xxlarge" style="@style/UiKit.ViewGroup.RelativeLayout"
+<RelativeLayout android:background="@color/status_grey_500" android:visibility="gone" android:layout_height="@dimen/uikit_spacing_xlarge" 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" />

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_xxxlarge" 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_xxlarge" 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>

com.discord/res/layout/widget_chat_list_actions.xml

@@ -14,7 +14,6 @@
         <TextView android:id="@id/dialog_chat_actions_copy" android:text="@string/copy_text" android:drawableLeft="?ic_copy" android:drawableStart="?ic_copy" style="@style/UiKit.Settings.Item.Icon" />
         <TextView android:id="@id/dialog_chat_actions_add_reaction" android:text="@string/add_reaction" android:drawableLeft="?ic_add_reaction" android:drawableStart="?ic_add_reaction" style="@style/UiKit.Settings.Item.Icon" />
         <TextView android:id="@id/dialog_chat_actions_manage_reactions" android:text="@string/reactions" android:drawableLeft="?ic_reactions" android:drawableStart="?ic_reactions" style="@style/UiKit.Settings.Item.Icon" />
-        <TextView android:id="@id/dialog_chat_actions_remove_all_reactions" android:text="@string/remove_all_reactions" android:drawableLeft="?ic_delete_sweep" android:drawableStart="?ic_delete_sweep" style="@style/UiKit.Settings.Item.Icon" />
         <TextView android:id="@id/dialog_chat_actions_edit" android:text="@string/edit" android:drawableLeft="?ic_edit" android:drawableStart="?ic_edit" style="@style/UiKit.Settings.Item.Icon" />
         <TextView android:id="@id/dialog_chat_actions_pin" android:text="@string/pin" android:drawableLeft="?ic_pins_a60" android:drawableStart="?ic_pins_a60" style="@style/UiKit.Settings.Item.Icon" />
         <TextView android:id="@id/dialog_chat_actions_delete" android:text="@string/delete" android:drawableLeft="?ic_delete" android:drawableStart="?ic_delete" style="@style/UiKit.Settings.Item.Icon" />

com.discord/res/layout/widget_chat_list_adapter_item_application_news.xml

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.discord.views.ApplicationNewsView android:id="@id/news_item_view" android:background="?chat_embed_bg" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_guideline_chat" android:layout_marginTop="@dimen/chat_cell_vertical_spacing_padding" android:layout_marginRight="@dimen/chat_cell_horizontal_spacing_total" android:layout_marginBottom="@dimen/chat_cell_vertical_spacing_padding" android:maxWidth="@dimen/chat_embed_width" android:minWidth="220.0dip" app:cardBackgroundColor="@color/transparent" app:cardCornerRadius="4.0dip" app:cardElevation="4.0dip"
-  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" />

com.discord/res/layout/widget_chat_list_adapter_item_embed.xml

@@ -8,7 +8,7 @@
     <TextView android:textSize="9.5sp" android:textColor="@color/grey_1" android:id="@id/chat_list_item_embed_provider" android:background="?selectableItemBackground" android:visibility="gone" android:layout_width="0.0dip" app:layout_constraintEnd_toStartOf="@id/chat_list_item_embed_image_thumbnail" app:layout_constraintLeft_toRightOf="@id/uikit_chat_embed_guideline" app:layout_constraintRight_toLeftOf="@id/chat_list_item_embed_image_thumbnail" app:layout_constraintStart_toEndOf="@id/uikit_chat_embed_guideline" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView" />
     <com.facebook.drawee.view.SimpleDraweeView android:id="@id/chat_list_item_embed_author_icon" android:visibility="gone" android:layout_width="@dimen/embed_tiny_icon_size" android:layout_height="@dimen/embed_tiny_icon_size" app:layout_constraintBottom_toBottomOf="@id/chat_list_item_embed_author_text" app:layout_constraintLeft_toRightOf="@id/uikit_chat_embed_guideline" app:layout_constraintTop_toTopOf="@id/chat_list_item_embed_author_text" app:placeholderImage="?theme_chat_divider_embed" app:roundedCornerRadius="2.0dip" />
     <TextView android:textColor="?theme_chat_name" android:id="@id/chat_list_item_embed_author_text" android:visibility="gone" android:layout_width="0.0dip" android:layout_marginLeft="@dimen/embed_item_margin" android:layout_marginTop="@dimen/embed_item_margin" android:layout_toRightOf="@id/chat_list_item_embed_author_icon" app:layout_constraintEnd_toStartOf="@id/chat_list_item_embed_image_thumbnail" app:layout_constraintLeft_toRightOf="@id/chat_list_item_embed_author_icon" app:layout_constraintRight_toLeftOf="@id/chat_list_item_embed_image_thumbnail" app:layout_constraintStart_toEndOf="@id/chat_list_item_embed_author_icon" app:layout_constraintTop_toBottomOf="@id/chat_list_item_embed_provider" app:layout_goneMarginLeft="0.0dip" app:layout_goneMarginStart="0.0dip" style="@style/UiKit.TextView.Semibold" />
-    <com.discord.utilities.view.text.LinkifiedTextView android:textColor="@color/link_500" android:id="@id/chat_list_item_embed_title" android:background="?selectableItemBackground" android:layout_width="0.0dip" android:lineSpacingMultiplier="1.0" app:layout_constraintLeft_toRightOf="@id/uikit_chat_embed_guideline" app:layout_constraintRight_toLeftOf="@id/chat_list_item_embed_image_thumbnail" app:layout_constraintTop_toBottomOf="@id/chat_list_item_embed_author_text" style="@style/UiKit.TextView.Semibold" />
+    <TextView android:textColor="@color/link_500" android:id="@id/chat_list_item_embed_title" android:background="?selectableItemBackground" android:layout_width="0.0dip" android:lineSpacingMultiplier="1.0" app:layout_constraintLeft_toRightOf="@id/uikit_chat_embed_guideline" app:layout_constraintRight_toLeftOf="@id/chat_list_item_embed_image_thumbnail" app:layout_constraintTop_toBottomOf="@id/chat_list_item_embed_author_text" style="@style/UiKit.TextView.Semibold" />
     <com.discord.utilities.view.text.LinkifiedTextView android:id="@id/chat_list_item_embed_description" android:background="?selectableItemBackground" android:layout_width="0.0dip" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/sample_channel_message" android:lineSpacingMultiplier="1.0" app:layout_constraintLeft_toRightOf="@id/uikit_chat_embed_guideline" app:layout_constraintRight_toLeftOf="@id/chat_list_item_embed_image_thumbnail" app:layout_constraintTop_toBottomOf="@id/chat_list_item_embed_title" style="@style/UiKit.TextView" />
     <LinearLayout android:id="@id/chat_list_item_embed_fields" android:layout_width="0.0dip" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toRightOf="@id/uikit_chat_embed_guideline" app:layout_constraintRight_toLeftOf="@id/chat_list_item_embed_image_thumbnail" app:layout_constraintTop_toBottomOf="@id/chat_list_item_embed_description" style="@style/UiKit.ViewGroup.LinearLayout" />
     <androidx.constraintlayout.widget.Barrier android:id="@id/chat_list_item_embed_barrier" android:layout_width="0.0dip" android:layout_height="0.0dip" app:barrierDirection="bottom" app:constraint_referenced_ids="chat_list_item_embed_description,         chat_list_item_embed_title,         chat_list_item_embed_image_thumbnail,         chat_list_item_embed_fields,         chat_list_item_embed_author_text,         chat_list_item_embed_provider" />

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_xxlarge" android:layout_height="@dimen/uikit_spacing_xxlarge" android:layout_margin="@dimen/uikit_spacing_xsmall"
+<RelativeLayout android:layout_width="@dimen/uikit_spacing_xlarge" android:layout_height="@dimen/uikit_spacing_xlarge" 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" />

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_xxxlarge">
+            <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">
                 <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_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_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_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" />

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_xxlarge" android:layout_marginRight="@dimen/uikit_spacing_xxlarge" 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_xlarge" android:layout_marginRight="@dimen/uikit_spacing_xlarge" 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>

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_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.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.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" />

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_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" />
+            <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" />
             <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" />

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_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" />
+    <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" />
 </LinearLayout>

com.discord/res/layout/widget_manage_reactions_result_error.xml

@@ -2,5 +2,5 @@
 <RelativeLayout android:gravity="center" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.RelativeLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <ImageView android:id="@id/manage_reactions_result_error_img" android:focusable="true" android:clickable="true" android:src="?img_poop" android:layout_above="@id/manage_reactions_result_error_text" android:layout_centerHorizontal="true" style="@style/UiKit.ImageView" />
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_100" android:gravity="center_horizontal" android:id="@id/manage_reactions_result_error_text" android:layout_marginTop="10.0dip" android:text="@string/load_reactions_error" android:layout_alignParentBottom="true" android:layout_centerHorizontal="true" style="@style/UiKit.TextView" />
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_100" android:id="@id/manage_reactions_result_error_text" android:layout_marginTop="10.0dip" android:text="@string/load_reactions_error" android:layout_alignParentBottom="true" android:layout_centerHorizontal="true" style="@style/UiKit.TextView" />
 </RelativeLayout>

com.discord/res/layout/widget_manage_reactions_result_user.xml

@@ -2,6 +2,5 @@
 <RelativeLayout android:paddingLeft="20.0dip" android:paddingTop="8.0dip" android:paddingRight="20.0dip" android:paddingBottom="8.0dip" style="@style/UiKit.ViewGroup.RelativeLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <com.facebook.drawee.view.SimpleDraweeView android:id="@id/manage_reactions_result_user_avatar" android:layout_marginRight="16.0dip" android:layout_alignParentLeft="true" android:layout_centerVertical="true" style="@style/Avatar.Standard" />
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:id="@id/manage_reactions_result_user_name" android:singleLine="true" android:layout_toLeftOf="@id/manage_reactions_result_remove_reaction" android:layout_toRightOf="@id/manage_reactions_result_user_avatar" android:layout_centerVertical="true" android:layout_alignWithParentIfMissing="true" style="@style/UiKit.TextView" />
-    <ImageView android:id="@id/manage_reactions_result_remove_reaction" android:background="?selectableItemBackgroundBorderless" android:focusable="true" android:clickable="true" android:layout_width="24.0dip" android:layout_height="24.0dip" android:src="?ic_close_24dp" android:layout_alignParentRight="true" android:layout_centerVertical="true" android:contentDescription="@string/remove_reaction" />
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:id="@id/manage_reactions_result_user_name" android:singleLine="true" android:layout_toRightOf="@id/manage_reactions_result_user_avatar" android:layout_centerVertical="true" style="@style/UiKit.TextView" />
 </RelativeLayout>

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="start" android:layout_gravity="start" android:id="@id/notice_body_text" android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
+            <TextView android:gravity="center" 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" />

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_xxlarge" 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_xlarge" 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_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" />
+            <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" />
         </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>

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_xxxlarge" 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_xxlarge" android:scrollbars="vertical" android:clipToPadding="false" style="@style/AppTheme.AppBarScrollingViewBehavior"
   xmlns:android="http://schemas.android.com/apk/res/android" />

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_xxlarge" 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_xlarge" 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" />
@@ -24,7 +24,6 @@
                 <TextView android:id="@id/server_settings_option_integrations" android:text="@string/integrations" android:drawableLeft="?ic_integrations_a60" android:drawableStart="?ic_integrations_a60" style="@style/UiKit.Settings.Item.Icon" />
                 <TextView android:id="@id/server_settings_option_security" android:text="@string/security" android:drawableLeft="?ic_security_a60" android:drawableStart="?ic_security_a60" style="@style/UiKit.Settings.Item.Icon" />
                 <TextView android:id="@id/server_settings_option_vanity_url" android:text="@string/vanity_url" android:drawableLeft="?ic_link_a60" android:drawableStart="?ic_link_a60" style="@style/UiKit.Settings.Item.Icon" />
-                <TextView android:id="@id/server_settings_emojis_option" android:text="@string/emoji" android:drawableLeft="?ic_reactions" android:drawableStart="?ic_reactions" style="@style/UiKit.Settings.Item.Icon" />
             </LinearLayout>
             <LinearLayout android:id="@id/server_settings_section_user_management" style="@style/UiKit.ViewGroup.LinearLayout">
                 <View android:id="@id/server_settings_section_user_management_divider" style="@style/UiKit.Settings.Divider" />

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_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" />
+            <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" />
             <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" />

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_xxxlarge" />
+            <Space android:layout_width="fill_parent" android:layout_height="@dimen/uikit_spacing_xxlarge" />
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
     <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/edit_integration_save" style="@style/Settings.FloatingActionButton.Save" />

com.discord/res/layout/widget_server_settings_emojis.xml

@@ -1,11 +0,0 @@
-<?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>
-    <com.discord.app.AppViewFlipper android:id="@id/widget_server_settings_emojis_view_flipper" android:layout_width="fill_parent" android:layout_height="fill_parent" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/AppTheme.AppBarScrollingViewBehavior">
-        <ProgressBar android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" android:indeterminate="true" style="@style/Widget.AppCompat.ProgressBar" />
-        <androidx.recyclerview.widget.RecyclerView android:id="@id/widget_server_settings_emojis_recycler" android:scrollbars="vertical" android:clipToPadding="false" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.RecyclerView.AppBarScrollingViewBehavior" />
-    </com.discord.app.AppViewFlipper>
-</androidx.coordinatorlayout.widget.CoordinatorLayout>

com.discord/res/layout/widget_server_settings_emojis_edit.xml

@@ -1,14 +0,0 @@
-<?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">
-            <TextView android:text="@string/guild_settings_emoji_alias" style="@style/UiKit.Settings.Item.Header" />
-            <EditText android:id="@id/server_settings_emojis_edit_alias" android:layout_width="fill_parent" android:hint="@string/guild_settings_emoji_alias_placeholder" android:singleLine="true" android:maxLength="32" android:inputType="textNoSuggestions" android:windowSoftInputMode="stateAlwaysVisible" style="@style/UiKit.EditText.Themed" />
-        </LinearLayout>
-    </androidx.core.widget.NestedScrollView>
-    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/server_settings_emojis_edit_alias_save" style="@style/Settings.FloatingActionButton.Save" />
-</androidx.coordinatorlayout.widget.CoordinatorLayout>

com.discord/res/layout/widget_server_settings_emojis_empty.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:gravity="center" android:layout_marginTop="16.0dip" android:layout_marginBottom="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <TextView android:text="@string/no_emoji_title" android:drawableTop="?theme_emoji_settings_empty" style="@style/UiKit.TextView.NoResults" />
-    <TextView android:gravity="center" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:text="@string/no_emoji" style="@style/UiKit.TextView" />
-</LinearLayout>

com.discord/res/layout/widget_server_settings_emojis_header.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <Button android:id="@id/widget_server_settings_emojis_upload" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/upload_emoji" style="@style/UiKit.Button" />
-    <TextView android:id="@id/widget_server_settings_emojis_upload_description" android:text="@string/guild_settings_emoji_upload_to_server_message" style="@style/UiKit.Settings.Item.SubText" />
-</LinearLayout>

com.discord/res/layout/widget_server_settings_emojis_item.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:gravity="center_vertical" android:id="@id/server_settings_emojis_container" android:background="?selectableItemBackground" android:padding="@dimen/uikit_spacing_medium" android:focusable="true" android:clickable="true" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal"
-  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/server_settings_emojis_avatar" android:background="?selectableItemBackgroundBorderless" android:layout_width="@dimen/avatar_size_standard" android:layout_height="@dimen/avatar_size_standard" android:layout_margin="@dimen/uikit_spacing_medium" app:placeholderImage="?theme_emoji_placeholder" />
-    <TextView android:id="@id/server_settings_emojis_name" android:layout_margin="@dimen/uikit_spacing_medium" android:width="0.0dip" android:layout_weight="1.0" style="@style/UiKit.TextView.Large.SingleLine" />
-    <TextView android:textColor="?primary_100_alpha_60" android:gravity="right" android:id="@id/server_settings_emojis_username" android:layout_width="wrap_content" android:maxWidth="100.0dip" style="@style/UiKit.TextView.Subtext.SingleLine" />
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/server_settings_emojis_username_avatar" android:layout_margin="@dimen/uikit_spacing_medium" style="@style/Avatar.Medium" />
-    <ImageView android:id="@id/server_settings_emojis_overflow" android:layout_margin="@dimen/uikit_spacing_medium" android:src="@drawable/ic_overflow_grey" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" style="@style/UiKit.ImageView" />
-</LinearLayout>

com.discord/res/layout/widget_server_settings_emojis_section.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <TextView android:id="@id/widget_server_settings_emojis_section" android:text="@string/sample_channel_name" style="@style/UiKit.Settings.Item.Header" />
-</LinearLayout>

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_xxlarge" 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_xlarge" 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>

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_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" />
+                <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" />
                 <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" />

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_xxxlarge" 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_xxlarge" 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>

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_xxlarge" 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_xlarge" 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_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" />
+        <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" />
             <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>

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_xxlarge" 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_xlarge" 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_xxlarge" android:layout_height="@dimen/uikit_spacing_xxlarge" 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_xlarge" android:layout_height="@dimen/uikit_spacing_xlarge" 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" />

com.discord/res/layout/widget_settings.xml

@@ -23,7 +23,7 @@
             <TextView android:text="@string/app_settings" style="@style/UiKit.Settings.Item.Header" />
             <TextView android:id="@id/settings_voice" android:text="@string/voice_and_video" android:drawableLeft="?ic_voice_settings_a60" android:drawableStart="?ic_voice_settings_a60" style="@style/UiKit.Settings.Item.Icon" />
             <TextView android:id="@id/settings_notifications" android:text="@string/notifications" android:drawableLeft="?ic_notifications_a60" android:drawableStart="?ic_notifications_a60" style="@style/UiKit.Settings.Item.Icon" />
-            <TextView android:id="@id/settings_games" android:visibility="gone" android:text="@string/games" android:drawableLeft="?ic_games_a60" android:drawableStart="?ic_games_a60" style="@style/UiKit.Settings.Item.Icon" />
+            <TextView android:id="@id/settings_games" android:text="@string/games" android:drawableLeft="?ic_games_a60" android:drawableStart="?ic_games_a60" style="@style/UiKit.Settings.Item.Icon" />
             <TextView android:id="@id/settings_text_images" android:text="@string/text_and_images" android:drawableLeft="?ic_text_image_a60" android:drawableStart="?ic_text_image_a60" style="@style/UiKit.Settings.Item.Icon" />
             <TextView android:id="@id/settings_appearance" android:text="@string/appearance" android:drawableLeft="?ic_theme_a60" android:drawableStart="?ic_theme_a60" style="@style/UiKit.Settings.Item.Icon" />
             <TextView android:id="@id/settings_behavior" android:text="@string/form_label_mobile_notifications_behavior" android:drawableLeft="?ic_behavior_a60" android:drawableStart="?ic_behavior_a60" style="@style/UiKit.Settings.Item.Icon" />

com.discord/res/layout/widget_settings_account.xml

@@ -10,42 +10,38 @@
                 <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_xxlarge" android:paddingBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.RelativeLayout">
-                <LinearLayout android:gravity="center_vertical" android:id="@id/settings_account_avatar_wrap" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-                    <FrameLayout android:id="@id/settings_account_avatar_container" android:background="?selectableItemBackgroundBorderless" 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.Large.ExtraAccount" />
-                        <ImageView android:layout_gravity="center|right|top" android:id="@id/settings_account_avatar_edit" android:background="@drawable/drawable_circle_white_1" android:layout_width="24.0dip" android:layout_height="24.0dip" android:src="@drawable/ic_upload_image_34dp" android:scaleType="center" />
-                    </FrameLayout>
-                    <LinearLayout android:layout_marginLeft="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout">
-                        <TextView android:id="@id/settings_account_tag" style="@style/UiKit.TextView.Large.SingleLine" />
-                        <TextView android:textColor="?primary_400" android:id="@id/settings_account_email" style="@style/UiKit.TextView" />
-                        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/purple_brand" android:id="@id/settings_account_remove_avatar" android:background="?selectableItemBackground" android:layout_marginTop="@dimen/uikit_spacing_small" android:text="@string/remove_icon" style="@style/UiKit.TextView.Semibold" />
-                    </LinearLayout>
-                </LinearLayout>
-                <LinearLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:weightSum="2.0" android:layout_below="@id/settings_account_avatar_wrap" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-                    <Button android:id="@id/settings_account_edit" android:layout_width="0.0dip" android:text="@string/user_settings_edit_account" android:layout_weight="1.0" style="@style/UiKit.Button" />
-                    <Button android:id="@id/settings_account_change_password" android:layout_width="0.0dip" android:text="@string/change_password" android:layout_weight="1.0" style="@style/UiKit.Button.Grey" />
+            <RelativeLayout android:background="?primary_630" android:paddingTop="@dimen/uikit_spacing_xlarge" 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" />
+                    </RelativeLayout>
+                    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/purple_brand" android:id="@id/settings_account_remove_avatar" android:background="?selectableItemBackground" android:padding="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_small" android:text="@string/remove" style="@style/UiKit.TextView.Semibold" />
                 </LinearLayout>
             </RelativeLayout>
             <View style="@style/UiKit.Divider" />
+            <com.google.android.material.textfield.TextInputLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" style="@style/UiKit.Form.Field.EditText.Wrap">
+                <androidx.appcompat.widget.AppCompatEditText android:id="@id/settings_account_username" android:hint="@string/username" android:inputType="textPersonName" style="@style/UiKit.Form.Field.EditText.SingleLine" />
+            </com.google.android.material.textfield.TextInputLayout>
+            <View style="@style/UiKit.Settings.Divider" />
             <TextView android:textColor="@color/status_orange_500" android:id="@id/settings_account_claim_btn" android:visibility="gone" android:text="@string/claim_account" android:drawableRight="@drawable/ic_chevron_right_grey_12dp" android:drawableEnd="@drawable/ic_chevron_right_grey_12dp" style="@style/UiKit.Settings.Item.Header" />
-            <View style="@style/UiKit.Divider" />
-            <LinearLayout android:id="@id/settings_account_mfa_container" android:visibility="gone" style="@style/UiKit.ViewGroup.LinearLayout">
-                <FrameLayout 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="@string/user_settings_mfa_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" />
-                <TextView android:id="@id/settings_account_remove_two_fa" android:text="@string/two_fa_remove" style="@style/UiKit.Settings.Item" />
+            <LinearLayout android:id="@id/settings_account_credentials_wrap" style="@style/UiKit.ViewGroup.LinearLayout">
+                <com.google.android.material.textfield.TextInputLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" style="@style/UiKit.Form.Field.EditText.Wrap">
+                    <androidx.appcompat.widget.AppCompatEditText android:id="@id/settings_account_email" android:hint="@string/form_label_email" android:inputType="textEmailAddress" style="@style/UiKit.Form.Field.EditText.SingleLine" />
+                </com.google.android.material.textfield.TextInputLayout>
+                <com.google.android.material.textfield.TextInputLayout android:id="@id/settings_account_password_wrap" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" style="@style/UiKit.Form.Field.EditText.Wrap">
+                    <androidx.appcompat.widget.AppCompatEditText android:id="@id/settings_account_password" android:hint="@string/form_label_current_password" android:inputType="textPassword" style="@style/UiKit.Form.Field.EditText.SingleLine" />
+                </com.google.android.material.textfield.TextInputLayout>
+                <View style="@style/UiKit.Settings.Divider" />
+                <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: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="?primary_100" android:id="@id/settings_account_private_data_disable" android:text="@string/disable_account" style="@style/UiKit.Settings.Item" />
+            <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">
+                <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>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
-    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/settings_account_save" style="@style/Settings.FloatingActionButton.Save" />
     <com.discord.utilities.dimmer.DimmerView style="@style/UiKit.DimmerView" />
+    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/settings_account_save" style="@style/Settings.FloatingActionButton.Save" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

com.discord/res/layout/widget_settings_account_backup_codes.xml

@@ -1,16 +0,0 @@
-<?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>

com.discord/res/layout/widget_settings_account_change_password.xml

@@ -1,24 +1,30 @@
 <?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" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <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>
-    <ScrollView app:layout_behavior="@string/action_bar_scrolling_view_behavior" style="@style/UiKit.ViewGroup.ScrollView">
-        <LinearLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
-            <com.google.android.material.textfield.TextInputLayout android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/UiKit.Form.Field.EditText.Wrap">
-                <androidx.appcompat.widget.AppCompatEditText android:id="@id/change_password_current_password_input" android:hint="@string/form_label_current_password" android:imeOptions="actionNext" style="@style/UiKit.Form.Field.EditText.Password">
-                    <requestFocus />
-                </androidx.appcompat.widget.AppCompatEditText>
-            </com.google.android.material.textfield.TextInputLayout>
-            <com.google.android.material.textfield.TextInputLayout android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/UiKit.Form.Field.EditText.Wrap">
-                <androidx.appcompat.widget.AppCompatEditText android:id="@id/change_password_new_password_input" android:hint="@string/form_label_new_password" android:imeOptions="actionNext" style="@style/UiKit.Form.Field.EditText.Password" />
-            </com.google.android.material.textfield.TextInputLayout>
-            <com.google.android.material.textfield.TextInputLayout android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/UiKit.Form.Field.EditText.Wrap">
-                <androidx.appcompat.widget.AppCompatEditText android:id="@id/change_password_two_factor" android:visibility="gone" android:hint="@string/two_fa" android:imeOptions="actionDone" style="@style/UiKit.Form.Field.EditText.SingleLine" />
-            </com.google.android.material.textfield.TextInputLayout>
+<ScrollView android:orientation="vertical" android:background="@color/white" android:layout_width="fill_parent" android:layout_height="wrap_content"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <LinearLayout android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="wrap_content">
+        <com.discord.app.AppTextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="@color/purple_brand" android:id="@id/change_password_header" android:background="@color/white_1" android:paddingLeft="32.0dip" android:paddingTop="16.0dip" android:paddingRight="32.0dip" android:paddingBottom="16.0dip" android:layout_width="fill_parent" android:text="@string/change_password" android:textAllCaps="true" style="@style/UiKit.TextView.Bold" />
+        <View android:background="@color/white_3" android:layout_width="fill_parent" android:layout_height="0.25dip" />
+        <LinearLayout android:orientation="vertical" android:paddingLeft="32.0dip" android:paddingRight="32.0dip" android:paddingBottom="10.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content">
+            <LinearLayout android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="wrap_content">
+                <TextView android:textSize="11.0sp" android:textColor="@color/grey_2" android:paddingTop="16.0dip" android:paddingBottom="8.0dip" android:layout_width="fill_parent" android:text="@string/form_label_current_password" android:textAllCaps="true" style="@style/UiKit.TextView.Bold" />
+                <EditText android:textSize="11.0sp" android:textColorHint="@color/grey_1" android:id="@id/change_password_current_password_input" android:background="@android:color/transparent" android:paddingTop="10.0dip" android:paddingBottom="10.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:hint="@string/form_label_current_password" android:singleLine="true" android:inputType="textPassword" style="@style/UiKit.TextView" />
+                <View android:background="@color/white_3" android:layout_width="fill_parent" android:layout_height="0.25dip" />
+            </LinearLayout>
+            <LinearLayout android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="wrap_content">
+                <TextView android:textSize="11.0sp" android:textColor="@color/grey_2" android:paddingTop="16.0dip" android:paddingBottom="8.0dip" android:layout_width="fill_parent" android:text="@string/form_label_new_password" android:textAllCaps="true" style="@style/UiKit.TextView.Bold" />
+                <EditText android:textSize="11.0sp" android:textColorHint="@color/grey_1" android:id="@id/change_password_new_password_input" android:background="@android:color/transparent" android:paddingTop="10.0dip" android:paddingBottom="10.0dip" android:layout_width="fill_parent" android:hint="@string/form_label_new_password" android:singleLine="true" android:inputType="textPassword" style="@style/UiKit.TextView" />
+                <View android:background="@color/white_3" android:layout_width="fill_parent" android:layout_height="0.25dip" />
+            </LinearLayout>
+            <LinearLayout android:orientation="vertical" android:id="@id/change_password_mfa_container" android:layout_width="fill_parent" android:layout_height="wrap_content">
+                <TextView android:textSize="11.0sp" android:textColor="@color/grey_2" android:paddingTop="16.0dip" android:paddingBottom="8.0dip" android:layout_width="fill_parent" android:text="@string/two_fa" android:textAllCaps="true" style="@style/UiKit.TextView.Bold" />
+                <EditText android:textSize="11.0sp" android:textColorHint="@color/grey_1" android:id="@id/change_password_mfa_input" android:background="@android:color/transparent" android:paddingTop="10.0dip" android:paddingBottom="10.0dip" android:layout_width="fill_parent" android:hint="@string/two_fa_auth_code" android:inputType="textVisiblePassword" android:imeOptions="actionDone" style="@style/UiKit.TextView" />
+                <View android:background="@color/white_3" android:layout_width="fill_parent" android:layout_height="0.25dip" />
+            </LinearLayout>
         </LinearLayout>
-    </ScrollView>
-    <com.discord.utilities.dimmer.DimmerView style="@style/UiKit.DimmerView" />
-    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/change_password_save" style="@style/Settings.FloatingActionButton.Save" />
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
+        <View android:background="@color/white_3" android:layout_width="fill_parent" android:layout_height="0.25dip" />
+        <LinearLayout android:gravity="end" android:background="@color/white_1" android:padding="@dimen/settings_option_padding" android:layout_width="fill_parent" android:layout_height="wrap_content">
+            <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="@color/grey_4" android:gravity="center" android:id="@id/change_password_cancel" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:layout_height="36.0dip" android:text="@string/cancel" style="@style/UiKit.TextView.Semibold" />
+            <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="@color/white" android:gravity="center" android:id="@id/change_password_confirm" android:background="@drawable/drawable_button_green" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:layout_height="36.0dip" android:text="@string/change_password" android:singleLine="true" style="@style/UiKit.TextView.Semibold" />
+        </LinearLayout>
+    </LinearLayout>
+</ScrollView>

com.discord/res/layout/widget_settings_account_edit.xml

@@ -1,29 +0,0 @@
-<?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" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <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>
-    <ScrollView app:layout_behavior="@string/action_bar_scrolling_view_behavior" style="@style/UiKit.ViewGroup.ScrollView">
-        <LinearLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
-            <RelativeLayout style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-                <com.google.android.material.textfield.TextInputLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_toLeftOf="@id/edit_account_tag_layout" style="@style/UiKit.Form.Field.EditText.Wrap">
-                    <androidx.appcompat.widget.AppCompatEditText android:id="@id/edit_account_username" android:hint="@string/username" android:imeOptions="actionNext" style="@style/UiKit.Form.Field.EditText">
-                        <requestFocus />
-                    </androidx.appcompat.widget.AppCompatEditText>
-                </com.google.android.material.textfield.TextInputLayout>
-                <com.google.android.material.textfield.TextInputLayout android:id="@id/edit_account_tag_layout" android:layout_width="65.0sp" android:layout_height="wrap_content" android:layout_alignParentRight="true" style="@style/UiKit.Form.Field.EditText.Wrap">
-                    <androidx.appcompat.widget.AppCompatEditText android:id="@id/edit_account_discriminator" android:hint="@string/user_settings_edit_account_tag" android:maxLength="5" android:imeOptions="actionNext" style="@style/UiKit.Form.Field.EditText" />
-                </com.google.android.material.textfield.TextInputLayout>
-            </RelativeLayout>
-            <com.google.android.material.textfield.TextInputLayout android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/UiKit.Form.Field.EditText.Wrap">
-                <androidx.appcompat.widget.AppCompatEditText android:id="@id/edit_account_email" android:hint="@string/email" android:imeOptions="actionNext" style="@style/UiKit.Form.Field.EditText" />
-            </com.google.android.material.textfield.TextInputLayout>
-            <com.google.android.material.textfield.TextInputLayout android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/UiKit.Form.Field.EditText.Wrap">
-                <androidx.appcompat.widget.AppCompatEditText android:id="@id/edit_account_password" android:hint="@string/user_settings_edit_account_password_label" android:imeOptions="actionDone" style="@style/UiKit.Form.Field.EditText.Password" />
-            </com.google.android.material.textfield.TextInputLayout>
-        </LinearLayout>
-    </ScrollView>
-    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/settings_account_save" style="@style/Settings.FloatingActionButton.Save" />
-    <com.discord.utilities.dimmer.DimmerView style="@style/UiKit.DimmerView" />
-</androidx.coordinatorlayout.widget.CoordinatorLayout>

com.discord/res/layout/widget_settings_appearance.xml

@@ -13,6 +13,7 @@
             <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>
     </androidx.core.widget.NestedScrollView>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

com.discord/res/layout/widget_settings_games.xml

@@ -14,7 +14,7 @@
                     <TextView android:textColor="@color/primary_200" android:id="@id/settings_games_playing_subtitle" style="@style/UiKit.TextView" />
                 </LinearLayout>
             </LinearLayout>
-            <com.discord.views.CheckedSetting android:id="@id/settings_games_track_cs" app:cs_subtext="@string/game_detection_tracking_delay_android" app:cs_text="@string/allow_game_detection_mobile" app:cs_view_type="switchview" style="@style/UiKit.CheckedSetting.Themed" />
+            <com.discord.views.CheckedSetting android:id="@id/settings_games_track_cs" app:cs_text="@string/allow_game_detection_mobile" app:cs_view_type="switchview" style="@style/UiKit.CheckedSetting.Themed" />
             <com.discord.views.CheckedSetting android:id="@id/settings_games_status_cs" app:cs_text="@string/show_current_game" app:cs_view_type="switchview" style="@style/UiKit.CheckedSetting.Themed" />
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>

com.discord/res/layout/widget_settings_item_backup_code.xml

@@ -1,3 +0,0 @@
-<?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" />

com.discord/res/layout/widget_settings_item_backup_code_header.xml

@@ -1,3 +0,0 @@
-<?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" />

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_xxlarge" android:focusableInTouchMode="true" style="@style/UiKit.ViewGroup.LinearLayout">
+    <LinearLayout android:paddingBottom="@dimen/uikit_spacing_xlarge" 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_xxlarge" style="@style/UiKit.ViewGroup.RecyclerView" />
+        <androidx.recyclerview.widget.RecyclerView android:id="@id/platform_identities_list" android:paddingBottom="@dimen/uikit_spacing_xlarge" style="@style/UiKit.ViewGroup.RecyclerView" />
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>

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_xxlarge" 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_xlarge" 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>