Changes of com.discord v889

com.discord/res/anim/anim_slide_down.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set android:fillAfter="true" android:fillEnabled="true"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <scale android:interpolator="@android:anim/accelerate_decelerate_interpolator" android:fillAfter="true" android:fromXScale="1.0" android:toXScale="1.0" android:fromYScale="1.0" android:toYScale="0.0" />
-</set>

com.discord/res/anim/anim_slide_up.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set android:fillAfter="true" android:fillEnabled="true"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <scale android:interpolator="@android:anim/accelerate_decelerate_interpolator" android:fillAfter="true" android:fromXScale="1.0" android:toXScale="1.0" android:fromYScale="0.0" android:toYScale="1.0" />
-</set>

com.discord/res/drawable/drawable_asset_pattern_shapes_dark.xml

@@ -7,7 +7,6 @@
         </shape>
     </item>
     <item>
-        <bitmap android:src="@drawable/asset_pattern_shapes_white" android:tileMode="repeat"
-          xmlns:android="http://schemas.android.com/apk/res/android" />
+        <bitmap android:src="@drawable/asset_pattern_shapes_white" android:tileMode="repeat" />
     </item>
 </layer-list>

com.discord/res/drawable/drawable_asset_pattern_shapes_light.xml

@@ -7,7 +7,6 @@
         </shape>
     </item>
     <item>
-        <bitmap android:src="@drawable/asset_pattern_shapes_grey" android:tileMode="repeat"
-          xmlns:android="http://schemas.android.com/apk/res/android" />
+        <bitmap android:src="@drawable/asset_pattern_shapes_grey" android:tileMode="repeat" />
     </item>
 </layer-list>

com.discord/res/drawable/drawable_bg_reaction_dark.xml

@@ -2,15 +2,13 @@
 <selector
   xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_activated="true">
-        <shape android:shape="rectangle"
-          xmlns:android="http://schemas.android.com/apk/res/android">
+        <shape android:shape="rectangle">
             <solid android:color="@color/reaction_background_me_dark" />
             <corners android:radius="3.0dip" />
         </shape>
     </item>
     <item android:state_activated="false">
-        <shape android:shape="rectangle"
-          xmlns:android="http://schemas.android.com/apk/res/android">
+        <shape android:shape="rectangle">
             <solid android:color="@color/white_alpha_05" />
             <corners android:radius="3.0dip" />
         </shape>

com.discord/res/drawable/drawable_bg_reaction_light.xml

@@ -2,15 +2,13 @@
 <selector
   xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_activated="true">
-        <shape android:shape="rectangle"
-          xmlns:android="http://schemas.android.com/apk/res/android">
+        <shape android:shape="rectangle">
             <solid android:color="@color/reaction_background_me_light" />
             <corners android:radius="3.0dip" />
         </shape>
     </item>
     <item android:state_activated="false">
-        <shape android:shape="rectangle"
-          xmlns:android="http://schemas.android.com/apk/res/android">
+        <shape android:shape="rectangle">
             <solid android:color="@color/grey_6_alpha_05" />
             <corners android:radius="3.0dip" />
         </shape>

com.discord/res/drawable/drawable_circle_ringing.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape android:shape="oval"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <stroke android:width="2.0dip" android:color="@color/status_red_500" />
-    <solid android:color="@color/grey_guilds" />
-</shape>

com.discord/res/drawable/drawable_nitro_classic_gradient_horizontal.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/white_alpha_10" />
-    <corners android:radius="3.0dip" />
+    <gradient android:startColor="#ff738ef5" android:endColor="#ffb3aeff" />
 </shape>

com.discord/res/drawable/drawable_overlay_guild_mentions.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <inset android:insetLeft="-2.0dip" android:insetRight="-2.0dip" android:insetTop="-2.0dip" android:insetBottom="-2.0dip"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <shape android:shape="rectangle"
-      xmlns:android="http://schemas.android.com/apk/res/android">
+    <shape android:shape="rectangle">
         <solid android:color="@color/status_red_500" />
         <stroke android:width="2.0dip" android:color="@color/grey_guilds" />
         <corners android:radius="9999.0dip" />

com.discord/res/drawable/drawable_overlay_mentions.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/status_red_500" />
-    <corners android:radius="2.0dip" />
-</shape>

com.discord/res/drawable/drawable_overlay_mentions_primary_100.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <inset android:insetLeft="-2.0dip" android:insetRight="-2.0dip" android:insetTop="-2.0dip" android:insetBottom="-2.0dip"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <shape android:shape="rectangle"
-      xmlns:android="http://schemas.android.com/apk/res/android">
+    <shape android:shape="rectangle">
         <solid android:color="@color/status_red_500" />
         <stroke android:width="2.0dip" android:color="@color/primary_100" />
         <corners android:radius="12.0dip" />

com.discord/res/drawable/drawable_overlay_mentions_primary_600.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <inset android:insetLeft="-2.0dip" android:insetRight="-2.0dip" android:insetTop="-2.0dip" android:insetBottom="-2.0dip"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <shape android:shape="rectangle"
-      xmlns:android="http://schemas.android.com/apk/res/android">
+    <shape android:shape="rectangle">
         <solid android:color="@color/status_red_500" />
         <stroke android:width="2.0dip" android:color="@color/primary_600" />
         <corners android:radius="12.0dip" />

com.discord/res/drawable/drawable_overlay_mentions_primary_630.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <inset android:insetLeft="-2.0dip" android:insetRight="-2.0dip" android:insetTop="-2.0dip" android:insetBottom="-2.0dip"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <shape android:shape="rectangle"
-      xmlns:android="http://schemas.android.com/apk/res/android">
+    <shape android:shape="rectangle">
         <solid android:color="@color/status_red_500" />
         <stroke android:width="2.0dip" android:color="@color/primary_630" />
         <corners android:radius="12.0dip" />

com.discord/res/drawable/drawable_uikit_status_yellow_button_outline.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<inset android:insetLeft="@dimen/uikit_btn_inset_horizontal_material" android:insetRight="@dimen/uikit_btn_inset_horizontal_material" android:insetTop="@dimen/uikit_btn_inset_vertical_material" android:insetBottom="@dimen/uikit_btn_inset_vertical_material"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <shape android:shape="rectangle">
-        <corners android:radius="@dimen/uikit_btn_corner_radius" />
-        <solid android:color="@color/transparent" />
-        <stroke android:width="@dimen/uikit_btn_stroke_width" android:color="@color/status_yellow_500_alpha_60" />
-        <padding android:left="@dimen/uikit_btn_padding_horizontal" android:top="@dimen/uikit_btn_padding_vertical" android:right="@dimen/uikit_btn_padding_horizontal" android:bottom="@dimen/uikit_btn_padding_vertical" />
-    </shape>
-</inset>

com.discord/res/layout-land/widget_main_panel_center_content_unread.xml

@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ViewStub android:layout_width="wrap_content" android:layout_height="wrap_content"
+<ViewStub android:id="@id/main_toolbar_unread_count" android:layout_width="wrap_content" android:layout_height="wrap_content"
   xmlns:android="http://schemas.android.com/apk/res/android" />

com.discord/res/layout-v17/view_chip_default.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout android:paddingRight="12.0dip" android:layout_width="wrap_content" android:layout_height="@dimen/chipsview_image_size"
+<RelativeLayout android:paddingLeft="0.0dip" android:paddingRight="12.0dip" android:layout_width="wrap_content" android:layout_height="@dimen/chipsview_image_size" android:paddingStart="0.0dip" android:paddingEnd="12.0dip"
   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/chip_image" android:padding="2.0dip" android:layout_width="@dimen/chipsview_image_size" android:layout_height="@dimen/chipsview_image_size" app:roundAsCircle="true" />
     <TextView android:textSize="@dimen/uikit_textsize_medium" android:gravity="center_vertical" android:id="@id/chip_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="5.0dip" android:singleLine="true" android:layout_toRightOf="@id/chip_image" android:layout_centerVertical="true" android:layout_marginStart="5.0dip" android:layout_toEndOf="@id/chip_image" />

com.discord/res/layout-v17/view_toolbar_title.xml

@@ -2,6 +2,6 @@
 <androidx.constraintlayout.widget.ConstraintLayout android:background="?selectableItemBackground" android:layout_width="fill_parent" android:layout_height="fill_parent"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <TextView android:id="@id/toolbar_title" android:layout_width="wrap_content" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@id/toolbar_title_subtext" app:layout_constraintEnd_toStartOf="@id/toolbar_presence" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/toolbar_presence" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.Toolbar.TextAppearance.Title" />
-    <TextView android:id="@id/toolbar_title_subtext" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toBottomOf="@id/toolbar_title" style="@style/UiKit.Toolbar.TextAppearance.Subtitle" />
+    <TextView android:id="@id/toolbar_title_subtext" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="@id/toolbar_title" app:layout_constraintStart_toStartOf="@id/toolbar_title" app:layout_constraintTop_toBottomOf="@id/toolbar_title" style="@style/UiKit.Toolbar.TextAppearance.Subtitle" />
     <com.facebook.drawee.view.SimpleDraweeView android:id="@id/toolbar_presence" android:visibility="gone" android:layout_width="10.5dip" android:layout_height="10.5dip" android:layout_marginLeft="@dimen/uikit_spacing_small" android:baselineAlignBottom="true" android:layout_marginStart="@dimen/uikit_spacing_small" app:layout_constraintBaseline_toBaselineOf="@id/toolbar_title" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/toolbar_title" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/toolbar_title" app:placeholderImage="@color/status_grey_500" app:roundAsCircle="true" />
 </androidx.constraintlayout.widget.ConstraintLayout>

com.discord/res/layout-v17/widget_add_friend_user_list_item.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout android:background="?selectableItemBackground" android:padding="@dimen/uikit_spacing_medium" android:layout_width="fill_parent" android:layout_height="wrap_content"
   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/add_friend_user_item_avatar" android:layout_marginRight="@dimen/uikit_spacing_medium" android:layout_marginEnd="@dimen/uikit_spacing_medium" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/Avatar.Standard" />
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/add_friend_user_item_avatar" android:layout_marginRight="@dimen/uikit_spacing_medium" android:layout_marginEnd="@dimen/uikit_spacing_medium" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/Avatar.Standard" />
     <RelativeLayout android:id="@id/add_friend_user_item_presence_wrapper" android:layout_width="@dimen/avatar_status_size_standard" android:layout_height="@dimen/avatar_status_size_standard" android:translationX="@dimen/avatar_status_size_standard_margin" android:translationY="@dimen/avatar_status_size_standard_margin" app:layout_constraintBottom_toBottomOf="@id/add_friend_user_item_avatar" app:layout_constraintRight_toRightOf="@id/add_friend_user_item_avatar">
         <com.facebook.drawee.view.SimpleDraweeView android:layout_width="fill_parent" android:layout_height="fill_parent" app:placeholderImage="?colorPrimary" app:roundAsCircle="true" />
         <com.facebook.drawee.view.SimpleDraweeView android:id="@id/add_friend_user_item_presence" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_margin="@dimen/avatar_status_size_extra_margin" android:layout_centerInParent="true" app:placeholderImage="@color/status_grey_500" app:roundAsCircle="true" />
     </RelativeLayout>
     <TextView android:id="@id/add_friend_user_item_name" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginStart="@dimen/uikit_spacing_medium" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toRightOf="@id/add_friend_user_item_avatar" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView" />
     <TextView android:textSize="@dimen/uikit_textsize_medium" android:id="@id/add_friend_user_item_name_secondary" android:layout_width="0.0dip" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toRightOf="@id/add_friend_user_item_name" app:layout_constraintRight_toLeftOf="@id/add_friend_user_item_send" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView.Subtext.SingleLine" />
-    <Button android:id="@id/add_friend_user_item_send" android:layout_width="wrap_content" android:minWidth="90.0dip" android:text="@string/send" app:layout_constraintRight_toRightOf="parent" style="@style/UiKit.Button.Outline" />
-    <Button android:id="@id/add_friend_user_item_accept" android:visibility="gone" android:layout_width="wrap_content" android:minWidth="90.0dip" android:text="@string/friend_request_accept" app:layout_constraintRight_toRightOf="parent" style="@style/UiKit.Button.Green.Fit.Outline" />
+    <Button android:id="@id/add_friend_user_item_send" android:layout_width="wrap_content" android:minWidth="90.0dip" android:text="@string/send" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.Button.Outline" />
+    <Button android:id="@id/add_friend_user_item_accept" android:visibility="gone" android:layout_width="wrap_content" android:minWidth="90.0dip" android:text="@string/friend_request_accept" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.Button.Green.Fit.Outline" />
     <TextView android:textColor="?primary_500" android:gravity="center" android:id="@id/add_friend_user_item_sent" android:visibility="gone" android:minWidth="90.0dip" android:text="@string/invite_friend_modal_sent" android:textAllCaps="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHorizontal_bias="1.0" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView.Semibold" />
 </androidx.constraintlayout.widget.ConstraintLayout>

com.discord/res/layout-v17/widget_change_log.xml

@@ -14,7 +14,7 @@
             <com.discord.app.AppTextView android:id="@id/change_log_body" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:text="@string/change_log_md_body" style="@style/UiKit.TextView" />
         </LinearLayout>
     </ScrollView>
-    <LinearLayout android:background="?colorPrimaryDark" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_small" android:paddingBottom="@dimen/uikit_spacing_small" android:paddingStart="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+    <LinearLayout android:background="?colorPrimaryDark" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_small" android:paddingRight="0.0dip" android:paddingBottom="@dimen/uikit_spacing_small" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="0.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
         <androidx.appcompat.widget.AppCompatImageButton android:id="@id/change_log_twitter" android:padding="@dimen/uikit_spacing_medium" android:layout_margin="@dimen/uikit_spacing_xsmall" android:src="@drawable/ic_twitter_white_18dp" android:scaleType="fitCenter" android:tint="?primary_100" style="@style/UiKit.ImageView.Clickable" />
         <androidx.appcompat.widget.AppCompatImageButton android:id="@id/change_log_facebook" android:padding="@dimen/uikit_spacing_medium" android:layout_margin="@dimen/uikit_spacing_xsmall" android:src="@drawable/ic_facebook_white_18dp" android:scaleType="fitCenter" android:tint="?primary_100" style="@style/UiKit.ImageView.Clickable" />
         <androidx.appcompat.widget.AppCompatImageButton android:id="@id/change_log_instagram" android:padding="@dimen/uikit_spacing_medium" android:layout_margin="@dimen/uikit_spacing_xsmall" android:src="@drawable/ic_instagram_white_18dp" android:scaleType="fitCenter" android:tint="?primary_100" style="@style/UiKit.ImageView.Clickable" />

com.discord/res/layout-v17/widget_channel_group_dm_settings.xml

@@ -7,7 +7,7 @@
     <androidx.core.widget.NestedScrollView android:id="@id/group_dm_settings_scroll_view" style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
         <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" />
+                <com.facebook.drawee.view.SimpleDraweeView android:id="@id/settings_group_icon" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="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" />
                 <com.discord.app.AppTextView android:textSize="@dimen/uikit_textsize_small" android:gravity="center_horizontal" android:id="@id/settings_group_icon_label" android:layout_width="wrap_content" android:text="@string/minimum_size" android:maxLines="2" android:layout_centerHorizontal="true" android:textAlignment="center" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="@id/settings_group_icon" app:layout_constraintLeft_toLeftOf="@id/settings_group_icon" app:layout_constraintRight_toRightOf="@id/settings_group_icon" app:layout_constraintStart_toStartOf="@id/settings_group_icon" app:layout_constraintTop_toBottomOf="@id/settings_group_icon" style="@style/UiKit.TextView.Subtext.Semibold" />
                 <TextView android:textColor="@color/brand_500" android:id="@id/settings_group_icon_remove" android:background="?selectableItemBackground" android:padding="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="wrap_content" android:text="@string/remove" android:layout_centerHorizontal="true" app:layout_constraintEnd_toEndOf="@id/settings_group_icon" app:layout_constraintLeft_toLeftOf="@id/settings_group_icon" app:layout_constraintRight_toRightOf="@id/settings_group_icon" app:layout_constraintStart_toStartOf="@id/settings_group_icon" app:layout_constraintTop_toBottomOf="@id/settings_group_icon_label" style="@style/UiKit.TextView.Subtext.Semibold" />

com.discord/res/layout-v17/widget_chat_input_emoji_picker.xml

@@ -2,8 +2,7 @@
 <RelativeLayout style="@style/UiKit.ViewGroup.Page"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <include android:id="@id/emoji_search_bar" layout="@layout/layout_search_actionbar" />
-    <androidx.recyclerview.widget.RecyclerView android:id="@id/chat_input_emoji_picker_recycler" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:clipToPadding="false" android:layout_above="@id/emoji_picker_bottom_bar" android:layout_below="@id/emoji_search_bar" style="@style/UiKit.ViewGroup.RecyclerView"
-      xmlns:android="http://schemas.android.com/apk/res/android" />
+    <androidx.recyclerview.widget.RecyclerView android:id="@id/chat_input_emoji_picker_recycler" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:clipToPadding="false" android:layout_above="@id/emoji_picker_bottom_bar" android:layout_below="@id/emoji_search_bar" style="@style/UiKit.ViewGroup.RecyclerView" />
     <RelativeLayout android:id="@id/emoji_picker_bottom_bar" android:background="?colorPrimary" android:layout_width="fill_parent" android:layout_height="48.0dip" android:layout_alignParentBottom="true">
         <ImageView android:id="@id/emoji_picker_search_icon" android:src="?theme_search_menu_icon" android:layout_alignParentLeft="true" android:contentDescription="@string/search" android:layout_alignParentStart="true" style="@style/EmojiPickerButtonIcon" />
         <com.google.android.material.tabs.TabLayout android:id="@id/emoji_picker_tab_layout" android:layout_width="wrap_content" android:layout_height="fill_parent" android:layout_toLeftOf="@id/emoji_picker_backspace_icon" android:layout_toRightOf="@id/emoji_picker_search_icon" android:layout_alignParentBottom="true" android:layout_alignWithParentIfMissing="true" android:layout_toStartOf="@id/emoji_picker_backspace_icon" android:layout_toEndOf="@id/emoji_picker_search_icon" app:tabMaxWidth="@dimen/uikit_spacing_xxxlarge" app:tabMode="scrollable" app:tabPaddingEnd="@dimen/uikit_spacing_small" app:tabPaddingStart="@dimen/uikit_spacing_small" />

com.discord/res/layout-v17/widget_chat_input_verification.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:gravity="center" android:orientation="vertical" android:id="@id/chat_input_verification" android:paddingLeft="@dimen/chat_cell_horizontal_spacing_total" android:paddingRight="@dimen/chat_cell_horizontal_spacing_total" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" android:paddingStart="@dimen/chat_cell_horizontal_spacing_total" android:paddingEnd="@dimen/chat_cell_horizontal_spacing_total"
+<LinearLayout android:gravity="center" android:id="@id/chat_input_verification" android:background="?primary_700_bg" android:paddingLeft="@dimen/chat_cell_horizontal_spacing_padding" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/chat_cell_horizontal_spacing_padding" android:paddingBottom="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_margin="@dimen/uikit_spacing_medium" android:paddingStart="@dimen/chat_cell_horizontal_spacing_padding" android:paddingEnd="@dimen/chat_cell_horizontal_spacing_padding" style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <View android:background="?theme_chat_divider" android:layout_width="fill_parent" android:layout_height="0.25dip" />
-    <TextView android:textSize="13.75sp" android:textColor="?theme_chat_text" android:gravity="center" android:id="@id/chat_input_verification_text" android:paddingTop="@dimen/chat_cell_horizontal_spacing_total" android:paddingBottom="@dimen/chat_cell_horizontal_spacing_total" android:layout_width="fill_parent" style="@style/UiKit.TextView.Semibold" />
-    <TextView android:textSize="13.75sp" android:textColor="@color/white" android:gravity="center" android:id="@id/chat_input_verification_action" android:background="@drawable/drawable_button_purple" android:paddingTop="10.0dip" android:paddingBottom="10.0dip" android:layout_width="fill_parent" android:layout_marginBottom="15.0dip" android:text="@string/resend_verification_email" style="@style/UiKit.TextView.Semibold" />
+    <TextView android:textColor="?theme_chat_text" android:gravity="center" android:id="@id/chat_input_verification_text" android:paddingTop="@dimen/chat_cell_vertical_spacing_padding" android:paddingBottom="@dimen/chat_cell_vertical_spacing_padding" android:layout_width="fill_parent" style="@style/UiKit.TextView.Semibold" />
+    <TextView android:id="@id/chat_input_verification_action" android:text="@string/resend_verification_email" style="@style/UiKit.Button" />
 </LinearLayout>

com.discord/res/layout-v17/widget_chat_list_actions.xml

@@ -13,7 +13,7 @@
         <View style="@style/UiKit.Settings.Divider" />
         <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" />
         <LinearLayout android:gravity="center_vertical" android:id="@id/dialog_chat_actions_add_reaction" android:background="?selectableItemBackground" android:paddingRight="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-            <TextView android:background="@color/transparent" android:clickable="false" android:text="@string/add_reaction" android:drawableLeft="?ic_add_reaction" android:layout_weight="1.0" android:drawableStart="?ic_add_reaction" style="@style/UiKit.Settings.Item.Icon" />
+            <TextView android:background="@color/transparent" android:clickable="false" android:layout_width="0.0dip" android:text="@string/add_reaction" android:drawableLeft="?ic_add_reaction" android:layout_weight="1.0" android:drawableStart="?ic_add_reaction" style="@style/UiKit.Settings.Item.Icon" />
             <androidx.recyclerview.widget.RecyclerView android:layout_gravity="center_vertical" android:id="@id/dialog_chat_actions_add_reaction_emojis_list" android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.RecyclerView.Horizontal" />
         </LinearLayout>
         <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" />

com.discord/res/layout-v17/widget_chat_list_adapter_item_game_invite.xml

@@ -5,5 +5,5 @@
     <TextView android:id="@id/item_game_invite_header" style="@style/UiKit.Chat.Embed.Header" />
     <TextView android:textSize="18.0sp" android:textColor="?primary_100" android:id="@id/item_game_invite_status" android:layout_marginTop="@dimen/uikit_spacing_medium" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toLeftOf="@id/item_game_invite_header" app:layout_constraintStart_toStartOf="@id/item_game_invite_header" app:layout_constraintTop_toBottomOf="@id/item_game_invite_header" style="@style/UiKit.TextView" />
     <androidx.recyclerview.widget.RecyclerView android:id="@id/item_game_invite_recycler" android:layout_width="0.0dip" android:layout_height="@dimen/avatar_size_standard" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:layout_marginStart="@dimen/uikit_spacing_large" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/item_game_invite_cover_image" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/item_game_invite_cover_image" app:layout_constraintStart_toStartOf="parent" style="@style/UiKit.ViewGroup.RecyclerView.Horizontal" />
-    <TextView android:gravity="end" android:id="@id/item_game_invite_application_name" android:layout_width="0.0dip" android:layout_height="wrap_content" android:maxLines="2" android:textAlignment="viewEnd" app:layout_constraintLeft_toLeftOf="@id/item_game_invite_cover_image" app:layout_constraintStart_toStartOf="@id/item_game_invite_cover_image" style="@style/UiKit.Chat.Embed.Footer" />
+    <TextView android:gravity="end" android:id="@id/item_game_invite_application_name" android:layout_width="0.0dip" android:layout_height="wrap_content" android:maxLines="2" android:textAlignment="viewEnd" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="@id/item_game_invite_cover_image" app:layout_constraintStart_toStartOf="@id/item_game_invite_cover_image" style="@style/UiKit.Chat.Embed.Footer" />
 </androidx.constraintlayout.widget.ConstraintLayout>

com.discord/res/layout-v17/widget_chat_list_adapter_item_text.xml

@@ -2,10 +2,10 @@
 <androidx.constraintlayout.widget.ConstraintLayout android:background="?selectableItemBackground" android:paddingTop="10.0dip" android:paddingRight="@dimen/chat_cell_horizontal_spacing_padding" android:layout_width="fill_parent" android:layout_height="wrap_content" android:paddingEnd="@dimen/chat_cell_horizontal_spacing_padding"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <androidx.constraintlayout.widget.Guideline android:id="@id/uikit_chat_guideline" style="@style/UiKit.Chat.Guideline" />
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/chat_list_adapter_item_text_avatar" android:layout_marginLeft="8.0dip" android:layout_marginTop="@dimen/uikit_spacing_small" android:importantForAccessibility="no" android:layout_marginStart="8.0dip" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="@id/uikit_chat_guideline" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/uikit_chat_guideline" app:layout_constraintStart_toStartOf="parent" style="@style/Avatar.Chat" />
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/chat_list_adapter_item_text_avatar" android:layout_marginLeft="8.0dip" android:importantForAccessibility="no" android:layout_marginStart="8.0dip" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="@id/uikit_chat_guideline" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/uikit_chat_guideline" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/chat_list_adapter_item_text_header" style="@style/Avatar.Chat" />
     <androidx.constraintlayout.widget.ConstraintLayout android:id="@id/chat_list_adapter_item_text_header" android:layout_width="wrap_content" android:layout_height="0.0dip" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toRightOf="@id/uikit_chat_guideline" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/uikit_chat_guideline" app:layout_constraintTop_toTopOf="@id/chat_list_adapter_item_text_avatar">
         <TextView android:textColor="?theme_chat_name" android:id="@id/chat_list_adapter_item_text_name" android:lineSpacingMultiplier="1.0" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@id/chat_list_adapter_item_text_bot" app:layout_constraintEnd_toStartOf="@id/chat_list_adapter_item_text_bot" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintStart_toStartOf="parent" style="@style/UiKit.TextView.Large.SingleLine" />
-        <TextView android:textSize="9.5sp" android:textColor="@color/white" android:id="@id/chat_list_adapter_item_text_bot" android:background="@drawable/drawable_button_purple_neutral" android:paddingLeft="3.0dip" android:paddingTop="0.5dip" android:paddingRight="3.0dip" android:paddingBottom="0.5dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="6.0dip" android:layout_marginBottom="1.0dip" android:text="BOT" android:singleLine="true" android:layout_marginStart="6.0dip" app:layout_constraintEnd_toStartOf="@id/chat_list_adapter_item_text_timestamp" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_text_name" style="@style/UiKit.TextView" />
+        <TextView android:textSize="9.5sp" android:textColor="@color/white" android:id="@id/chat_list_adapter_item_text_bot" android:background="@drawable/drawable_button_purple_neutral" android:paddingLeft="3.0dip" android:paddingTop="0.5dip" android:paddingRight="3.0dip" android:paddingBottom="0.5dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="6.0dip" android:layout_marginBottom="1.0dip" android:text="BOT" android:singleLine="true" android:layout_marginStart="6.0dip" app:layout_constraintBottom_toBottomOf="@id/chat_list_adapter_item_text_name" app:layout_constraintEnd_toStartOf="@id/chat_list_adapter_item_text_timestamp" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_text_name" style="@style/UiKit.TextView" />
         <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?theme_chat_timestamp" android:gravity="center_vertical" android:id="@id/chat_list_adapter_item_text_timestamp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="6.0dip" android:layout_marginBottom="1.0dip" android:maxWidth="150.0dip" android:singleLine="true" android:layout_marginStart="6.0dip" app:layout_constraintBaseline_toBaselineOf="@id/chat_list_adapter_item_text_name" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_text_bot" style="@style/UiKit.TextView" />
     </androidx.constraintlayout.widget.ConstraintLayout>
     <com.discord.utilities.view.text.LinkifiedTextView android:id="@id/chat_list_adapter_item_text" android:layout_width="0.0dip" android:layout_marginTop="@dimen/uikit_spacing_xsmall" android:layout_marginRight="@dimen/uikit_spacing_small" android:layout_marginBottom="2.0dip" android:layout_marginEnd="@dimen/uikit_spacing_small" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/uikit_chat_guideline" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/uikit_chat_guideline" app:layout_constraintTop_toBottomOf="@id/chat_list_adapter_item_text_header" style="@style/UiKit.Chat.Text" />

com.discord/res/layout-v17/widget_guild_invite_share_item.xml

@@ -2,7 +2,7 @@
 <LinearLayout android:gravity="center_vertical" android:background="?selectableItemBackground" 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/item_icon_iv" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large" app:placeholderImage="?colorPrimaryCircle" style="@style/Avatar.Standard" />
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:id="@id/item_name_tv" android:layout_weight="1.0" style="@style/UiKit.TextView.Subtext.Semibold.SingleLine" />
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:id="@id/item_name_tv" android:layout_width="0.0dip" 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" />
 </LinearLayout>

com.discord/res/layout-v17/widget_guild_transfer_ownership.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout style="@style/UiKit.ViewGroup.Page.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <TextView android:id="@id/guild_transfer_ownership_header" android:padding="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:text="@string/transfer_ownership" style="@style/UiKit.TextView.H1.Bold" />
+    <TextView android:padding="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:text="@string/transfer_ownership" style="@style/UiKit.TextView.H1.Bold" />
     <View style="@style/UiKit.Divider" />
     <LinearLayout android:id="@id/guild_transfer_ownership_mfa_wrap" style="@style/UiKit.ViewGroup.LinearLayout">
         <TextView android:text="@string/two_fa_enter_token_label" android:textAllCaps="true" style="@style/UiKit.Settings.Item.Label" />

com.discord/res/layout-v17/widget_music_rich_presence.xml

@@ -14,8 +14,8 @@
         <TextView android:id="@id/rich_presence_time" style="@style/UiKit.TextView.Marquee" />
         <com.miguelgaeta.super_bar.SuperBar android:id="@id/rich_presence_superbar" android:focusable="false" android:clickable="false" android:layout_height="@dimen/uikit_spacing_large" app:sb_barBackgroundColor="?primary_700" app:sb_barColor="?primary_100" app:sb_barControlColor="@color/transparent" app:sb_barControlRadius="6.0dip" app:sb_barControlShadowRadius="0.0dip" app:sb_barHeight="6.0dip" app:sb_barTouchEnabled="false" app:sb_barValueMax="100.0" style="@style/UiKit.SuperBar" />
         <androidx.constraintlayout.widget.ConstraintLayout style="@style/UiKit.ViewGroup">
-            <TextView android:id="@id/rich_presence_music_elapsed" android:layout_width="0.0dip" app:layout_constraintWidth_percent="50.0" style="@style/UiKit.TextView" />
-            <TextView android:id="@id/rich_presence_music_duration" android:layout_width="0.0dip" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintWidth_percent="50.0" style="@style/UiKit.TextView" />
+            <TextView android:id="@id/rich_presence_music_elapsed" android:layout_width="0.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintWidth_percent="50.0" style="@style/UiKit.TextView" />
+            <TextView android:id="@id/rich_presence_music_duration" android:layout_width="0.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintWidth_percent="50.0" style="@style/UiKit.TextView" />
         </androidx.constraintlayout.widget.ConstraintLayout>
     </LinearLayout>
     <FrameLayout android:id="@id/rich_presence_play_button" android:background="@color/rich_presence_spotify_play_button" android:paddingTop="10.0dip" android:paddingBottom="10.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" 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_large" android:foreground="?selectableItemBackground" app:layout_constraintTop_toBottomOf="@id/rich_presence_container_data">

com.discord/res/layout-v17/widget_notice_popup_channel.xml

@@ -4,7 +4,7 @@
     <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_constraintTop_toTopOf="@id/popup_subtitle" app:layout_constraintWidth_min="@dimen/uikit_spacing_xxlarge" style="@style/UiKit.TextView.Subtext.Semibold.SingleLine" />
             <TextView android:id="@id/popup_subtitle" android:layout_marginLeft="4.0dip" android:lineSpacingMultiplier="1.0" android:layout_marginStart="4.0dip" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@id/popup_title" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/popup_title" style="@style/UiKit.TextView.Subtext.Semibold.SingleLine" />
             <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:textColor="?primary_200" android:ellipsize="end" android:id="@id/popup_body" android:layout_width="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_xsmall" android:maxLines="3" android:lineSpacingMultiplier="1.0" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="@id/popup_title" app:layout_constraintTop_toBottomOf="@id/popup_title" style="@style/UiKit.TextView" />
             <com.facebook.drawee.view.SimpleDraweeView android:id="@id/popup_attachment" android: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.discord/res/layout-v17/widget_payment_source_edit_dialog.xml

@@ -23,7 +23,7 @@
                 <androidx.appcompat.widget.AppCompatEditText android:hint="@string/billing_address_city" android:inputType="text" android:imeOptions="actionNext" style="@style/UiKit.TextInputLayout.EditText.Dense" />
             </com.google.android.material.textfield.TextInputLayout>
             <com.google.android.material.textfield.TextInputLayout android:id="@id/payment_source_edit_state" style="@style/UiKit.Form.Field.EditText.Wrap">
-                <androidx.appcompat.widget.AppCompatEditText android:focusableInTouchMode="false" android:hint="@string/billing_address_state" android:editable="false" android:drawableRight="@drawable/ic_chevron_right_grey_24dp" android:inputType="none" android:imeOptions="actionGo" android:drawableEnd="@drawable/ic_chevron_right_grey_24dp" style="@style/UiKit.TextInputLayout.EditText.Dense" />
+                <androidx.appcompat.widget.AppCompatEditText android:enabled="false" android:focusableInTouchMode="false" android:hint="@string/billing_address_state" android:drawableRight="@drawable/ic_chevron_right_grey_24dp" android:inputType="none" android:imeOptions="actionGo" android:drawableEnd="@drawable/ic_chevron_right_grey_24dp" style="@style/UiKit.TextInputLayout.EditText.Dense" />
             </com.google.android.material.textfield.TextInputLayout>
             <com.google.android.material.textfield.TextInputLayout android:id="@id/payment_source_edit_postal_code" style="@style/UiKit.Form.Field.EditText.Wrap">
                 <androidx.appcompat.widget.AppCompatEditText android:nextFocusRight="@id/dialog_save" android:hint="@string/billing_address_zip_code" android:inputType="text" android:imeOptions="actionDone" android:nextFocusForward="@id/dialog_save" style="@style/UiKit.TextInputLayout.EditText.Dense" />

com.discord/res/layout-v17/widget_server_settings_edit_member.xml

@@ -7,7 +7,7 @@
     <androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
         <LinearLayout android:focusable="true" android:focusableInTouchMode="true" android:descendantFocusability="beforeDescendants" style="@style/UiKit.ViewGroup.LinearLayout">
             <TextView android:text="@string/nickname" style="@style/UiKit.Settings.Item.Header" />
-            <LinearLayout android:id="@id/edit_member_nickname_container" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+            <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
                 <EditText android:id="@id/edit_member_nickname" android:layout_width="0.0dip" android:hint="@string/change_nickname" android:singleLine="true" android:maxLength="32" android:layout_weight="1.0" android:inputType="textNoSuggestions" style="@style/UiKit.EditText.Themed" />
                 <ImageView android:layout_gravity="center_vertical" android:id="@id/edit_member_nickname_lock" android:layout_marginRight="10.0dip" android:src="@drawable/ic_role_lock" android:layout_marginEnd="10.0dip" style="@style/UiKit.ImageView" />
             </LinearLayout>

com.discord/res/layout-v17/widget_server_settings_overview.xml

@@ -7,7 +7,7 @@
     <ScrollView android:id="@id/server_settings_overview_scroll" style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
         <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" />
+                <com.facebook.drawee.view.SimpleDraweeView android:id="@id/server_settings_overview_icon" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="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" />
                 <TextView android:textSize="42.0sp" android:textColor="@color/primary_100" android:ellipsize="none" android:gravity="center" android:id="@id/server_settings_overview_icon_text" android:layout_width="0.0dip" android:layout_height="0.0dip" android:layout_margin="@dimen/uikit_spacing_medium" android:singleLine="true" app:layout_constraintBottom_toBottomOf="@id/server_settings_overview_icon" app:layout_constraintEnd_toEndOf="@id/server_settings_overview_icon" app:layout_constraintLeft_toLeftOf="@id/server_settings_overview_icon" app:layout_constraintRight_toRightOf="@id/server_settings_overview_icon" app:layout_constraintStart_toStartOf="@id/server_settings_overview_icon" app:layout_constraintTop_toTopOf="@id/server_settings_overview_icon" app:textAllCaps="true" style="@style/UiKit.TextView" />
                 <com.discord.app.AppTextView android:textSize="@dimen/uikit_textsize_small" android:gravity="center_horizontal" android:id="@id/server_settings_overview_icon_label" android:layout_width="wrap_content" android:text="@string/minimum_size" android:maxLines="2" android:layout_centerHorizontal="true" android:textAlignment="center" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="@id/server_settings_overview_icon" app:layout_constraintLeft_toLeftOf="@id/server_settings_overview_icon" app:layout_constraintRight_toRightOf="@id/server_settings_overview_icon" app:layout_constraintStart_toStartOf="@id/server_settings_overview_icon" app:layout_constraintTop_toBottomOf="@id/server_settings_overview_icon" style="@style/UiKit.TextView.Subtext.Semibold" />
@@ -37,6 +37,28 @@
             <TextView android:text="@string/form_help_default_notification_settings_mobile" style="@style/UiKit.Settings.Item.SubText" />
             <com.discord.views.CheckedSetting android:id="@id/server_settings_overview_notification_all" app:cs_text="@string/form_label_all_messages" app:cs_view_type="radio" style="@style/UiKit.CheckedSetting.Themed" />
             <com.discord.views.CheckedSetting android:id="@id/server_settings_overview_notification_only_mentions" app:cs_text="@string/form_label_only_mentions" app:cs_view_type="radio" style="@style/UiKit.CheckedSetting.Themed" />
+            <LinearLayout android:id="@id/server_settings_overview_upload_splash_section" style="@style/UiKit.ViewGroup.LinearLayout">
+                <View style="@style/UiKit.Settings.Divider" />
+                <TextView android:text="@string/guild_settings_server_invite_background" style="@style/UiKit.Settings.Item.Header" />
+                <FrameLayout android:id="@id/server_settings_overview_upload_splash_container" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:foreground="?selectableItemBackground">
+                    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/server_settings_overview_upload_splash" android:layout_width="fill_parent" android:layout_height="wrap_content" app:placeholderImage="@drawable/drawable_nitro_classic_gradient_horizontal" app:roundedCornerRadius="3.0dip" app:viewAspectRatio="1.78" />
+                    <com.google.android.material.floatingactionbutton.FloatingActionButton android:focusable="false" android:clickable="false" android:src="@drawable/ic_upload_image_40dp" android:scaleType="centerCrop" android:contentDescription="@string/sample_empty_string" app:backgroundTint="@color/white" app:fabCustomSize="@dimen/uikit_spacing_xxlarge" app:maxImageSize="@dimen/uikit_spacing_xxlarge" style="@style/Settings.FloatingActionButton" />
+                </FrameLayout>
+                <TextView android:textColor="@color/brand_500" android:id="@id/server_settings_overview_upload_splash_remove" android:background="?selectableItemBackground" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="wrap_content" android:text="@string/remove" style="@style/UiKit.TextView.Subtext.Semibold" />
+                <TextView android:paddingBottom="@dimen/uikit_spacing_small" android:text="@string/guild_settings_splash_info" style="@style/UiKit.Settings.Item.SubText" />
+                <TextView android:id="@id/server_settings_overview_upload_splash_learn_more" android:paddingTop="@dimen/uikit_spacing_small" android:text="@string/guild_settings_splash_recommend" style="@style/UiKit.Settings.Item.SubText" />
+            </LinearLayout>
+            <LinearLayout android:id="@id/server_settings_overview_upload_banner_section" style="@style/UiKit.ViewGroup.LinearLayout">
+                <View style="@style/UiKit.Settings.Divider" />
+                <TextView android:text="@string/guild_settings_server_banner" style="@style/UiKit.Settings.Item.Header" />
+                <FrameLayout android:id="@id/server_settings_overview_upload_banner_container" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:foreground="?selectableItemBackground">
+                    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/server_settings_overview_upload_banner" android:layout_width="fill_parent" android:layout_height="wrap_content" app:placeholderImage="@drawable/drawable_nitro_classic_gradient_horizontal" app:roundedCornerRadius="3.0dip" app:viewAspectRatio="1.78" />
+                    <com.google.android.material.floatingactionbutton.FloatingActionButton android:focusable="false" android:clickable="false" android:src="@drawable/ic_upload_image_40dp" android:scaleType="centerCrop" android:contentDescription="@string/sample_empty_string" app:backgroundTint="@color/white" app:fabCustomSize="@dimen/uikit_spacing_xxlarge" app:maxImageSize="@dimen/uikit_spacing_xxlarge" style="@style/Settings.FloatingActionButton" />
+                </FrameLayout>
+                <TextView android:textColor="@color/brand_500" android:id="@id/server_settings_overview_upload_banner_remove" android:background="?selectableItemBackground" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="wrap_content" android:text="@string/remove" style="@style/UiKit.TextView.Subtext.Semibold" />
+                <TextView android:paddingBottom="@dimen/uikit_spacing_small" android:text="@string/form_help_server_banner" style="@style/UiKit.Settings.Item.SubText" />
+                <TextView android:id="@id/server_settings_overview_upload_banner_learn_more" android:paddingBottom="@dimen/uikit_spacing_small" android:text="@string/guild_settings_banner_recommend" style="@style/UiKit.Settings.Item.SubText" />
+            </LinearLayout>
             <View android:layout_width="fill_parent" android:layout_height="64.0dip" />
         </LinearLayout>
     </ScrollView>

com.discord/res/layout-v17/widget_settings_appearance.xml

@@ -14,7 +14,7 @@
             <TextView android:text="@string/sync" style="@style/UiKit.Settings.Item.Header" />
             <com.discord.views.CheckedSetting android:id="@id/settings_appearance_sync_switch" app:cs_text="@string/settings_sync" app:cs_view_type="switchview" style="@style/UiKit.CheckedSetting.Themed" />
             <View style="@style/UiKit.Settings.Divider" />
-            <LinearLayout android:id="@id/settings_appearance_font_scaling_container" android:visibility="gone" style="@style/UiKit.ViewGroup.LinearLayout">
+            <LinearLayout android:id="@id/settings_appearance_font_scaling_container" style="@style/UiKit.ViewGroup.LinearLayout">
                 <TextView android:text="@string/accessibility_font_scaling_label" style="@style/UiKit.Settings.Item.Header" />
                 <TextView android:id="@id/settings_appearance_font_scale_platform" style="@style/UiKit.Settings.Item.SubText" />
                 <RelativeLayout style="@style/UiKit.Settings.Item">

com.discord/res/layout-v17/widget_settings_item_connected_account.xml

@@ -6,8 +6,8 @@
         <ImageView android:id="@id/connected_account_img" android:layout_width="@dimen/connected_account_img_size" android:layout_height="@dimen/connected_account_img_size" android:layout_margin="@dimen/uikit_spacing_large" android:contentDescription="@string/connected_accounts" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ImageView" />
         <TextView android:textColor="@color/white" android:id="@id/connected_account_name" android:layout_width="0.0dip" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" app:layout_constraintBottom_toBottomOf="@id/connected_account_img" app:layout_constraintLeft_toRightOf="@id/connected_account_img" app:layout_constraintRight_toLeftOf="@id/connected_account_disconnect" app:layout_constraintTop_toTopOf="@id/connected_account_img" style="@style/UiKit.TextView.Large.SingleLine" />
         <ImageView android:id="@id/connected_account_disconnect" android:padding="@dimen/uikit_spacing_small" android:layout_marginRight="@dimen/uikit_spacing_large" android:src="@drawable/ic_close_white_24dp" android:contentDescription="@string/disconnect_account" android:layout_marginEnd="@dimen/uikit_spacing_large" app:layout_constraintBottom_toBottomOf="@id/connected_account_img" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@id/connected_account_img" style="@style/UiKit.ImageView.Clickable" />
-        <View android:id="@id/connected_account_divider" android:layout_height="0.5dip" android:layout_marginTop="@dimen/uikit_spacing_large" app:layout_constraintTop_toBottomOf="@id/connected_account_img" style="@style/UiKit.Divider" />
-        <LinearLayout android:paddingTop="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_medium" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toBottomOf="@id/connected_account_divider" style="@style/UiKit.ViewGroup.LinearLayout">
+        <View android:id="@id/connected_account_divider" android:layout_height="0.5dip" android:layout_marginTop="@dimen/uikit_spacing_large" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/connected_account_img" style="@style/UiKit.Divider" />
+        <LinearLayout android:paddingTop="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_medium" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/connected_account_divider" style="@style/UiKit.ViewGroup.LinearLayout">
             <androidx.appcompat.widget.SwitchCompat android:id="@id/connected_account_display_switch" android:text="@string/display_on_profile" style="@style/Connections.Switch" />
             <androidx.appcompat.widget.SwitchCompat android:id="@id/connected_account_display_activity_switch" android:text="@string/display_activity" style="@style/Connections.Switch" />
             <androidx.appcompat.widget.SwitchCompat android:id="@id/connected_account_sync_friends_switch" android:text="@string/sync_friends" style="@style/Connections.Switch" />

com.discord/res/layout-v21/widget_change_log.xml

@@ -14,7 +14,7 @@
             <com.discord.app.AppTextView android:id="@id/change_log_body" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:text="@string/change_log_md_body" style="@style/UiKit.TextView" />
         </LinearLayout>
     </ScrollView>
-    <LinearLayout android:background="?colorPrimaryDark" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_small" android:paddingBottom="@dimen/uikit_spacing_small" android:paddingStart="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+    <LinearLayout android:background="?colorPrimaryDark" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_small" android:paddingRight="0.0dip" android:paddingBottom="@dimen/uikit_spacing_small" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="0.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
         <androidx.appcompat.widget.AppCompatImageButton android:id="@id/change_log_twitter" android:padding="@dimen/uikit_spacing_medium" android:layout_margin="@dimen/uikit_spacing_xsmall" android:src="@drawable/ic_twitter_white_18dp" android:scaleType="fitCenter" android:tint="?primary_100" style="@style/UiKit.ImageView.Clickable" />
         <androidx.appcompat.widget.AppCompatImageButton android:id="@id/change_log_facebook" android:padding="@dimen/uikit_spacing_medium" android:layout_margin="@dimen/uikit_spacing_xsmall" android:src="@drawable/ic_facebook_white_18dp" android:scaleType="fitCenter" android:tint="?primary_100" style="@style/UiKit.ImageView.Clickable" />
         <androidx.appcompat.widget.AppCompatImageButton android:id="@id/change_log_instagram" android:padding="@dimen/uikit_spacing_medium" android:layout_margin="@dimen/uikit_spacing_xsmall" android:src="@drawable/ic_instagram_white_18dp" android:scaleType="fitCenter" android:tint="?primary_100" style="@style/UiKit.ImageView.Clickable" />

com.discord/res/layout-v21/widget_channel_group_dm_settings.xml

@@ -7,7 +7,7 @@
     <androidx.core.widget.NestedScrollView android:id="@id/group_dm_settings_scroll_view" style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
         <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" />
+                <com.facebook.drawee.view.SimpleDraweeView android:id="@id/settings_group_icon" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="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" android:elevation="@dimen/app_elevation" app:layout_constraintEnd_toEndOf="@id/settings_group_icon" app:layout_constraintRight_toRightOf="@id/settings_group_icon" app:layout_constraintTop_toTopOf="@id/settings_group_icon" style="@style/UiKit.ImageView" />
                 <com.discord.app.AppTextView android:textSize="@dimen/uikit_textsize_small" android:gravity="center_horizontal" android:id="@id/settings_group_icon_label" android:layout_width="wrap_content" android:text="@string/minimum_size" android:maxLines="2" android:layout_centerHorizontal="true" android:textAlignment="center" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="@id/settings_group_icon" app:layout_constraintLeft_toLeftOf="@id/settings_group_icon" app:layout_constraintRight_toRightOf="@id/settings_group_icon" app:layout_constraintStart_toStartOf="@id/settings_group_icon" app:layout_constraintTop_toBottomOf="@id/settings_group_icon" style="@style/UiKit.TextView.Subtext.Semibold" />
                 <TextView android:textColor="@color/brand_500" android:id="@id/settings_group_icon_remove" android:background="?selectableItemBackground" android:padding="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="wrap_content" android:text="@string/remove" android:layout_centerHorizontal="true" app:layout_constraintEnd_toEndOf="@id/settings_group_icon" app:layout_constraintLeft_toLeftOf="@id/settings_group_icon" app:layout_constraintRight_toRightOf="@id/settings_group_icon" app:layout_constraintStart_toStartOf="@id/settings_group_icon" app:layout_constraintTop_toBottomOf="@id/settings_group_icon_label" style="@style/UiKit.TextView.Subtext.Semibold" />

com.discord/res/layout-v21/widget_chat_input_emoji_picker.xml

@@ -2,8 +2,7 @@
 <RelativeLayout style="@style/UiKit.ViewGroup.Page"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <include android:id="@id/emoji_search_bar" layout="@layout/layout_search_actionbar" />
-    <androidx.recyclerview.widget.RecyclerView android:id="@id/chat_input_emoji_picker_recycler" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:clipToPadding="false" android:layout_above="@id/emoji_picker_bottom_bar" android:layout_below="@id/emoji_search_bar" style="@style/UiKit.ViewGroup.RecyclerView"
-      xmlns:android="http://schemas.android.com/apk/res/android" />
+    <androidx.recyclerview.widget.RecyclerView android:id="@id/chat_input_emoji_picker_recycler" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:clipToPadding="false" android:layout_above="@id/emoji_picker_bottom_bar" android:layout_below="@id/emoji_search_bar" style="@style/UiKit.ViewGroup.RecyclerView" />
     <RelativeLayout android:id="@id/emoji_picker_bottom_bar" android:background="?colorPrimary" android:layout_width="fill_parent" android:layout_height="48.0dip" android:layout_alignParentBottom="true" android:elevation="@dimen/uikit_spacing_medium">
         <ImageView android:id="@id/emoji_picker_search_icon" android:src="?theme_search_menu_icon" android:layout_alignParentLeft="true" android:contentDescription="@string/search" android:layout_alignParentStart="true" style="@style/EmojiPickerButtonIcon" />
         <com.google.android.material.tabs.TabLayout android:id="@id/emoji_picker_tab_layout" android:layout_width="wrap_content" android:layout_height="fill_parent" android:layout_toLeftOf="@id/emoji_picker_backspace_icon" android:layout_toRightOf="@id/emoji_picker_search_icon" android:layout_alignParentBottom="true" android:layout_alignWithParentIfMissing="true" android:layout_toStartOf="@id/emoji_picker_backspace_icon" android:layout_toEndOf="@id/emoji_picker_search_icon" app:tabMaxWidth="@dimen/uikit_spacing_xxxlarge" app:tabMode="scrollable" app:tabPaddingEnd="@dimen/uikit_spacing_small" app:tabPaddingStart="@dimen/uikit_spacing_small" />

com.discord/res/layout-v21/widget_server_settings_overview.xml

@@ -7,7 +7,7 @@
     <ScrollView android:id="@id/server_settings_overview_scroll" style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
         <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" />
+                <com.facebook.drawee.view.SimpleDraweeView android:id="@id/server_settings_overview_icon" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="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" android:elevation="@dimen/app_elevation" app:layout_constraintEnd_toEndOf="@id/server_settings_overview_icon" app:layout_constraintRight_toRightOf="@id/server_settings_overview_icon" app:layout_constraintTop_toTopOf="@id/server_settings_overview_icon" style="@style/UiKit.ImageView" />
                 <TextView android:textSize="42.0sp" android:textColor="@color/primary_100" android:ellipsize="none" android:gravity="center" android:id="@id/server_settings_overview_icon_text" android:layout_width="0.0dip" android:layout_height="0.0dip" android:layout_margin="@dimen/uikit_spacing_medium" android:singleLine="true" app:layout_constraintBottom_toBottomOf="@id/server_settings_overview_icon" app:layout_constraintEnd_toEndOf="@id/server_settings_overview_icon" app:layout_constraintLeft_toLeftOf="@id/server_settings_overview_icon" app:layout_constraintRight_toRightOf="@id/server_settings_overview_icon" app:layout_constraintStart_toStartOf="@id/server_settings_overview_icon" app:layout_constraintTop_toTopOf="@id/server_settings_overview_icon" app:textAllCaps="true" style="@style/UiKit.TextView" />
                 <com.discord.app.AppTextView android:textSize="@dimen/uikit_textsize_small" android:gravity="center_horizontal" android:id="@id/server_settings_overview_icon_label" android:layout_width="wrap_content" android:text="@string/minimum_size" android:maxLines="2" android:layout_centerHorizontal="true" android:textAlignment="center" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="@id/server_settings_overview_icon" app:layout_constraintLeft_toLeftOf="@id/server_settings_overview_icon" app:layout_constraintRight_toRightOf="@id/server_settings_overview_icon" app:layout_constraintStart_toStartOf="@id/server_settings_overview_icon" app:layout_constraintTop_toBottomOf="@id/server_settings_overview_icon" style="@style/UiKit.TextView.Subtext.Semibold" />
@@ -37,6 +37,28 @@
             <TextView android:text="@string/form_help_default_notification_settings_mobile" style="@style/UiKit.Settings.Item.SubText" />
             <com.discord.views.CheckedSetting android:id="@id/server_settings_overview_notification_all" app:cs_text="@string/form_label_all_messages" app:cs_view_type="radio" style="@style/UiKit.CheckedSetting.Themed" />
             <com.discord.views.CheckedSetting android:id="@id/server_settings_overview_notification_only_mentions" app:cs_text="@string/form_label_only_mentions" app:cs_view_type="radio" style="@style/UiKit.CheckedSetting.Themed" />
+            <LinearLayout android:id="@id/server_settings_overview_upload_splash_section" style="@style/UiKit.ViewGroup.LinearLayout">
+                <View style="@style/UiKit.Settings.Divider" />
+                <TextView android:text="@string/guild_settings_server_invite_background" style="@style/UiKit.Settings.Item.Header" />
+                <FrameLayout android:id="@id/server_settings_overview_upload_splash_container" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:foreground="?selectableItemBackground">
+                    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/server_settings_overview_upload_splash" android:layout_width="fill_parent" android:layout_height="wrap_content" app:placeholderImage="@drawable/drawable_nitro_classic_gradient_horizontal" app:roundedCornerRadius="3.0dip" app:viewAspectRatio="1.78" />
+                    <com.google.android.material.floatingactionbutton.FloatingActionButton android:focusable="false" android:clickable="false" android:src="@drawable/ic_upload_image_40dp" android:scaleType="centerCrop" android:contentDescription="@string/sample_empty_string" app:backgroundTint="@color/white" app:fabCustomSize="@dimen/uikit_spacing_xxlarge" app:maxImageSize="@dimen/uikit_spacing_xxlarge" style="@style/Settings.FloatingActionButton" />
+                </FrameLayout>
+                <TextView android:textColor="@color/brand_500" android:id="@id/server_settings_overview_upload_splash_remove" android:background="?selectableItemBackground" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="wrap_content" android:text="@string/remove" style="@style/UiKit.TextView.Subtext.Semibold" />
+                <TextView android:paddingBottom="@dimen/uikit_spacing_small" android:text="@string/guild_settings_splash_info" style="@style/UiKit.Settings.Item.SubText" />
+                <TextView android:id="@id/server_settings_overview_upload_splash_learn_more" android:paddingTop="@dimen/uikit_spacing_small" android:text="@string/guild_settings_splash_recommend" style="@style/UiKit.Settings.Item.SubText" />
+            </LinearLayout>
+            <LinearLayout android:id="@id/server_settings_overview_upload_banner_section" style="@style/UiKit.ViewGroup.LinearLayout">
+                <View style="@style/UiKit.Settings.Divider" />
+                <TextView android:text="@string/guild_settings_server_banner" style="@style/UiKit.Settings.Item.Header" />
+                <FrameLayout android:id="@id/server_settings_overview_upload_banner_container" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:foreground="?selectableItemBackground">
+                    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/server_settings_overview_upload_banner" android:layout_width="fill_parent" android:layout_height="wrap_content" app:placeholderImage="@drawable/drawable_nitro_classic_gradient_horizontal" app:roundedCornerRadius="3.0dip" app:viewAspectRatio="1.78" />
+                    <com.google.android.material.floatingactionbutton.FloatingActionButton android:focusable="false" android:clickable="false" android:src="@drawable/ic_upload_image_40dp" android:scaleType="centerCrop" android:contentDescription="@string/sample_empty_string" app:backgroundTint="@color/white" app:fabCustomSize="@dimen/uikit_spacing_xxlarge" app:maxImageSize="@dimen/uikit_spacing_xxlarge" style="@style/Settings.FloatingActionButton" />
+                </FrameLayout>
+                <TextView android:textColor="@color/brand_500" android:id="@id/server_settings_overview_upload_banner_remove" android:background="?selectableItemBackground" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="wrap_content" android:text="@string/remove" style="@style/UiKit.TextView.Subtext.Semibold" />
+                <TextView android:paddingBottom="@dimen/uikit_spacing_small" android:text="@string/form_help_server_banner" style="@style/UiKit.Settings.Item.SubText" />
+                <TextView android:id="@id/server_settings_overview_upload_banner_learn_more" android:paddingBottom="@dimen/uikit_spacing_small" android:text="@string/guild_settings_banner_recommend" style="@style/UiKit.Settings.Item.SubText" />
+            </LinearLayout>
             <View android:layout_width="fill_parent" android:layout_height="64.0dip" />
         </LinearLayout>
     </ScrollView>

com.discord/res/layout-v22/widget_chat_input_edit_text.xml

@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.discord.widgets.chat.input.WidgetChatInputEditText android:textSize="@dimen/uikit_textsize_medium" android:textColor="?theme_chat_input_text" android:textColorHint="?theme_chat_input_text_placeholder" android:layout_gravity="center_vertical" android:background="@color/transparent" android:scrollbars="vertical" android:layout_width="fill_parent" android:minHeight="42.0dip" android:maxLines="5" android:layout_weight="1.0" android:inputType="textCapSentences|textMultiLine" android:imeOptions="flagNoExtractUi" android:importantForAutofill="no" style="@style/UiKit.TextView"
+<com.discord.widgets.chat.input.WidgetChatInputEditText android:textSize="@dimen/uikit_textsize_medium" android:textColor="?theme_chat_input_text" android:textColorHint="?theme_chat_input_text_placeholder" android:layout_gravity="center_vertical" android:background="@color/transparent" android:paddingTop="@dimen/uikit_spacing_small" android:paddingBottom="@dimen/uikit_spacing_small" android:scrollbars="vertical" android:layout_width="fill_parent" android:minHeight="42.0dip" android:maxLines="5" android:layout_weight="1.0" android:lineSpacingMultiplier="1.0" android:inputType="textCapSentences|textMultiLine" android:imeOptions="flagNoExtractUi" android:importantForAutofill="no" style="@style/UiKit.TextView"
   xmlns:android="http://schemas.android.com/apk/res/android" />

com.discord/res/layout-v22/widget_notice_popup_channel.xml

@@ -4,7 +4,7 @@
     <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_constraintTop_toTopOf="@id/popup_subtitle" app:layout_constraintWidth_min="@dimen/uikit_spacing_xxlarge" style="@style/UiKit.TextView.Subtext.Semibold.SingleLine" />
             <TextView android:id="@id/popup_subtitle" android:layout_marginLeft="4.0dip" android:lineSpacingMultiplier="1.0" android:layout_marginStart="4.0dip" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@id/popup_title" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/popup_title" style="@style/UiKit.TextView.Subtext.Semibold.SingleLine" />
             <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:textColor="?primary_200" android:ellipsize="end" android:id="@id/popup_body" android:layout_width="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_xsmall" android:maxLines="3" android:lineSpacingMultiplier="1.0" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="@id/popup_title" app:layout_constraintTop_toBottomOf="@id/popup_title" style="@style/UiKit.TextView" />
             <com.facebook.drawee.view.SimpleDraweeView android:id="@id/popup_attachment" android: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.discord/res/layout-v22/widget_payment_source_edit_dialog.xml

@@ -23,7 +23,7 @@
                 <androidx.appcompat.widget.AppCompatEditText android:hint="@string/billing_address_city" android:inputType="text" android:imeOptions="actionNext" style="@style/UiKit.TextInputLayout.EditText.Dense" />
             </com.google.android.material.textfield.TextInputLayout>
             <com.google.android.material.textfield.TextInputLayout android:id="@id/payment_source_edit_state" style="@style/UiKit.Form.Field.EditText.Wrap">
-                <androidx.appcompat.widget.AppCompatEditText android:focusableInTouchMode="false" android:hint="@string/billing_address_state" android:editable="false" android:drawableRight="@drawable/ic_chevron_right_grey_24dp" android:inputType="none" android:imeOptions="actionGo" android:drawableEnd="@drawable/ic_chevron_right_grey_24dp" style="@style/UiKit.TextInputLayout.EditText.Dense" />
+                <androidx.appcompat.widget.AppCompatEditText android:enabled="false" android:focusableInTouchMode="false" android:hint="@string/billing_address_state" android:drawableRight="@drawable/ic_chevron_right_grey_24dp" android:inputType="none" android:imeOptions="actionGo" android:drawableEnd="@drawable/ic_chevron_right_grey_24dp" style="@style/UiKit.TextInputLayout.EditText.Dense" />
             </com.google.android.material.textfield.TextInputLayout>
             <com.google.android.material.textfield.TextInputLayout android:id="@id/payment_source_edit_postal_code" style="@style/UiKit.Form.Field.EditText.Wrap">
                 <androidx.appcompat.widget.AppCompatEditText android:nextFocusRight="@id/dialog_save" android:hint="@string/billing_address_zip_code" android:inputType="text" android:imeOptions="actionDone" android:nextFocusForward="@id/dialog_save" android:autofillHints="postalCode" style="@style/UiKit.TextInputLayout.EditText.Dense" />

com.discord/res/layout/view_chip_default.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout android:paddingRight="12.0dip" android:layout_width="wrap_content" android:layout_height="@dimen/chipsview_image_size"
+<RelativeLayout android:paddingLeft="0.0dip" android:paddingRight="12.0dip" android:layout_width="wrap_content" android:layout_height="@dimen/chipsview_image_size"
   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/chip_image" android:padding="2.0dip" android:layout_width="@dimen/chipsview_image_size" android:layout_height="@dimen/chipsview_image_size" app:roundAsCircle="true" />
     <TextView android:textSize="@dimen/uikit_textsize_medium" android:gravity="center_vertical" android:id="@id/chip_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="5.0dip" android:singleLine="true" android:layout_toRightOf="@id/chip_image" android:layout_centerVertical="true" />

com.discord/res/layout/view_toolbar_title.xml

@@ -2,6 +2,6 @@
 <androidx.constraintlayout.widget.ConstraintLayout android:background="?selectableItemBackground" android:layout_width="fill_parent" android:layout_height="fill_parent"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <TextView android:id="@id/toolbar_title" android:layout_width="wrap_content" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@id/toolbar_title_subtext" app:layout_constraintEnd_toStartOf="@id/toolbar_presence" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/toolbar_presence" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.Toolbar.TextAppearance.Title" />
-    <TextView android:id="@id/toolbar_title_subtext" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toBottomOf="@id/toolbar_title" style="@style/UiKit.Toolbar.TextAppearance.Subtitle" />
+    <TextView android:id="@id/toolbar_title_subtext" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="@id/toolbar_title" app:layout_constraintStart_toStartOf="@id/toolbar_title" app:layout_constraintTop_toBottomOf="@id/toolbar_title" style="@style/UiKit.Toolbar.TextAppearance.Subtitle" />
     <com.facebook.drawee.view.SimpleDraweeView android:id="@id/toolbar_presence" android:visibility="gone" android:layout_width="10.5dip" android:layout_height="10.5dip" android:layout_marginLeft="@dimen/uikit_spacing_small" android:baselineAlignBottom="true" app:layout_constraintBaseline_toBaselineOf="@id/toolbar_title" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/toolbar_title" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/toolbar_title" app:placeholderImage="@color/status_grey_500" app:roundAsCircle="true" />
 </androidx.constraintlayout.widget.ConstraintLayout>

com.discord/res/layout/widget_add_friend_user_list_item.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout android:background="?selectableItemBackground" android:padding="@dimen/uikit_spacing_medium" android:layout_width="fill_parent" android:layout_height="wrap_content"
   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/add_friend_user_item_avatar" android:layout_marginRight="@dimen/uikit_spacing_medium" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/Avatar.Standard" />
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/add_friend_user_item_avatar" android:layout_marginRight="@dimen/uikit_spacing_medium" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/Avatar.Standard" />
     <RelativeLayout android:id="@id/add_friend_user_item_presence_wrapper" android:layout_width="@dimen/avatar_status_size_standard" android:layout_height="@dimen/avatar_status_size_standard" android:translationX="@dimen/avatar_status_size_standard_margin" android:translationY="@dimen/avatar_status_size_standard_margin" app:layout_constraintBottom_toBottomOf="@id/add_friend_user_item_avatar" app:layout_constraintRight_toRightOf="@id/add_friend_user_item_avatar">
         <com.facebook.drawee.view.SimpleDraweeView android:layout_width="fill_parent" android:layout_height="fill_parent" app:placeholderImage="?colorPrimary" app:roundAsCircle="true" />
         <com.facebook.drawee.view.SimpleDraweeView android:id="@id/add_friend_user_item_presence" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_margin="@dimen/avatar_status_size_extra_margin" android:layout_centerInParent="true" app:placeholderImage="@color/status_grey_500" app:roundAsCircle="true" />
     </RelativeLayout>
     <TextView android:id="@id/add_friend_user_item_name" android:layout_marginLeft="@dimen/uikit_spacing_medium" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toRightOf="@id/add_friend_user_item_avatar" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView" />
     <TextView android:textSize="@dimen/uikit_textsize_medium" android:id="@id/add_friend_user_item_name_secondary" android:layout_width="0.0dip" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toRightOf="@id/add_friend_user_item_name" app:layout_constraintRight_toLeftOf="@id/add_friend_user_item_send" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView.Subtext.SingleLine" />
-    <Button android:id="@id/add_friend_user_item_send" android:layout_width="wrap_content" android:minWidth="90.0dip" android:text="@string/send" app:layout_constraintRight_toRightOf="parent" style="@style/UiKit.Button.Outline" />
-    <Button android:id="@id/add_friend_user_item_accept" android:visibility="gone" android:layout_width="wrap_content" android:minWidth="90.0dip" android:text="@string/friend_request_accept" app:layout_constraintRight_toRightOf="parent" style="@style/UiKit.Button.Green.Fit.Outline" />
+    <Button android:id="@id/add_friend_user_item_send" android:layout_width="wrap_content" android:minWidth="90.0dip" android:text="@string/send" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.Button.Outline" />
+    <Button android:id="@id/add_friend_user_item_accept" android:visibility="gone" android:layout_width="wrap_content" android:minWidth="90.0dip" android:text="@string/friend_request_accept" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.Button.Green.Fit.Outline" />
     <TextView android:textColor="?primary_500" android:gravity="center" android:id="@id/add_friend_user_item_sent" android:visibility="gone" android:minWidth="90.0dip" android:text="@string/invite_friend_modal_sent" android:textAllCaps="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHorizontal_bias="1.0" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView.Semibold" />
 </androidx.constraintlayout.widget.ConstraintLayout>

com.discord/res/layout/widget_change_log.xml

@@ -14,7 +14,7 @@
             <com.discord.app.AppTextView android:id="@id/change_log_body" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:text="@string/change_log_md_body" style="@style/UiKit.TextView" />
         </LinearLayout>
     </ScrollView>
-    <LinearLayout android:background="?colorPrimaryDark" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_small" android:paddingBottom="@dimen/uikit_spacing_small" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+    <LinearLayout android:background="?colorPrimaryDark" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_small" android:paddingRight="0.0dip" android:paddingBottom="@dimen/uikit_spacing_small" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
         <androidx.appcompat.widget.AppCompatImageButton android:id="@id/change_log_twitter" android:padding="@dimen/uikit_spacing_medium" android:layout_margin="@dimen/uikit_spacing_xsmall" android:src="@drawable/ic_twitter_white_18dp" android:scaleType="fitCenter" android:tint="?primary_100" style="@style/UiKit.ImageView.Clickable" />
         <androidx.appcompat.widget.AppCompatImageButton android:id="@id/change_log_facebook" android:padding="@dimen/uikit_spacing_medium" android:layout_margin="@dimen/uikit_spacing_xsmall" android:src="@drawable/ic_facebook_white_18dp" android:scaleType="fitCenter" android:tint="?primary_100" style="@style/UiKit.ImageView.Clickable" />
         <androidx.appcompat.widget.AppCompatImageButton android:id="@id/change_log_instagram" android:padding="@dimen/uikit_spacing_medium" android:layout_margin="@dimen/uikit_spacing_xsmall" android:src="@drawable/ic_instagram_white_18dp" android:scaleType="fitCenter" android:tint="?primary_100" style="@style/UiKit.ImageView.Clickable" />

com.discord/res/layout/widget_channel_group_dm_settings.xml

@@ -7,7 +7,7 @@
     <androidx.core.widget.NestedScrollView android:id="@id/group_dm_settings_scroll_view" style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
         <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" />
+                <com.facebook.drawee.view.SimpleDraweeView android:id="@id/settings_group_icon" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="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" />
                 <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.discord/res/layout/widget_channel_notification_settings.xml

@@ -20,7 +20,7 @@
             <View style="@style/UiKit.Settings.Divider" />
             <LinearLayout android:gravity="center_vertical" android:id="@id/channel_notification_settings_system" android:background="?selectableItemBackground" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
                 <ImageView android:padding="@dimen/uikit_textsize_large" android:src="?ic_notifications_a60" android:contentDescription="@string/form_label_mobile_notifications_system_label" style="@style/UiKit.ImageView" />
-                <LinearLayout android:layout_weight="1.0" style="@style/UiKit.ViewGroup.LinearLayout">
+                <LinearLayout android:layout_width="0.0dip" android:layout_weight="1.0" style="@style/UiKit.ViewGroup.LinearLayout">
                     <TextView android:text="@string/form_label_mobile_user_notifications_label" style="@style/UiKit.Settings.Item.Label" />
                     <TextView android:text="@string/form_label_mobile_user_notifications_hint" style="@style/UiKit.Settings.Item.Addition" />
                 </LinearLayout>

com.discord/res/layout/widget_chat_input_edit_text.xml

@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.discord.widgets.chat.input.WidgetChatInputEditText android:textSize="@dimen/uikit_textsize_medium" android:textColor="?theme_chat_input_text" android:textColorHint="?theme_chat_input_text_placeholder" android:layout_gravity="center_vertical" android:background="@color/transparent" android:scrollbars="vertical" android:layout_width="fill_parent" android:minHeight="42.0dip" android:maxLines="5" android:layout_weight="1.0" android:inputType="textCapSentences|textMultiLine" android:imeOptions="flagNoExtractUi" style="@style/UiKit.TextView"
+<com.discord.widgets.chat.input.WidgetChatInputEditText android:textSize="@dimen/uikit_textsize_medium" android:textColor="?theme_chat_input_text" android:textColorHint="?theme_chat_input_text_placeholder" android:layout_gravity="center_vertical" android:background="@color/transparent" android:paddingTop="@dimen/uikit_spacing_small" android:paddingBottom="@dimen/uikit_spacing_small" android:scrollbars="vertical" android:layout_width="fill_parent" android:minHeight="42.0dip" android:maxLines="5" android:layout_weight="1.0" android:lineSpacingMultiplier="1.0" android:inputType="textCapSentences|textMultiLine" android:imeOptions="flagNoExtractUi" style="@style/UiKit.TextView"
   xmlns:android="http://schemas.android.com/apk/res/android" />

com.discord/res/layout/widget_chat_input_emoji_picker.xml

@@ -2,8 +2,7 @@
 <RelativeLayout style="@style/UiKit.ViewGroup.Page"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <include android:id="@id/emoji_search_bar" layout="@layout/layout_search_actionbar" />
-    <androidx.recyclerview.widget.RecyclerView android:id="@id/chat_input_emoji_picker_recycler" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:clipToPadding="false" android:layout_above="@id/emoji_picker_bottom_bar" android:layout_below="@id/emoji_search_bar" style="@style/UiKit.ViewGroup.RecyclerView"
-      xmlns:android="http://schemas.android.com/apk/res/android" />
+    <androidx.recyclerview.widget.RecyclerView android:id="@id/chat_input_emoji_picker_recycler" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:clipToPadding="false" android:layout_above="@id/emoji_picker_bottom_bar" android:layout_below="@id/emoji_search_bar" style="@style/UiKit.ViewGroup.RecyclerView" />
     <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.discord/res/layout/widget_chat_input_verification.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:gravity="center" android:orientation="vertical" android:id="@id/chat_input_verification" android:paddingLeft="@dimen/chat_cell_horizontal_spacing_total" android:paddingRight="@dimen/chat_cell_horizontal_spacing_total" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content"
+<LinearLayout android:gravity="center" android:id="@id/chat_input_verification" android:background="?primary_700_bg" android:paddingLeft="@dimen/chat_cell_horizontal_spacing_padding" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/chat_cell_horizontal_spacing_padding" android:paddingBottom="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_margin="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <View android:background="?theme_chat_divider" android:layout_width="fill_parent" android:layout_height="0.25dip" />
-    <TextView android:textSize="13.75sp" android:textColor="?theme_chat_text" android:gravity="center" android:id="@id/chat_input_verification_text" android:paddingTop="@dimen/chat_cell_horizontal_spacing_total" android:paddingBottom="@dimen/chat_cell_horizontal_spacing_total" android:layout_width="fill_parent" style="@style/UiKit.TextView.Semibold" />
-    <TextView android:textSize="13.75sp" android:textColor="@color/white" android:gravity="center" android:id="@id/chat_input_verification_action" android:background="@drawable/drawable_button_purple" android:paddingTop="10.0dip" android:paddingBottom="10.0dip" android:layout_width="fill_parent" android:layout_marginBottom="15.0dip" android:text="@string/resend_verification_email" style="@style/UiKit.TextView.Semibold" />
+    <TextView android:textColor="?theme_chat_text" android:gravity="center" android:id="@id/chat_input_verification_text" android:paddingTop="@dimen/chat_cell_vertical_spacing_padding" android:paddingBottom="@dimen/chat_cell_vertical_spacing_padding" android:layout_width="fill_parent" style="@style/UiKit.TextView.Semibold" />
+    <TextView android:id="@id/chat_input_verification_action" android:text="@string/resend_verification_email" style="@style/UiKit.Button" />
 </LinearLayout>

com.discord/res/layout/widget_chat_list_actions.xml

@@ -13,7 +13,7 @@
         <View style="@style/UiKit.Settings.Divider" />
         <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" />
         <LinearLayout android:gravity="center_vertical" android:id="@id/dialog_chat_actions_add_reaction" android:background="?selectableItemBackground" android:paddingRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-            <TextView android:background="@color/transparent" android:clickable="false" android:text="@string/add_reaction" android:drawableLeft="?ic_add_reaction" android:layout_weight="1.0" android:drawableStart="?ic_add_reaction" style="@style/UiKit.Settings.Item.Icon" />
+            <TextView android:background="@color/transparent" android:clickable="false" android:layout_width="0.0dip" android:text="@string/add_reaction" android:drawableLeft="?ic_add_reaction" android:layout_weight="1.0" android:drawableStart="?ic_add_reaction" style="@style/UiKit.Settings.Item.Icon" />
             <androidx.recyclerview.widget.RecyclerView android:layout_gravity="center_vertical" android:id="@id/dialog_chat_actions_add_reaction_emojis_list" android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.RecyclerView.Horizontal" />
         </LinearLayout>
         <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" />

com.discord/res/layout/widget_chat_list_adapter_item_game_invite.xml

@@ -5,5 +5,5 @@
     <TextView android:id="@id/item_game_invite_header" style="@style/UiKit.Chat.Embed.Header" />
     <TextView android:textSize="18.0sp" android:textColor="?primary_100" android:id="@id/item_game_invite_status" android:layout_marginTop="@dimen/uikit_spacing_medium" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toLeftOf="@id/item_game_invite_header" app:layout_constraintStart_toStartOf="@id/item_game_invite_header" app:layout_constraintTop_toBottomOf="@id/item_game_invite_header" style="@style/UiKit.TextView" />
     <androidx.recyclerview.widget.RecyclerView android:id="@id/item_game_invite_recycler" android:layout_width="0.0dip" android:layout_height="@dimen/avatar_size_standard" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/item_game_invite_cover_image" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/item_game_invite_cover_image" app:layout_constraintStart_toStartOf="parent" style="@style/UiKit.ViewGroup.RecyclerView.Horizontal" />
-    <TextView android:gravity="end" android:id="@id/item_game_invite_application_name" android:layout_width="0.0dip" android:layout_height="wrap_content" android:maxLines="2" app:layout_constraintLeft_toLeftOf="@id/item_game_invite_cover_image" app:layout_constraintStart_toStartOf="@id/item_game_invite_cover_image" style="@style/UiKit.Chat.Embed.Footer" />
+    <TextView android:gravity="end" android:id="@id/item_game_invite_application_name" android:layout_width="0.0dip" android:layout_height="wrap_content" android:maxLines="2" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="@id/item_game_invite_cover_image" app:layout_constraintStart_toStartOf="@id/item_game_invite_cover_image" style="@style/UiKit.Chat.Embed.Footer" />
 </androidx.constraintlayout.widget.ConstraintLayout>

com.discord/res/layout/widget_chat_list_adapter_item_text.xml

@@ -2,10 +2,10 @@
 <androidx.constraintlayout.widget.ConstraintLayout android:background="?selectableItemBackground" android:paddingTop="10.0dip" android:paddingRight="@dimen/chat_cell_horizontal_spacing_padding" android:layout_width="fill_parent" android:layout_height="wrap_content"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <androidx.constraintlayout.widget.Guideline android:id="@id/uikit_chat_guideline" style="@style/UiKit.Chat.Guideline" />
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/chat_list_adapter_item_text_avatar" android:layout_marginLeft="8.0dip" android:layout_marginTop="@dimen/uikit_spacing_small" android:importantForAccessibility="no" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="@id/uikit_chat_guideline" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/uikit_chat_guideline" app:layout_constraintStart_toStartOf="parent" style="@style/Avatar.Chat" />
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/chat_list_adapter_item_text_avatar" android:layout_marginLeft="8.0dip" android:importantForAccessibility="no" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="@id/uikit_chat_guideline" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/uikit_chat_guideline" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/chat_list_adapter_item_text_header" style="@style/Avatar.Chat" />
     <androidx.constraintlayout.widget.ConstraintLayout android:id="@id/chat_list_adapter_item_text_header" android:layout_width="wrap_content" android:layout_height="0.0dip" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toRightOf="@id/uikit_chat_guideline" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/uikit_chat_guideline" app:layout_constraintTop_toTopOf="@id/chat_list_adapter_item_text_avatar">
         <TextView android:textColor="?theme_chat_name" android:id="@id/chat_list_adapter_item_text_name" android:lineSpacingMultiplier="1.0" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@id/chat_list_adapter_item_text_bot" app:layout_constraintEnd_toStartOf="@id/chat_list_adapter_item_text_bot" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintStart_toStartOf="parent" style="@style/UiKit.TextView.Large.SingleLine" />
-        <TextView android:textSize="9.5sp" android:textColor="@color/white" android:id="@id/chat_list_adapter_item_text_bot" android:background="@drawable/drawable_button_purple_neutral" android:paddingLeft="3.0dip" android:paddingTop="0.5dip" android:paddingRight="3.0dip" android:paddingBottom="0.5dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="6.0dip" android:layout_marginBottom="1.0dip" android:text="BOT" android:singleLine="true" app:layout_constraintEnd_toStartOf="@id/chat_list_adapter_item_text_timestamp" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_text_name" style="@style/UiKit.TextView" />
+        <TextView android:textSize="9.5sp" android:textColor="@color/white" android:id="@id/chat_list_adapter_item_text_bot" android:background="@drawable/drawable_button_purple_neutral" android:paddingLeft="3.0dip" android:paddingTop="0.5dip" android:paddingRight="3.0dip" android:paddingBottom="0.5dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="6.0dip" android:layout_marginBottom="1.0dip" android:text="BOT" android:singleLine="true" app:layout_constraintBottom_toBottomOf="@id/chat_list_adapter_item_text_name" app:layout_constraintEnd_toStartOf="@id/chat_list_adapter_item_text_timestamp" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_text_name" style="@style/UiKit.TextView" />
         <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?theme_chat_timestamp" android:gravity="center_vertical" android:id="@id/chat_list_adapter_item_text_timestamp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="6.0dip" android:layout_marginBottom="1.0dip" android:maxWidth="150.0dip" android:singleLine="true" app:layout_constraintBaseline_toBaselineOf="@id/chat_list_adapter_item_text_name" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_text_bot" style="@style/UiKit.TextView" />
     </androidx.constraintlayout.widget.ConstraintLayout>
     <com.discord.utilities.view.text.LinkifiedTextView android:id="@id/chat_list_adapter_item_text" android:layout_width="0.0dip" android:layout_marginTop="@dimen/uikit_spacing_xsmall" android:layout_marginRight="@dimen/uikit_spacing_small" android:layout_marginBottom="2.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/uikit_chat_guideline" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/uikit_chat_guideline" app:layout_constraintTop_toBottomOf="@id/chat_list_adapter_item_text_header" style="@style/UiKit.Chat.Text" />

com.discord/res/layout/widget_debugging_adapter_item.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <TextView android:ellipsize="end" android:id="@id/debugging_item_log_message" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:maxLines="2" style="@style/UiKit.TextView"
-      xmlns:android="http://schemas.android.com/apk/res/android" />
+    <TextView android:ellipsize="end" android:id="@id/debugging_item_log_message" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:maxLines="2" style="@style/UiKit.TextView" />
     <View style="@style/UiKit.Settings.Divider" />
 </LinearLayout>

com.discord/res/layout/widget_fatal_crash.xml

@@ -3,8 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android">
     <LinearLayout android:orientation="vertical" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout">
         <ImageView android:layout_gravity="center_horizontal" android:layout_marginBottom="8.0dip" android:src="?img_wumpus_tophat" style="@style/UiKit.ImageView" />
-        <LinearLayout android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout"
-          xmlns:android="http://schemas.android.com/apk/res/android">
+        <LinearLayout android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout">
             <TextView android:layout_marginBottom="8.0dip" android:text="@string/crash_unexpected" style="@style/UiKit.TextView.H2" />
             <com.discord.utilities.view.text.LinkifiedTextView android:autoLink="web" android:id="@id/fatal_crash_testers_invite" android:layout_marginBottom="8.0dip" android:text="@string/crash_testers_invite" style="@style/UiKit.TextView" />
             <TextView android:text="@string/crash_disclaimer" style="@style/UiKit.TextView" />

com.discord/res/layout/widget_friends_list_adapter_item_empty.xml

@@ -4,7 +4,7 @@
     <LinearLayout android:gravity="center" android:layout_gravity="center" android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="16.0dip" android:layout_marginBottom="16.0dip">
         <ImageView android:id="@id/friends_list_item_empty_no_friends" android:layout_width="320.0dip" android:layout_height="0.0dip" android:src="?theme_friends_no_friends" android:scaleType="fitCenter" android:adjustViewBounds="true" android:layout_weight="1.0" android:contentDescription="@string/sample_empty_string" />
         <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?theme_chat_text" android:gravity="center" android:layout_width="320.0dip" android:layout_marginTop="16.0dip" android:layout_marginBottom="16.0dip" android:text="@string/friends_empty_state_all" style="@style/UiKit.TextView.Semibold" />
-        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/white" android:gravity="center" android:id="@id/friends_list_item_empty_invite" android:background="@drawable/drawable_button_purple" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:layout_height="36.0dip" android:text="@string/tip_instant_invite_title" android:singleLine="true" style="@style/UiKit.TextView" />
+        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/white" android:gravity="center" android:id="@id/friends_list_item_empty_invite" android:background="@drawable/drawable_button_purple" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:layout_height="36.0dip" android:text="@string/tip_instant_invite_title3" android:singleLine="true" style="@style/UiKit.TextView" />
     </LinearLayout>
     <LinearLayout android:gravity="center" android:layout_gravity="center" android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="16.0dip" android:layout_marginBottom="16.0dip">
         <ImageView android:id="@id/friends_list_item_empty_no_online" android:layout_width="320.0dip" android:layout_height="0.0dip" android:src="?theme_friends_no_online" android:scaleType="fitCenter" android:adjustViewBounds="true" android:layout_weight="1.0" android:contentDescription="@string/sample_empty_string" />

com.discord/res/layout/widget_guild_invite_share_item.xml

@@ -2,7 +2,7 @@
 <LinearLayout android:gravity="center_vertical" android:background="?selectableItemBackground" 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/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:textSize="@dimen/uikit_textsize_large" android:id="@id/item_name_tv" android:layout_width="0.0dip" 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" />
 </LinearLayout>

com.discord/res/layout/widget_guild_transfer_ownership.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout style="@style/UiKit.ViewGroup.Page.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <TextView android:id="@id/guild_transfer_ownership_header" android:padding="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:text="@string/transfer_ownership" style="@style/UiKit.TextView.H1.Bold" />
+    <TextView android:padding="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:text="@string/transfer_ownership" style="@style/UiKit.TextView.H1.Bold" />
     <View style="@style/UiKit.Divider" />
     <LinearLayout android:id="@id/guild_transfer_ownership_mfa_wrap" style="@style/UiKit.ViewGroup.LinearLayout">
         <TextView android:text="@string/two_fa_enter_token_label" android:textAllCaps="true" style="@style/UiKit.Settings.Item.Label" />

com.discord/res/layout/widget_main.xml

@@ -4,7 +4,7 @@
     <com.discord.widgets.main.WidgetMainDrawerLayout android:id="@id/main_drawer" android:fitsSystemWindows="true" android:layout_width="fill_parent" android:layout_height="fill_parent">
         <include layout="@layout/widget_main_panel_loading" />
         <include layout="@layout/widget_main_panel_center" />
-        <include layout="@layout/widget_main_panel_left" />
+        <include android:id="@id/main_panel_left" layout="@layout/widget_main_panel_left" />
         <include layout="@layout/widget_main_panel_right" />
     </com.discord.widgets.main.WidgetMainDrawerLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

com.discord/res/layout/widget_main_panel_center_content.xml

@@ -2,7 +2,7 @@
 <merge android:clipChildren="false" android:layout_width="fill_parent" android:layout_height="fill_parent"
   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">
-        <androidx.appcompat.widget.Toolbar style="@style/AppTheme.Toolbar" />
+        <androidx.appcompat.widget.Toolbar app:contentInsetStartWithNavigation="0.0dip" style="@style/AppTheme.Toolbar" />
         <com.google.android.material.tabs.TabLayout android:id="@id/action_bar_tabs" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" app:tabIndicatorColor="?tabSelectedTextColor" app:tabMode="scrollable" app:tabSelectedTextColor="?tabSelectedTextColor" app:tabTextAppearance="@style/App.TabLayout.Text" app:tabTextColor="?tabTextColor" />
     </com.google.android.material.appbar.AppBarLayout>
     <include layout="@layout/widget_main_panel_center_content_unread" />

com.discord/res/layout/widget_music_rich_presence.xml

@@ -14,8 +14,8 @@
         <TextView android:id="@id/rich_presence_time" style="@style/UiKit.TextView.Marquee" />
         <com.miguelgaeta.super_bar.SuperBar android:id="@id/rich_presence_superbar" android:focusable="false" android:clickable="false" android:layout_height="@dimen/uikit_spacing_large" app:sb_barBackgroundColor="?primary_700" app:sb_barColor="?primary_100" app:sb_barControlColor="@color/transparent" app:sb_barControlRadius="6.0dip" app:sb_barControlShadowRadius="0.0dip" app:sb_barHeight="6.0dip" app:sb_barTouchEnabled="false" app:sb_barValueMax="100.0" style="@style/UiKit.SuperBar" />
         <androidx.constraintlayout.widget.ConstraintLayout style="@style/UiKit.ViewGroup">
-            <TextView android:id="@id/rich_presence_music_elapsed" android:layout_width="0.0dip" app:layout_constraintWidth_percent="50.0" style="@style/UiKit.TextView" />
-            <TextView android:id="@id/rich_presence_music_duration" android:layout_width="0.0dip" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintWidth_percent="50.0" style="@style/UiKit.TextView" />
+            <TextView android:id="@id/rich_presence_music_elapsed" android:layout_width="0.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintWidth_percent="50.0" style="@style/UiKit.TextView" />
+            <TextView android:id="@id/rich_presence_music_duration" android:layout_width="0.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintWidth_percent="50.0" style="@style/UiKit.TextView" />
         </androidx.constraintlayout.widget.ConstraintLayout>
     </LinearLayout>
     <FrameLayout android:id="@id/rich_presence_play_button" android:background="@color/rich_presence_spotify_play_button" android:paddingTop="10.0dip" android:paddingBottom="10.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" 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_large" android:foreground="?selectableItemBackground" app:layout_constraintTop_toBottomOf="@id/rich_presence_container_data">

com.discord/res/layout/widget_notice_popup_channel.xml

@@ -4,7 +4,7 @@
     <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_constraintTop_toTopOf="@id/popup_subtitle" app:layout_constraintWidth_min="@dimen/uikit_spacing_xxlarge" style="@style/UiKit.TextView.Subtext.Semibold.SingleLine" />
             <TextView android:id="@id/popup_subtitle" android:layout_marginLeft="4.0dip" android:lineSpacingMultiplier="1.0" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@id/popup_title" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/popup_title" style="@style/UiKit.TextView.Subtext.Semibold.SingleLine" />
             <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:textColor="?primary_200" android:ellipsize="end" android:id="@id/popup_body" android:layout_width="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_xsmall" android:maxLines="3" android:lineSpacingMultiplier="1.0" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="@id/popup_title" app:layout_constraintTop_toBottomOf="@id/popup_title" style="@style/UiKit.TextView" />
             <com.facebook.drawee.view.SimpleDraweeView android:id="@id/popup_attachment" android: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.discord/res/layout/widget_payment_source_edit_dialog.xml

@@ -23,7 +23,7 @@
                 <androidx.appcompat.widget.AppCompatEditText android:hint="@string/billing_address_city" android:inputType="text" android:imeOptions="actionNext" style="@style/UiKit.TextInputLayout.EditText.Dense" />
             </com.google.android.material.textfield.TextInputLayout>
             <com.google.android.material.textfield.TextInputLayout android:id="@id/payment_source_edit_state" style="@style/UiKit.Form.Field.EditText.Wrap">
-                <androidx.appcompat.widget.AppCompatEditText android:focusableInTouchMode="false" android:hint="@string/billing_address_state" android:editable="false" android:drawableRight="@drawable/ic_chevron_right_grey_24dp" android:inputType="none" android:imeOptions="actionGo" android:drawableEnd="@drawable/ic_chevron_right_grey_24dp" style="@style/UiKit.TextInputLayout.EditText.Dense" />
+                <androidx.appcompat.widget.AppCompatEditText android:enabled="false" android:focusableInTouchMode="false" android:hint="@string/billing_address_state" android:drawableRight="@drawable/ic_chevron_right_grey_24dp" android:inputType="none" android:imeOptions="actionGo" android:drawableEnd="@drawable/ic_chevron_right_grey_24dp" style="@style/UiKit.TextInputLayout.EditText.Dense" />
             </com.google.android.material.textfield.TextInputLayout>
             <com.google.android.material.textfield.TextInputLayout android:id="@id/payment_source_edit_postal_code" style="@style/UiKit.Form.Field.EditText.Wrap">
                 <androidx.appcompat.widget.AppCompatEditText android:nextFocusRight="@id/dialog_save" android:hint="@string/billing_address_zip_code" android:inputType="text" android:imeOptions="actionDone" android:nextFocusForward="@id/dialog_save" style="@style/UiKit.TextInputLayout.EditText.Dense" />

com.discord/res/layout/widget_private_call.xml

@@ -12,7 +12,7 @@
         </LinearLayout>
         <androidx.recyclerview.widget.RecyclerView android:id="@id/private_call_participant_list" android:background="?colorPrimary" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_marginTop="?actionBarSize" />
         <com.discord.views.video.VideoCallParticipantView android:id="@id/private_call_pip_participant" android:layout_width="140.0dip" android:layout_height="79.0dip" android:layout_margin="16.0dip" android:layout_marginTop="32.0dip" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toBottomOf="@id/action_bar_toolbar_layout" app:vcpv_is_overlay="true" app:vcpv_match_video_orientation="true" />
-        <com.google.android.material.appbar.AppBarLayout android:id="@id/action_bar_toolbar_layout" android:layout_width="fill_parent" android:layout_height="?actionBarSize" style="@style/AppTheme.AppBarLayout.Flat">
+        <com.google.android.material.appbar.AppBarLayout android:id="@id/action_bar_toolbar_layout" android:layout_width="fill_parent" android:layout_height="?actionBarSize" app:layout_constraintTop_toTopOf="parent" style="@style/AppTheme.AppBarLayout.Flat">
             <androidx.appcompat.widget.Toolbar style="@style/AppTheme.Toolbar.Transparent" />
         </com.google.android.material.appbar.AppBarLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>

com.discord/res/layout/widget_search.xml

@@ -3,10 +3,8 @@
   xmlns:android="http://schemas.android.com/apk/res/android">
     <include layout="@layout/layout_search_actionbar" />
     <FrameLayout style="@style/AppTheme.AppBarScrollingViewBehavior">
-        <fragment android:name="com.discord.widgets.search.suggestions.WidgetSearchSuggestions" android:id="@id/widget_search_suggestions" android:layout_width="fill_parent" android:layout_height="fill_parent"
-          xmlns:android="http://schemas.android.com/apk/res/android" />
-        <fragment android:name="com.discord.widgets.search.results.WidgetSearchResults" android:id="@id/widget_search_results" android:layout_width="fill_parent" android:layout_height="fill_parent"
-          xmlns:android="http://schemas.android.com/apk/res/android" />
+        <fragment android:name="com.discord.widgets.search.suggestions.WidgetSearchSuggestions" android:id="@id/widget_search_suggestions" android:layout_width="fill_parent" android:layout_height="fill_parent" />
+        <fragment android:name="com.discord.widgets.search.results.WidgetSearchResults" android:id="@id/widget_search_results" android:layout_width="fill_parent" android:layout_height="fill_parent" />
     </FrameLayout>
     <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/search_send_query_fab" android:visibility="gone" android:src="@drawable/ic_search_white_24dp" style="@style/Settings.FloatingActionButton" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

com.discord/res/layout/widget_server_settings_edit_member.xml

@@ -7,7 +7,7 @@
     <androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
         <LinearLayout android:focusable="true" android:focusableInTouchMode="true" android:descendantFocusability="beforeDescendants" style="@style/UiKit.ViewGroup.LinearLayout">
             <TextView android:text="@string/nickname" style="@style/UiKit.Settings.Item.Header" />
-            <LinearLayout android:id="@id/edit_member_nickname_container" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+            <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
                 <EditText android:id="@id/edit_member_nickname" android:layout_width="0.0dip" android:hint="@string/change_nickname" android:singleLine="true" android:maxLength="32" android:layout_weight="1.0" android:inputType="textNoSuggestions" style="@style/UiKit.EditText.Themed" />
                 <ImageView android:layout_gravity="center_vertical" android:id="@id/edit_member_nickname_lock" android:layout_marginRight="10.0dip" android:src="@drawable/ic_role_lock" style="@style/UiKit.ImageView" />
             </LinearLayout>

com.discord/res/layout/widget_server_settings_emojis_item.xml

@@ -2,8 +2,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:actualImageScaleType="fitCenter" 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" />
+    <TextView android:id="@id/server_settings_emojis_name" android:layout_width="0.0dip" 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="end" 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_overview.xml

@@ -7,7 +7,7 @@
     <ScrollView android:id="@id/server_settings_overview_scroll" style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
         <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" />
+                <com.facebook.drawee.view.SimpleDraweeView android:id="@id/server_settings_overview_icon" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="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" />
                 <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" />
@@ -37,6 +37,28 @@
             <TextView android:text="@string/form_help_default_notification_settings_mobile" style="@style/UiKit.Settings.Item.SubText" />
             <com.discord.views.CheckedSetting android:id="@id/server_settings_overview_notification_all" app:cs_text="@string/form_label_all_messages" app:cs_view_type="radio" style="@style/UiKit.CheckedSetting.Themed" />
             <com.discord.views.CheckedSetting android:id="@id/server_settings_overview_notification_only_mentions" app:cs_text="@string/form_label_only_mentions" app:cs_view_type="radio" style="@style/UiKit.CheckedSetting.Themed" />
+            <LinearLayout android:id="@id/server_settings_overview_upload_splash_section" style="@style/UiKit.ViewGroup.LinearLayout">
+                <View style="@style/UiKit.Settings.Divider" />
+                <TextView android:text="@string/guild_settings_server_invite_background" style="@style/UiKit.Settings.Item.Header" />
+                <FrameLayout android:id="@id/server_settings_overview_upload_splash_container" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:foreground="?selectableItemBackground">
+                    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/server_settings_overview_upload_splash" android:layout_width="fill_parent" android:layout_height="wrap_content" app:placeholderImage="@drawable/drawable_nitro_classic_gradient_horizontal" app:roundedCornerRadius="3.0dip" app:viewAspectRatio="1.78" />
+                    <com.google.android.material.floatingactionbutton.FloatingActionButton android:focusable="false" android:clickable="false" android:src="@drawable/ic_upload_image_40dp" android:scaleType="centerCrop" android:contentDescription="@string/sample_empty_string" app:backgroundTint="@color/white" app:fabCustomSize="@dimen/uikit_spacing_xxlarge" app:maxImageSize="@dimen/uikit_spacing_xxlarge" style="@style/Settings.FloatingActionButton" />
+                </FrameLayout>
+                <TextView android:textColor="@color/brand_500" android:id="@id/server_settings_overview_upload_splash_remove" android:background="?selectableItemBackground" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="wrap_content" android:text="@string/remove" style="@style/UiKit.TextView.Subtext.Semibold" />
+                <TextView android:paddingBottom="@dimen/uikit_spacing_small" android:text="@string/guild_settings_splash_info" style="@style/UiKit.Settings.Item.SubText" />
+                <TextView android:id="@id/server_settings_overview_upload_splash_learn_more" android:paddingTop="@dimen/uikit_spacing_small" android:text="@string/guild_settings_splash_recommend" style="@style/UiKit.Settings.Item.SubText" />
+            </LinearLayout>
+            <LinearLayout android:id="@id/server_settings_overview_upload_banner_section" style="@style/UiKit.ViewGroup.LinearLayout">
+                <View style="@style/UiKit.Settings.Divider" />
+                <TextView android:text="@string/guild_settings_server_banner" style="@style/UiKit.Settings.Item.Header" />
+                <FrameLayout android:id="@id/server_settings_overview_upload_banner_container" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:foreground="?selectableItemBackground">
+                    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/server_settings_overview_upload_banner" android:layout_width="fill_parent" android:layout_height="wrap_content" app:placeholderImage="@drawable/drawable_nitro_classic_gradient_horizontal" app:roundedCornerRadius="3.0dip" app:viewAspectRatio="1.78" />
+                    <com.google.android.material.floatingactionbutton.FloatingActionButton android:focusable="false" android:clickable="false" android:src="@drawable/ic_upload_image_40dp" android:scaleType="centerCrop" android:contentDescription="@string/sample_empty_string" app:backgroundTint="@color/white" app:fabCustomSize="@dimen/uikit_spacing_xxlarge" app:maxImageSize="@dimen/uikit_spacing_xxlarge" style="@style/Settings.FloatingActionButton" />
+                </FrameLayout>
+                <TextView android:textColor="@color/brand_500" android:id="@id/server_settings_overview_upload_banner_remove" android:background="?selectableItemBackground" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="wrap_content" android:text="@string/remove" style="@style/UiKit.TextView.Subtext.Semibold" />
+                <TextView android:paddingBottom="@dimen/uikit_spacing_small" android:text="@string/form_help_server_banner" style="@style/UiKit.Settings.Item.SubText" />
+                <TextView android:id="@id/server_settings_overview_upload_banner_learn_more" android:paddingBottom="@dimen/uikit_spacing_small" android:text="@string/guild_settings_banner_recommend" style="@style/UiKit.Settings.Item.SubText" />
+            </LinearLayout>
             <View android:layout_width="fill_parent" android:layout_height="64.0dip" />
         </LinearLayout>
     </ScrollView>

com.discord/res/layout/widget_settings_appearance.xml

@@ -14,7 +14,7 @@
             <TextView android:text="@string/sync" style="@style/UiKit.Settings.Item.Header" />
             <com.discord.views.CheckedSetting android:id="@id/settings_appearance_sync_switch" app:cs_text="@string/settings_sync" app:cs_view_type="switchview" style="@style/UiKit.CheckedSetting.Themed" />
             <View style="@style/UiKit.Settings.Divider" />
-            <LinearLayout android:id="@id/settings_appearance_font_scaling_container" android:visibility="gone" style="@style/UiKit.ViewGroup.LinearLayout">
+            <LinearLayout android:id="@id/settings_appearance_font_scaling_container" style="@style/UiKit.ViewGroup.LinearLayout">
                 <TextView android:text="@string/accessibility_font_scaling_label" style="@style/UiKit.Settings.Item.Header" />
                 <TextView android:id="@id/settings_appearance_font_scale_platform" style="@style/UiKit.Settings.Item.SubText" />
                 <RelativeLayout style="@style/UiKit.Settings.Item">

com.discord/res/layout/widget_settings_item_connected_account.xml

@@ -6,8 +6,8 @@
         <ImageView android:id="@id/connected_account_img" android:layout_width="@dimen/connected_account_img_size" android:layout_height="@dimen/connected_account_img_size" android:layout_margin="@dimen/uikit_spacing_large" android:contentDescription="@string/connected_accounts" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ImageView" />
         <TextView android:textColor="@color/white" android:id="@id/connected_account_name" android:layout_width="0.0dip" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" app:layout_constraintBottom_toBottomOf="@id/connected_account_img" app:layout_constraintLeft_toRightOf="@id/connected_account_img" app:layout_constraintRight_toLeftOf="@id/connected_account_disconnect" app:layout_constraintTop_toTopOf="@id/connected_account_img" style="@style/UiKit.TextView.Large.SingleLine" />
         <ImageView android:id="@id/connected_account_disconnect" android:padding="@dimen/uikit_spacing_small" android:layout_marginRight="@dimen/uikit_spacing_large" android:src="@drawable/ic_close_white_24dp" android:contentDescription="@string/disconnect_account" app:layout_constraintBottom_toBottomOf="@id/connected_account_img" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@id/connected_account_img" style="@style/UiKit.ImageView.Clickable" />
-        <View android:id="@id/connected_account_divider" android:layout_height="0.5dip" android:layout_marginTop="@dimen/uikit_spacing_large" app:layout_constraintTop_toBottomOf="@id/connected_account_img" style="@style/UiKit.Divider" />
-        <LinearLayout android:paddingTop="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_medium" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toBottomOf="@id/connected_account_divider" style="@style/UiKit.ViewGroup.LinearLayout">
+        <View android:id="@id/connected_account_divider" android:layout_height="0.5dip" android:layout_marginTop="@dimen/uikit_spacing_large" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/connected_account_img" style="@style/UiKit.Divider" />
+        <LinearLayout android:paddingTop="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_medium" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/connected_account_divider" style="@style/UiKit.ViewGroup.LinearLayout">
             <androidx.appcompat.widget.SwitchCompat android:id="@id/connected_account_display_switch" android:text="@string/display_on_profile" style="@style/Connections.Switch" />
             <androidx.appcompat.widget.SwitchCompat android:id="@id/connected_account_display_activity_switch" android:text="@string/display_activity" style="@style/Connections.Switch" />
             <androidx.appcompat.widget.SwitchCompat android:id="@id/connected_account_sync_friends_switch" android:text="@string/sync_friends" style="@style/Connections.Switch" />

com.discord/res/layout/widget_settings_payment_methods.xml

@@ -12,8 +12,7 @@
             <ImageView android:id="@id/payment_methods_empty_image" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/img_item_shop_dark" android:importantForAccessibility="no" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@id/payment_methods_empty_title" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" />
             <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/primary_100" android:id="@id/payment_methods_empty_title" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:text="@string/billing_no_payment_method" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@id/payment_methods_empty_subtext" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/payment_methods_empty_image" style="@style/UiKit.TextView" />
             <TextView android:textColor="@color/primary_400" android:id="@id/payment_methods_empty_subtext" android:layout_marginTop="@dimen/uikit_spacing_small" android:text="@string/billing_no_payment_method_description" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@id/payment_methods_empty_add" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/payment_methods_empty_title" style="@style/UiKit.TextView" />
-            <Button android:id="@id/payment_methods_empty_add" android:layout_width="wrap_content" 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:text="@string/billing_add_payment_method" app:layout_constrainedHeight="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/payment_methods_empty_subtext" style="@style/UiKit.Button"
-              xmlns:android="http://schemas.android.com/apk/res/android" />
+            <Button android:id="@id/payment_methods_empty_add" android:layout_width="wrap_content" 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:text="@string/billing_add_payment_method" app:layout_constrainedHeight="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/payment_methods_empty_subtext" style="@style/UiKit.Button" />
         </androidx.constraintlayout.widget.ConstraintLayout>
     </com.discord.app.AppViewFlipper>
 </FrameLayout>

com.discord/res/layout/widget_user_info_adapter_item_connected_account.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout android:background="?selectableItemBackground" android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.ConstraintLayout"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <ImageView android:layout_gravity="center_vertical" android:id="@id/connected_account_img" android:layout_width="@dimen/connected_account_img_size" android:layout_height="@dimen/connected_account_img_size" android:contentDescription="@string/sample_empty_string" style="@style/UiKit.ImageView" />
+    <ImageView android:layout_gravity="center_vertical" android:id="@id/connected_account_img" android:layout_width="@dimen/connected_account_img_size" android:layout_height="@dimen/connected_account_img_size" android:contentDescription="@string/sample_empty_string" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ImageView" />
     <TextView android:id="@id/connected_account_name" android:layout_width="0.0dip" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:singleLine="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toRightOf="@id/connected_account_img" app:layout_constraintRight_toLeftOf="@id/connected_account_link_img" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView.Large" />
     <ImageView android:id="@id/connected_account_link_img" android:src="?ic_open_in_new_24dp" android:contentDescription="@string/open_link" android:alpha="0.6" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ImageView" />
 </androidx.constraintlayout.widget.ConstraintLayout>

com.discord/res/values-bg/strings.xml

@@ -1417,47 +1417,6 @@
     <string name="theme_light">Светла</string>
     <string name="theme_updated">Темата беше актуализирана.</string>
     <string name="this_server">Този Сървър</string>
-    <string name="tip_create_first_server_body">"Натиснете плюсчето, за да създадете свой сървър.
-
-Всеки сървър Ви позволява да имате уникално място за различни групи от хора. Може да изтриете сървъра също, ако вече нямате нужда от него, а най-доброто от всички неща е, че сървърите са безплатни и може да създавате колкото си пожелаете."</string>
-    <string name="tip_create_first_server_title">Създайте свой собствен сървър</string>
-    <string name="tip_create_more_servers_body">"Натиснете плюсчето, за да създадете нов сървър.
-
-Тъй като сървърите са безплатни, Вие може да създадете колкото поискате. Всеки сървър Ви позволява да имате уникално място за различни групи от хора. Също може да изтриете сървъра, ако вече нямате нужда от него."</string>
-    <string name="tip_create_more_servers_title">Сървъри навсякъде!</string>
-    <string name="tip_direct_messages_body">"Намерете приятелите си измежду всички сървъри, в които се намирате.
-
-Може да комуникирате помежду си чрез избиране на приятел! Директните съобщения са перфектни за бързо достигане до хора чрез известията, дори и когато те са AFK."</string>
-    <string name="tip_direct_messages_title">Започнете личен разговор</string>
-    <string name="tip_friends_list_body">"Натиснете тук, за да видите директните си съобщения, както и статусът на всеки от сървърите, в които се намирате.
-
-Когато получите съобщение, то ще се появи под Вашия аватар за по-лесен достъп."</string>
-    <string name="tip_friends_list_title">Вижте приятелите си</string>
-    <string name="tip_instant_invite_body">"Минете с мишката върху някой чат или гласов канал, за да се покаже бутона за споделяне. Използвайте генерираната връзка, за да поканите хора директно в избраният канал.
-
-Допълнителните настройки Ви позволяват да задавате ограничения за използване, като например колко хора могат да се присъединят с тази връзка, колко време трае тя или дори да направите връзката по-приятна за четене и по-лесно споделяне в клиенти, в които не може да се клика върху връзка."</string>
-    <string name="tip_instant_invite_title">Поканете приятелите си</string>
-    <string name="tip_organize_by_topic_body">"**Чат канали** ви позволяват да отделяте вашите чат разговори по тема. Вие можете да сменяте канали лесно и дори да **@споменете** приятели и те да получат известие на техния компютър или телефон.
-
-Гласовите канали ви позволяват да отделяте разговорите във големи или малки групи, както желаете.
-Кликнете на канал за да влезете в разговора. Ще останете в този Гласов канал дори и ако превключите между Чат канали!"</string>
-    <string name="tip_organize_by_topic_title">Организиране по канали</string>
-    <string name="tip_server_settings_body">"Натиснете тук, за да достъпите настройките на сървъра си.
-
-Може да промените всичко, като например правомощията и ролите, да изберете регион за гласовите канали, да настроите AFK канала, да управлявате поканите, да ограничавате достъпа на потребители или дори да изтриете целия сървър."</string>
-    <string name="tip_server_settings_title">Контрол над Вашия сървър</string>
-    <string name="tip_voice_conversations_body">"Това е Вашият **панел за контрол на звука и микрофона**.
-
-Използвайте тези бутони, за да заглушите микрофона си, да заглушите звука в целия гласов канал или да настроите приложението. Може да промените режима за говорене от **гласова активност на Push-to-Talk (говорене с бутон)** от настройките."</string>
-    <string name="tip_voice_conversations_title">Използвайте гласа си</string>
-    <string name="tip_whos_online_body">"Този списък показва кой се намира в текущия избран канал.
-
-Всеки, който използва десктоп приложението, може да покаже коя игра играе в момента. Чрез натискане върху името на потребител, ще се покажат **индивидуалните настройки** за него, като чувствителност на звука или администраторски действия."</string>
-    <string name="tip_whos_online_title">Какво играете?</string>
-    <string name="tip_writing_messages_body">"Това е мястото, където може да споделите своето мнение и идеи.
-
-За да бъде по-яко сме включили поддръжката на Markdown синтаксиса, така че можете да **удебелите нещо** или да **подчертаете нещо**. Също може и да **плъзнете** изображения или файлове точно тук за бързото им споделяне. Поддържаме и GIF-чета също!"</string>
-    <string name="tip_writing_messages_title">Провеждане на текстови разговор</string>
     <string name="too_many_reactions_alert_header">Опа!</string>
     <string name="tr">Турски</string>
     <string name="transfer_ownership">Прехвърляне на собствеността</string>
@@ -1466,7 +1425,6 @@
     <string name="tts_current">За текущия избран канал</string>
     <string name="tts_never">Никога</string>
     <string name="tutorial_close">Разбрах!</string>
-    <string name="tutorial_skip">Вече сте запознати с тези неща? [Пропуснете съветите!](onSkipClick)</string>
     <string name="tweet_us">Пишете ни в Twitter</string>
     <string name="two_fa">Двуфакторна автентикация</string>
     <string name="two_fa_activate">Активиране</string>

com.discord/res/values-cs/strings.xml

@@ -1371,50 +1371,6 @@ Také poměrně rozdělíme aktuální plán a odečteme ho z ceny za rok. Bude
     <string name="theme_updated">Motiv byl aktualizován.</string>
     <string name="this_server">Tento server</string>
     <string name="this_server_named">Pouze %1$s</string>
-    <string name="tip_create_first_server_body">"Klikni na \"+\" pro vytvoření tvého vlastního serveru.
-
-Každý server ti umožňuje mít zvláštní místo pro různé skupiny lidí. Můžeš také smazat svůj server, pokud ho již nepotřebuješ. Nejlepší z toho všeho je, že servery jsou zdarma a můžeš si jich vytvořit kolik budeš chtít."</string>
-    <string name="tip_create_first_server_title">Vytvořit svůj vlastní server</string>
-    <string name="tip_create_more_servers_body">"Kliknutím na tlačítko plus vytvoříš nový server.
-
-Protože jsou servery zdarma, můžeš jich vytvořit tolik, kolik se ti zachce. Každý server Ti umožňuje mít místa pro různé skupiny lidí. Pokud už nějaký server nepotřebuješ, můžeš ho odstranit."</string>
-    <string name="tip_create_more_servers_title">Servery jsou všude!</string>
-    <string name="tip_direct_messages_body">"Pomocí tohoto seznamu můžeš vidět úplně všechny na tvém serveru.
-
-Můžeš mít soukromou konverzaci pouhým vybráním přítele!
-Přímé zprávy jsou skvělé, když chceš na něco upozornit přítele i když je zrovna pryč."</string>
-    <string name="tip_direct_messages_title">Začít soukromou konverzaci</string>
-    <string name="tip_friends_list_body">"Klikni zde pro zobrazení tvých přímých zpráv a statusů uživatelů na všech tvých serverech.
-
-Když obdržíš přímou zprávu, ukáže se pod tvým avatarem pro snadný přístup."</string>
-    <string name="tip_friends_list_title">Najdi své přátelé</string>
-    <string name="tip_instant_invite_body">"Přejeď myší přes jakýkoli textový nebo hlasový kanál a zobrazí se ti tlačítko pro sdílení. Použij vygenerovaný odkaz a pozvi lidi přímo do zvoleného kanálu.
-
-Pokročilé pozvánky ti umožňují použít omezení jako je počet lidí, kteří mohou použít tento odkaz, nebo jak dlouho bude odkaz použitelný."</string>
-    <string name="tip_instant_invite_title">Pozvy své přátele</string>
-    <string name="tip_organize_by_topic_title">Uspořádání podle kanálů</string>
-    <string name="tip_server_settings_body">"Klikni zde pro zobrazení nastavení tvého serveru.
-
-Můžeš měnit spoustu věcí jako oprávnění a role, vybrat si region tvého serveru, 
-nastavit kanál pro lidi, co jsou pryč, spravovat odkazy pozvánek, spravovat zakázané uživatele, 
-nebo dokonce smazat celý server."</string>
-    <string name="tip_server_settings_title">Ovládejte svůj server</string>
-    <string name="tip_voice_conversations_body">"Toto je tvůj **Ovládací panel hlasu.**
-
-Použij tato tlačítka pro zapnutí svého mikrofonu, vypnutí zvuku nebo úpravě nastavení.
-Můžeš nastavit svůj režim mluvení z **hlasové aktivity na Push To Talk** kliknutím na ozubené kolečko."</string>
-    <string name="tip_voice_conversations_title">Zvýšit svůj hlas</string>
-    <string name="tip_whos_online_body">"Tento seznam ukazuje, kdo je v aktuálním kanále.
-
-U každého, kdo používá aplikaci stolního počítače, se navíc zobrazuje právě hraná hra.
-Kliknutím na uživatele se zobrazí **individuální nastavení** jako ovládání hlasitosti nebo funkce pro administrátora."</string>
-    <string name="tip_whos_online_title">Copak to hraješ?</string>
-    <string name="tip_writing_messages_body">"Zde budeš psát všechny svoje názory a nápady.
-
-Abychom ti poskytli pohodlí, přidali jsme podporu Markdown syntaxí, takže můžeš
-**něco zdůraznit** nebo _si dupnout._ Můžeš taky **přesouvat** obrázky nebo soubory přímo sem,
-abys mohl rychle sdílet GIFy kočiček. Hlavně ať jich není moc."</string>
-    <string name="tip_writing_messages_title">Založ konverzaci</string>
     <string name="title">Název</string>
     <string name="total_results">%1$s</string>
     <string name="tr">Turečtina</string>
@@ -1424,7 +1380,6 @@ abys mohl rychle sdílet GIFy kočiček. Hlavně ať jich není moc."</string>
     <string name="tts_current">Pro aktuálně zvolený kanál</string>
     <string name="tts_never">Nikdy</string>
     <string name="tutorial_close">Rozumím!</string>
-    <string name="tutorial_skip">Už jsi profík? [Přeskočit tipy](onSkipClick)</string>
     <string name="tweet_us">Tweetni nám</string>
     <string name="two_fa_qr_label">Skenovat QR kód</string>
     <string name="two_fa_sales_pitch">Chraňte svůj Discord účet další vrstvou zabezpečení. Po nastavení budete pro přihlášení potřebovat vložit vaše heslo a také kód z vašeho mobilního telefonu.</string>

com.discord/res/values-da/strings.xml

@@ -1171,36 +1171,11 @@ Er du sikker på at du vil gøre dette?"</string>
     <string name="theme_dark">Mørkt</string>
     <string name="theme_light">Lyst</string>
     <string name="this_server">Denne server</string>
-    <string name="tip_create_first_server_body">"Klik på denne plus-knap for at lave din egen server.
-
-Hver enkelt server giver dig et unikt sted for forskellige grupper. Du kan også slette servere hvis du ikke længere har brug for dem. Bedst af alt kan du, fordi servere er gratis, lave så mange du vil."</string>
-    <string name="tip_create_first_server_title">Opret din egen server</string>
-    <string name="tip_create_more_servers_body">"Klik på denne plus-knap for at lave en ny server.
-
-Servere er gratis, så du kan lave lige så mange du vil. Hver enkelt server giver dig et unikt sted for forskellige grupper. Du kan også slette servere hvis du ikke længere har brug for dem."</string>
-    <string name="tip_create_more_servers_title">Servere overalt!</string>
-    <string name="tip_direct_messages_title">Start en privat samtale</string>
-    <string name="tip_friends_list_title">Se Dine Venner</string>
-    <string name="tip_instant_invite_title">Invitér Dine Venner</string>
-    <string name="tip_organize_by_topic_title">Organisér efter Kanaler</string>
-    <string name="tip_server_settings_body">"Klik her for at få adgang til dine serverindstillinger.
-
-Du kan ændre alle mulige ting, såsom tilladelser og roller, hvilken region din stemmeserver skal være i, opsætte en AFK-kanal, administrere invitationslinks, administrere udelukkede bruger, og endda fuldstændig slette din server."</string>
-    <string name="tip_voice_conversations_title">Hæv Din Stemme</string>
-    <string name="tip_whos_online_body">"Denne liste viser hvem der er i kanalen.
-
-Alle der bruger computer-appsene vil også vise hvilket spil de spiller i øjeblikket. Hvis du klikker på en bruger kan du se **individuelle indstillinger**, såsom lydstyrke eller administratorkontroller."</string>
-    <string name="tip_whos_online_title">Hvad spiller du?</string>
-    <string name="tip_writing_messages_body">"Her er hvor du vil komme til at skrive alle dine meninger og idéer.
-
-For at være fancy har vi inkluderet support for Markdown-syntaks så du kan **sige det med styrke* eller __gøre dig bemærket.__ Du kan også **trække &amp; slippe** billeder eller filer direkte for at dele de der katte-GIFs. Dog ikke alt for mange."</string>
-    <string name="tip_writing_messages_title">Hav en samtale</string>
     <string name="try_again">Prøv igen</string>
     <string name="tts_alls">For alle kanaler</string>
     <string name="tts_current">For den markerede kanal</string>
     <string name="tts_never">Aldrig</string>
     <string name="tutorial_close">Forstået!</string>
-    <string name="tutorial_skip">Allerede en ekspert? [Spring tippene over](onSkipClick)</string>
     <string name="tweet_us">Send os et tweet</string>
     <string name="two_fa_enable">Aktiver to-faktor autentificering</string>
     <string name="two_fa_enter_token_label">Angiv Discord autentificeringskode</string>

com.discord/res/values-de/strings.xml

@@ -2637,51 +2637,6 @@ Bist du sicher, dass du das machen willst?"</string>
     <string name="three_platform_accounts_detected">Oh hey! Willst du deine **%1$s**, **%2$s** und **%3$s** Accounts verbinden, um Freunde zu finden, die auch Discord haben?</string>
     <string name="three_users_typing">**%1$s**, **%2$s** und **%3$s** schreiben…</string>
     <string name="timeout_error">Die Aktion dauerte zu lange. Bitte versuche es erneut.</string>
-    <string name="tip_create_first_server_body">"Klick auf das Plus, um deinen eigenen Server zu erstellen.
-
-Mit jedem Server erschaffst du einen eigenen Platz für deine Freundeskreise. Du kannst einen Server auch löschen, wenn du ihn nicht länger benötigst. Doch das Beste ist: Weil Server kostenlos sind, kannst du so viele haben wie du möchtest."</string>
-    <string name="tip_create_first_server_title">Erstelle deinen eigenen Server</string>
-    <string name="tip_create_more_servers_body">"Klick auf das Plus, um einen neuen Server zu erstellen oder einem vorhandenen beizutreten.
-
-Da Server kostenlos sind, kannst du so viele erstellen, wie du möchtest. Auf jedem Server kannst du einen eigenen Platz für verschiedene Gruppen erstellen. Wenn du einen Server nicht mehr brauchst, kannst du ihn einfach löschen."</string>
-    <string name="tip_create_more_servers_title">Server überall!</string>
-    <string name="tip_direct_messages_body">"In dieser Liste siehst du alle Benutzer, die sich gerade auf deinen Servern befinden.
-
-Du kannst einen privaten Text-Chat beginnen, indem du einen Freund auswählst und direkt drauflosschreibst!
-Direktnachrichten sind ideal, um Leuten Benachrichtigungen zukommen zu lassen, sogar wenn sie AFK sind."</string>
-    <string name="tip_direct_messages_title">Starte eine private Unterhaltung</string>
-    <string name="tip_friends_list_body">"Klicke hier, um deine Direktnachrichten und den Online-Status der Benutzer deiner Server zu sehen. 
-
-Wenn du eine Direktnachricht erhältst, wird diese unter deinem Avatar angezeigt, damit du gleich darauf zugreifen kannst."</string>
-    <string name="tip_friends_list_title">Sehe deine Freunde</string>
-    <string name="tip_instant_invite_body">"Bewege die Maus über einen Text- oder Sprach-Kanal um die Teilen-Schaltfläche anzuzeigen.
-Benutze den generierten Link, um Leute direkt in den gewählten Kanal einzuladen.
-
-Erweiterte Sofortlinks ermöglichen es, Nutzungseinschränkungen einzustellen, wie z. B. die Anzahl der Leute, die ihn nutzen können, oder die Dauer der Gültigkeit des Links."</string>
-    <string name="tip_instant_invite_title">Lade deine Freunde ein</string>
-    <string name="tip_organize_by_topic_body">"**Text channels** lassen dich deine Unterhaltungen nach Thema voneinander trennen. Du kannst zwischen den Kanälen wechseln und sogar **@mention**, um deine Freunde auf Handy und Computer zu benachrichtigen.
-
-**Voice Channels** lassen dich deine Unterhaltungen in beliebig große Gruppen trennen.
-Klicke auf einen Kanal, um der Unterhaltung beizutreten. Du wirst in diesem Sprachkanal bleiben, auch wenn du zwischen Textkanälen wechselst!"</string>
-    <string name="tip_organize_by_topic_title">Ordne nach Kanälen</string>
-    <string name="tip_server_settings_body">"Klicke hier, um auf die Servereinstellungen zuzugreifen.
-
-Du kannst alle möglichen Dinge anpassen, wie zum Beispiel Berechtigungen, Rollen, den Serverstandort festlegen, AFK-Kanal einrichten, Einladungen verwalten, gebannte User verwalten und sogar deinen Server vollständig löschen."</string>
-    <string name="tip_server_settings_title">Konfiguriere deinen Server</string>
-    <string name="tip_voice_conversations_body">"Dies ist dein **Sprach-Kontrollpanel.**
-
-Verwende diese Knöpfe um dein Mikrofon einzuschalten, deine Kopfhörer auszuschalten oder Einstellungen zu verändern.
-Du kannst deinen Spracheingabemodus von **Sprachaktivierung zu Push-to-Talk** ändern, indem du auf das Zahnrad klickst."</string>
-    <string name="tip_voice_conversations_title">Erhebe deine Stimme</string>
-    <string name="tip_whos_online_body">"Diese Liste zeigt dir an, wer sich im aktuellen Kanal befindet.
-
-Wenn ein Benutzer die Desktop-App verwendet, wird außerdem angezeigt, welches Spiel er aktuell spielt.
-Per Klick auf einen Benutzer erscheinen **individuelle Einstellungen** wie Lautstärke oder Admin-Bedienelemente."</string>
-    <string name="tip_whos_online_title">Was spielst du gerade?</string>
-    <string name="tip_writing_messages_body">"Hier wirst du alle deine Meinungen und Ideen hinein schreiben.
-
-Um ausgefallene Nachrichten schreiben zu können, unterstützen wir die Markdown-Syntax, sodass man **ein Argument anbringen** oder __mit den Füßen stampfen__ kann. Zudem kann man Bilder und Dateien direkt per **Drag &amp; Drop** hier hereinziehen, um schnell GIF-Dateien teilen zu können, wenn auch nicht allzu viele."</string>
-    <string name="tip_writing_messages_title">Starte eine Unterhaltung</string>
     <string name="title">Titel</string>
     <string name="too_many_animated_emoji">Du hast keinen Platz mehr für weitere animierte Emojis.</string>
     <string name="too_many_emoji">Du hast keinen Platz mehr für weitere Emojis.</string>
@@ -2698,7 +2653,6 @@ Um ausgefallene Nachrichten schreiben zu können, unterstützen wir die Markdown
     <string name="tts_current">Für den aktuell ausgewählten Kanal</string>
     <string name="tts_never">Nie</string>
     <string name="tutorial_close">Alles klar!</string>
-    <string name="tutorial_skip">Du kennst dich aus? [Tipps ausblenden](onSkipClick)</string>
     <string name="tweet_us">Sende uns einen Tweet</string>
     <string name="two_fa">Zwei-Stufen-Authentifizierung</string>
     <string name="two_fa_activate">Aktivieren</string>

com.discord/res/values-el/strings.xml

@@ -2536,48 +2536,6 @@ Avatar"</string>
     <string name="this_server_named">Μόνο %1$s</string>
     <string name="three_platform_accounts_detected">Γεια χαρά! Θα θέλατε να συνδέσετε τους **%1$s**, **%2$s**, και **%3$s** λογαριασμούς σας για να βρείτε φίλους που επίσης έχουν Discord;</string>
     <string name="timeout_error">Η λειτουργία πήρε πολύ ώρα για να ολοκληρωθεί, παρακαλώ προσπαθήστε ξανά.</string>
-    <string name="tip_create_first_server_body">"Κάντε κλικ στο κουμπί Συν για να δημιουργήσετε τον δικό σας διακομιστή.
-
-Ο κάθε διακομιστής σας επιτρέπει να έχετε ένα ξεχωριστό μέρος για διάφορες ομάδες ανθρώπων. Μπορείτε να διαγράψετε κάποιον διακομιστή αν δεν τον χρειάζεστε πια. Το καλύτερο απ' όλα, καθώς οι διακομιστές είναι δωρεάν, μπορείτε να δημιουργήσετε όσους θέλετε."</string>
-    <string name="tip_create_first_server_title">Δημιουργήστε τον δικό σας διακομιστή</string>
-    <string name="tip_create_more_servers_body">"Κάντε κλικ στο κουμπί Συν για να δημιουργήσετε έναν νέο διακομιστή.
-
-Καθώς οι διακομιστές είναι δωρεάν, μπορείτε να δημιουργήσετε όσους θέλετε. Ο κάθε διακομιστής σας επιτρέπει να έχετε ένα ξεχωριστό μέρος για διάφορες ομάδες ανθρώπων. Μπορείτε να διαγράψετε κάποιον διακομιστή αν δεν τον χρειάζεστε πια."</string>
-    <string name="tip_create_more_servers_title">Διακομιστές παντού!</string>
-    <string name="tip_direct_messages_body">"Δείτε τους πάντες από όλους τους διακομιστές σας σε αυτή τη λίστα.
-
-Μπορείτε να έχετε μία ιδιωτική συνομιλία επιλέγοντας έναν φίλο και αρχίζοντας μια συζήτηση!
-Τα Απευθείας Μηνύματα είναι ιδανικά για να βρεθείτε σε επαφή με άτομα, ειδοποιόντας τους ακόμα και όταν βρίσκονται AFK."</string>
-    <string name="tip_direct_messages_title">Ξεκινήσετε μια ιδιωτική συνομιλία</string>
-    <string name="tip_friends_list_body">"Κάντε κλικ εδώ για να δείτε τα απευθείας μηνύματα όπως και την κατάσταση όλων των χρηστών στους διακομιστές σας.
-
-Όταν λαμβάνετε ένα a μήνυμα, θα εμφανιστεί κάτω από την εικόνα σας εδώ για ευκολότερη πρόσβαση."</string>
-    <string name="tip_friends_list_title">Δείτε τους φίλους σας</string>
-    <string name="tip_instant_invite_body">"Σύρετε το δείκτη του ποντικιού σας πάνω από οποιοδήποτε κανάλι κειμένου ή φωνής ώστε να αποκαλυφθεί το κουμπί κοινής χρήσης. Χρησιμοποιήστε την παραγόμενη διεύθυνση για να προσκαλέσετε μέλη στο συγκεκριμένο κανάλι.
-
-Οι προχωρημένοι σύνδεσμοι πρόσκλησης θα σας επιτρέψουν να ρυθμίσετε περιορισμούς όπως πόσα άτομα μπορούν να συνδεθούν με αυτή τη διεύθυνση ή για πόσο διαρκεί."</string>
-    <string name="tip_instant_invite_title">Προσκαλέστε τους φίλους σας</string>
-    <string name="tip_organize_by_topic_body">"Τα **κανάλια κειμένου** σας επιτρέπουν να διαχωρίσετε τις γραπτές συζητήσεις σας ανάλογα με το θέμα. Μπορείτε να περιηγηθείτε μεταξύ των καναλιών εύκολα ακόμη και να **@αναφέρεται** στους φίλους σας για να τους στείλετε μια ειδοποίηση στον υπολογιστή ή το κινητό τους.
-
-Τα **κανάλια φωνής** σας επιτρέπουν να διαχωρίσετε τις συζητήσεις σας σε ομάδες, όσο μεγάλες ή όσο μικρές θέλετε. Κάντε κλικ σε ένα κανάλι για να ενταχθείτε σε μία συζήτηση. Θα παραμείνετε στο συγκεκριμένο Κανάλι Φωνής ακόμη και αν μεταβείτε μεταξύ δύο καναλιών κειμένου!"</string>
-    <string name="tip_organize_by_topic_title">ταξινόμηση ανα Κανάλια</string>
-    <string name="tip_server_settings_body">"Κάντε κλικ εδώ για να αποκτήσετε πρόσβαση στις ρυθμίσεις του διακομιστή σας.
-
-Μπορείτε να επεξεργαστείτε κάθε είδος ρυθμίσεων όπως δικαιώματα και ρόλους, να επιλέξετε την τοποθεσία του διακομιστή φωνής, να ιδρύσετε ένα κανάλι AFK, να διαχειριστείτε τους συνδέσμους πρόσκλησης και τους αποκλεισμένους χρήστες, ή ακόμη και να διαγράψετε τον διακομιστή σας εντελώς."</string>
-    <string name="tip_server_settings_title">Ελέγξτε τον διακομιστή σας</string>
-    <string name="tip_voice_conversations_body">"Αυτός είναι ο **πίνακας ελέγχου για τη φωνή.**
-
-Χρησιμοποιήστε αυτά τα κουμπιά για να αφαιρέσετε τη σίγαση του μικροφώνου σας, να κλείσετε τον ήχο στα ακουστικά σας, ή να επεξεργαστείτε τις ρυθμίσεις.
-Μπορείτε να επιλέξετε τον τρόπο ομιλίας μεταξύ **Voice Activity και Push To Talk** πατώντας το γρανάζι."</string>
-    <string name="tip_voice_conversations_title">Υψώστε τη φωνή σας</string>
-    <string name="tip_whos_online_body">"Αυτή η λίστα δείχνει ποιος βρίσκεται στο τρέχον κανάλι.
-
-Οποιος χρησιμοποιεί την εφαρμογή για τον υπολογιστή θα μπορεί να προβάλει ποιο παιχνίδι παίζει εκείνη τη στιγμή. Επιλέγοντας έναν χρήστη θα εμφανιστούν **ξεχωριστές ρυθμίσεις** όπως ρυθμίσεις ήχου ή διαχειριστικές ενέργειες."</string>
-    <string name="tip_whos_online_title">Τι παίζετε;</string>
-    <string name="tip_writing_messages_body">"Εδώ θα γράφετε όλες τις απόψεις και τις ιδέες σας.
-
-Για να διατηρήσουμε τα πάντα κομψά έχουμε συμπεριλάβει υποστήριξη για τη χρήση του Markdown συντακτικού, έτσι ώστε να μπορείτε να **πείτε κάτι με επιδεικτικό τρόπο** ή για να __χτυπήσετε τα πόδια σας δυνατά στο πάτωμα.__ Μπορείτε επίσης να **σύρετε** φωτογραφίες ή αρχεία εδώ για να μοιραστείτε γρήγορα τα GIFs με τα γατάκια σας. Όχι πάρα πολλά όμως."</string>
-    <string name="tip_writing_messages_title">Αρχίστε μια συζήτηση</string>
     <string name="title">Τίτλος</string>
     <string name="too_many_animated_emoji">Δεν έχετε άλλο χώρο για κινούμενα emoji.</string>
     <string name="too_many_emoji">Δεν έχετε άλλο χώρο για emoji.</string>
@@ -2594,7 +2552,6 @@ Avatar"</string>
     <string name="tts_current">Για το τρέχον επιλεγμένο κανάλι</string>
     <string name="tts_never">Ποτέ</string>
     <string name="tutorial_close">Το έπιασα!</string>
-    <string name="tutorial_skip">Ήδη επαγγελματίας; [Παραλείψτε τις συμβουλές](onSkipClick)</string>
     <string name="tweet_us">Κάντε μας Tweet</string>
     <string name="two_fa">Έλεγχος ταυτότητας δύο παραγόντων</string>
     <string name="two_fa_activate">Ενεργοποίηση</string>

com.discord/res/values-es-rES/strings.xml

@@ -2762,51 +2762,6 @@ Elige qué pantalla te gustaría compartir."</string>
     <string name="three_platform_accounts_detected">¡Oh oye! ¿Te gustaría conectar tus cuentas de **%1$s**, **%2$s** y **%3$s** para encontrar amigos que también tengan Discord?</string>
     <string name="three_users_typing">**%1$s**, **%2$s** y **%3$s** están escribiendo…</string>
     <string name="timeout_error">La operación tomó demasiado para completar, intenta de nuevo por favor.</string>
-    <string name="tip_create_first_server_body">"Haz click en el símbolo '+' para crear tu propio servidor.
-
-Cada servidor te permite tener un lugar único para grupos diferentes de personas. También puedes elimina un servidor si no los necesitas mas. Lo mejor de todo es que los servidores son gratuitos, puedes crear tantos como quieras."</string>
-    <string name="tip_create_first_server_title">Crea tu propio servidor</string>
-    <string name="tip_create_more_servers_body">"Haz click en este botón '+' para crear un nuevo servidor.
-
-Como los servidores son gratuitos, puedes crear tantos como quieras. Cada servidor te permite tener un lugar único para diferentes grupos de personas. También puedes eliminar los servidores si no los necesitas más."</string>
-    <string name="tip_create_more_servers_title">¡Servidores en todas partes!</string>
-    <string name="tip_direct_messages_body">"Ve quiénes están en tus servidores desde esta lista,
-
-¡Puedes tener una conversación privada seleccionando a un amigo y empezando a chatear!
-Los \"Mensajes Directos\" son una excelente manera de contactar con gente a través de las notificaciones, incluso si están inactivos."</string>
-    <string name="tip_direct_messages_title">Iniciar una conversación privada</string>
-    <string name="tip_friends_list_body">"Haz clic aquí para ver tus mensajes directos y ver el estado de todas las personas en tus servidores. 
-
-Cuando recibas un MD, aparecerá debajo de tu avatar para facilitar el acceso."</string>
-    <string name="tip_friends_list_title">Ver a tus amigos</string>
-    <string name="tip_instant_invite_body">"Mueve el cursor sobre cualquier canal de texto o voz para mostrar el botón de compartir. Usa el enlace generado para invitar gente directamente al canal seleccionado. 
-
-Los \"Enlaces de Invitación Avanzada\" te permiten establecer restricciones tales como el número de gente que se puede unir con ese enlace o cuánto tiempo durará."</string>
-    <string name="tip_instant_invite_title">Invita a tus amigos</string>
-    <string name="tip_organize_by_topic_body">"**Los canales de texto** te permiten separar tus conversaciones de chat por tema. Puedes saltar alrededor de los canales fácilmente e incluso **@mencionar** amigos para enviarles notificaciones a su escritorio o teléfono.
-
-**Los canales de voz** te permiten separar tus conversaciones entre grupos, grande o pequeño como desees.
-Haz clic en un canal para unirte a una conversación. ¡Estarás en ese canal de voz incluso si cambias de canal de texto!"</string>
-    <string name="tip_organize_by_topic_title">Organizar por canales</string>
-    <string name="tip_server_settings_body">"Haz clic aquí para acceder a los ajustes de tu servidor.
-
-Puedes modificar todo tipo de cosas como los permisos y roles, elegir la región de voz,
-establecer un canal AFK, administrar los enlaces de invitación, administrar los usuarios baneados e incluso borrar tu servidor por completo."</string>
-    <string name="tip_server_settings_title">Controla tu Servidor</string>
-    <string name="tip_voice_conversations_body">"Este es tu **panel de control de voz.**
-
-Usa estos botones para quitar el silencio de tu micrófono, ensordecer tus auriculares o modificar los ajustes.
-Puedes ajustar tu modo de habla de **Actividad de voz a Pulsar Para Hablar** haciendo clic en el engrane."</string>
-    <string name="tip_voice_conversations_title">Aumenta tu voz</string>
-    <string name="tip_whos_online_body">"Esta lista muestra quien está dentro del canal seleccionado.
-
-Cualquiera que esté usando la aplicación de escritorio podrá mostrar qué están jugando. Clickear sobre un usuario revelará **ajustes individuales** como el control de volumen u otros controles de administrador."</string>
-    <string name="tip_whos_online_title">¿Qué estás jugando?</string>
-    <string name="tip_writing_messages_body">"Aquí podrás escribir todas tus opiniones e ideas.
-
-Para mantener las cosas de lujo hemos añadido soporte para el sintaxis Markdown, así que puedes **decir algo importante** o
-__patalear.__ También puedes **arrastrar y soltar** imágenes o archivos aquí para rápidamente compartir esos GIFs de gatos. Pero sin pasarse eh."</string>
-    <string name="tip_writing_messages_title">Ten una conversación</string>
     <string name="title">Título</string>
     <string name="too_many_animated_emoji">No tienes más espacios para emojis animados.</string>
     <string name="too_many_emoji">Ya no tienes más espacios para emojis.</string>
@@ -2823,7 +2778,6 @@ __patalear.__ También puedes **arrastrar y soltar** imágenes o archivos aquí
     <string name="tts_current">Para el canal seleccionado</string>
     <string name="tts_never">Nunca</string>
     <string name="tutorial_close">¡Entendido!</string>
-    <string name="tutorial_skip">¿Ya eres un experto? [Saltar el tutorial](onSkipClick)</string>
     <string name="tweet_us">Tweeteanos</string>
     <string name="two_fa">Verificación en dos pasos</string>
     <string name="two_fa_activate">Activar</string>

com.discord/res/values-fi/strings.xml

@@ -2810,46 +2810,6 @@ Haluatko varmasti tehdä tämän?"</string>
     <string name="three_platform_accounts_detected">Hei! Haluaisitko yhdistää **%1$s**-, **%2$s**-, ja **%3$s**-tilisi löytääksesi kavereita, joilla on myös Discord?</string>
     <string name="three_users_typing">**%1$s**, **%2$s** ja **%3$s** kirjoittavat…</string>
     <string name="timeout_error">Toiminnon suorittaminen kesti liian kauan, yritä uudelleen.</string>
-    <string name="tip_create_first_server_body">"Klikkaa tätä plus-painiketta luodaksesi oman palvelimesi.
-
-Jokainen palvelin luo uniikin paikan erityyppisille käyttäjille. Sen voi myös poistaa, kun sitä ei enää tarvita. Parasta kuitenkin on, että palvelimet ovat ilmaisia, joten voit luoda niitä niin monta kuin haluat."</string>
-    <string name="tip_create_first_server_title">Luo oma palvelimesi</string>
-    <string name="tip_create_more_servers_body">"Klikkaa tätä plus-painiketta luodaksesi uuden palvelimen.
-
-Koska palvelimet ovat ilmaisia, voit luoda niitä niin monta kuin haluat. Jokainen palvelin mahdollistaa ainutlaatuisen paikan erityyppisille käyttäjille. Kun et enää tarvitse niitä, voit myös poistaa ne."</string>
-    <string name="tip_create_more_servers_title">Palvelimia kaikkialla!</string>
-    <string name="tip_direct_messages_body">"Tällä listalla näet jokaisen käyttäjän jokaiselta palvelimeltasi.
-
-Voit keskustella yksityisesti valitsemasi käyttäjän kanssa. Yksityisviestit ovat mainio tapa saada yhteys käyttäjiin ilmoitusten avulla, vaikka he olisivat AFK-tilassa."</string>
-    <string name="tip_direct_messages_title">Aloita yksityiskeskustelu</string>
-    <string name="tip_friends_list_body">"Klikkaa tästä nähdäksesi yksityisviestisi ja käyttäjien tilat kaikilla palvelimillasi. 
-
-Kun vastaanotat yksityisviestin, se ilmestyy tähän profiilikuvasi alapuolelle."</string>
-    <string name="tip_friends_list_title">Näe kaverisi</string>
-    <string name="tip_instant_invite_body">"Vie hiiri minkä tahansa teksti- tai puhekanavan päälle paljastaaksesi jakopainikkeen. Käytä luotua linkkiä kutsuaksesi ihmisiä suoraan valitulle kanavalle.
-
-Edistyneet kutsulinkit antavat sinun asettaa käyttörajoituksia, kuten kuinka monta henkilöä voi liittyä kyseisellä linkillä, tai kuinka kauan linkki on voimassa."</string>
-    <string name="tip_instant_invite_title">Kutsu kavereitasi</string>
-    <string name="tip_organize_by_topic_body">"**Tekstikanavien** avulla voit erotella keskustelut niiden aiheen mukaan. Voit vaihdella kanavien välillä ja jopa **@mainita** ystäviäsi ja lähettää heidän tietokoneilleen ja älypuhelimilleen ilmoituksia.
-
-**Puhekanavien** avulla voit jakaa keskusteluja niin isoihin tai pieniin ryhmiin kuin haluat. Klikkaa kanavaa liittyäksesi keskusteluun. Pysyt puhekanavalla vaikka vaihtaisit tekstikanavaakin!"</string>
-    <string name="tip_organize_by_topic_title">Järjestä kanavia ryhmittäin</string>
-    <string name="tip_server_settings_body">"Klikkaa tästä päästäksesi palvelimesi asetuksiin.
-
-Voit muuttaa kaikennäköisiä asetuksia, esimerkiksi oikeuksia ja rooleja, valita palvelimesi sijainnin, luoda AFK-kanavan, hallita kutsumislinkkejä sekä käyttäjien porttikieltoja tai jopa poistaa palvelimesi."</string>
-    <string name="tip_server_settings_title">Hallitse palvelintasi</string>
-    <string name="tip_voice_conversations_body">"Tämä on **ääniasetustesi paneeli.**
-
-Käytä näitä painikkeita mikrofonin mykistyksen poistamiseen, kuulokkeiden hiljentämiseen tai asetusten muokkaamiseen. Voit vaihtaa puhetilasi **äänentunnistuksen ja puhenäppäimen** välillä ratasta klikkaamalla."</string>
-    <string name="tip_voice_conversations_title">Korota ääntäsi</string>
-    <string name="tip_whos_online_body">"Tämä lista näyttää tällä kanavalla olevat henkilöt.
-
-Työpöytäversiota käytettäessä näkyy myös käyttäjien senhetkinen pelitila. Klikkaamalla käyttäjää näet **käyttäjäkohtaiset asetukset**, kuten äänenvoimakkuuden säädöt sekä ylläpitotoiminnot."</string>
-    <string name="tip_whos_online_title">Mitä pelaat?</string>
-    <string name="tip_writing_messages_body">"Täällä voit kirjoittaa kaikista mielipiteistäsi ja ideoistasi.
-
-Jotta tämä olisi hauskempaa, lisäsimme tuen Markdown-syntaksille, joten voit helposti **esittää mielipiteesi** tai __tömistellä jalkojasi.__ Voit myös **vetää ja pudottaa** kuvia tai tiedostoja suoraan tänne jakaaksesi hienoimmat kissa-GIFisi. Älä kuitenkaan vallan innostu niiden kanssa."</string>
-    <string name="tip_writing_messages_title">Aloita keskustelu</string>
     <string name="title">Otsikko</string>
     <string name="too_many_animated_emoji">Animoidut emojipaikkasi ovat loppuneet.</string>
     <string name="too_many_emoji">Emojipaikkasi ovat loppuneet.</string>
@@ -2866,7 +2826,6 @@ Jotta tämä olisi hauskempaa, lisäsimme tuen Markdown-syntaksille, joten voit
     <string name="tts_current">Valitulle kanavalle</string>
     <string name="tts_never">Ei koskaan</string>
     <string name="tutorial_close">Asia ymmärretty!</string>
-    <string name="tutorial_skip">Oletko jo ammattilainen? [Ohita ohjeet](onSkipClick)</string>
     <string name="tweet_us">Twiittaa meille</string>
     <string name="two_fa">Kaksivaiheinen todennus</string>
     <string name="two_fa_activate">Aktivoi</string>

com.discord/res/values-fr/strings.xml

@@ -2778,47 +2778,6 @@ Choisissez quel écran vous souhaitez partager."</string>
     <string name="three_platform_accounts_detected">Oh, salut ! Voulez-vous connecter vos comptes **%1$s** **%2$s** et **%3$s** pour trouver des amis qui ont aussi Discord ?</string>
     <string name="three_users_typing">"**%1$s**, **%2$s**, et **%3$s** sont en train d'écrire…"</string>
     <string name="timeout_error">"L'opération a mis trop de temps à se résoudre, veuillez réessayer."</string>
-    <string name="tip_create_first_server_body">"Cliquez sur ce bouton plus pour créer votre propre serveur.
-
-Chaque serveur est un endroit unique pour différents groupes de personnes. Vous pouvez aussi supprimer un serveur si vous n'en n'avez plus besoin. Le meilleur : les serveurs étant gratuits, vous pouvez en créer autant que vous le voulez."</string>
-    <string name="tip_create_first_server_title">Créez votre propre serveur</string>
-    <string name="tip_create_more_servers_body">"Cliquez sur le bouton plus pour créer un nouveau serveur.
-
-Comme les serveurs sont gratuits, vous pouvez en créer autant que vous le voulez. Chaque serveur vous permet d'avoir un endroit unique pour chaque groupe de personnes. Vous pouvez aussi supprimer vos serveurs si vous n'en n'avez plus besoin."</string>
-    <string name="tip_create_more_servers_title">Des serveurs partout !</string>
-    <string name="tip_direct_messages_body">"Cette liste indique toutes les personnes présentes sur vos serveurs.
-
-Vous pouvez commencer une discussion privée avec un ou une ami(e) en le ou la sélectionnant et en commençant à écrire ! Une notification sera envoyée à cette personne, même si elle devait se trouver en repos."</string>
-    <string name="tip_direct_messages_title">Démarrer une conversation privée</string>
-    <string name="tip_friends_list_body">"Cliquez ici pour voir vos messages privés ainsi que l'état de tous les utilisateurs sur tous vos serveurs.
-
-Quand vous recevez un message privé, celui-ci apparaîtra sous votre avatar ici, pour un accès rapide."</string>
-    <string name="tip_friends_list_title">Voir vos amis</string>
-    <string name="tip_instant_invite_body">"Déplacez votre souris sur n'importe quel salon textuel ou audio pour révéler le bouton de partage. Utilisez le lien généré pour inviter des gens directement dans le salon choisi.
-
-Les liens d'invitation avancés vous permettent de définir des restrictions d'usage, tel que le nombre maximal de personnes pouvant utiliser ce lien pour accéder au salon, ou la durée pendant laquelle celui-ci restera valide."</string>
-    <string name="tip_instant_invite_title">Invitez vos amis</string>
-    <string name="tip_organize_by_topic_body">"Les **salons textuels** vous permettent de séparer vos conversations par sujet. Vous pouvez changer de salon facilement et même **@mentionner** vos amis pour envoyer des notifications à leur ordinateur ou téléphone.
-
-Les **salons vocaux** vous permettent de séparer vos conversations dans des groupes aussi gros ou petits que vous le désirez. Cliquez sur une salle pour vous joindre à une conversation. Vous resterez dans ce salon vocal même si vous changez de salons textuels aussi !"</string>
-    <string name="tip_organize_by_topic_title">Organiser par salons</string>
-    <string name="tip_server_settings_body">"Cliquez ici pour accéder aux paramètres de votre serveur.
-
-Vous pouvez faire toutes sortes d'ajustements, comme gérer les permissions et les rôles, choisir la région de votre serveur audio, créer un salon AFK, gérer les liens d'invitation, gérer les utilisateurs bannis, ou même supprimer votre serveur complètement."</string>
-    <string name="tip_server_settings_title">Contrôlez votre serveur</string>
-    <string name="tip_voice_conversations_body">"Ceci est votre **panneau de contrôle vocal**.
-
-Utilisez ces boutons pour activer/désactiver votre microphone, vous rendre sourd, ou modifier vos paramètres.
-Vous pouvez changer le fonctionnement de votre micro de **Détection de voix à Appuyer-pour-parler** en cliquant sur la roue dentée."</string>
-    <string name="tip_voice_conversations_title">Haussez votre voix</string>
-    <string name="tip_whos_online_body">"Cette liste montre qui est dans le salon actuel.
-
-Toute personne utilisant l'application bureau indiquera également le jeu auquel il est en train de jouer. En cliquant sur un utilisateur vous révélerez ses **réglages individuels** tels que le volume du micro de cet utilisateur ou les commandes administrateurs liées à cet utilisateur."</string>
-    <string name="tip_whos_online_title">À quoi jouez-vous ?</string>
-    <string name="tip_writing_messages_body">"Voici l'endroit où vous pouvez partager vos opinions et vos idées.
-
-Pour plus de vitalité, vous pouvez utiliser la syntaxe Markdown pour mieux **vous faire entendre** ou encore pour mieux __souligner vos propos__. Vous pouvez également **glisser et déposer** ici-même des images ou fichiers afin de rapidement partager vos images de chats préférées… mais avec une certaine retenue, préférablement."</string>
-    <string name="tip_writing_messages_title">Avoir une conversation</string>
     <string name="title">Titre</string>
     <string name="too_many_animated_emoji">"Vous avez atteint la limite d'émojis animés maximum."</string>
     <string name="too_many_emoji">"Vous avez atteint la limite d'émojis maximum."</string>
@@ -2835,7 +2794,6 @@ Pour plus de vitalité, vous pouvez utiliser la syntaxe Markdown pour mieux **vo
     <string name="tts_current">Pour le salon sélectionné</string>
     <string name="tts_never">Jamais</string>
     <string name="tutorial_close">Compris !</string>
-    <string name="tutorial_skip">Déjà un pro ? [Passer les astuces](onSkipClick)</string>
     <string name="tweet_us">Tweetez-nous</string>
     <string name="two_fa">Authentification à deux facteurs</string>
     <string name="two_fa_activate">Activer</string>

com.discord/res/values-hr/strings.xml

@@ -2692,48 +2692,6 @@ Odaberi koji zaslon želiš podijeliti."</string>
     <string name="three_platform_accounts_detected">Oh, zdravo! Želiš li povezati svoje **%1$s**, **%2$s** i **%3$s** korisničke račune kako bi pronašao/la prijatelje koji također koriste Discord?</string>
     <string name="three_users_typing">**%1$s**, **%2$s** i **%3$s** pišu…</string>
     <string name="timeout_error">Operacija je trajala predugo da se završi, molimo pokušaj ponovno.</string>
-    <string name="tip_create_first_server_body">"Klikni na ovaj gumb s plusom kako bi napravio/la vlastiti server.
-
-Svaki server može biti jedinstveno mjesto za različite grupe ljudi. Također možeš izbrisati server ako ti više nije potreban. Najbolje od svega je to što su serveri besplatni, pa ih možeš napraviti koliko god hoćeš."</string>
-    <string name="tip_create_first_server_title">Napravi svoj vlastiti server</string>
-    <string name="tip_create_more_servers_body">"Klikni na ovaj gumb s plusom kako bi napravio/la novi server.
-
-Možeš napraviti neograničen broj servera, zato jer su besplatni. Svaki server može biti jedinstveno mjesto za različite grupe ljudi. Također možeš brisati svoje servere ako ti više nisu potrebni."</string>
-    <string name="tip_create_more_servers_title">Serveri posvuda!</string>
-    <string name="tip_direct_messages_body">"Na ovom popisu možeš vidjeti sve korisnike svojih servera.
-
-Možeš započeti privatan razgovor odabirom prijatelja.
-Direktno dopisivanje je odličan način za dopiranja do ljudi pomoću obavijesti čak i kada su AFK."</string>
-    <string name="tip_direct_messages_title">Započni privatni razgovor</string>
-    <string name="tip_friends_list_body">"Klikni ovdje da vidiš svoje izravne poruke i status svih korisnika tvojih servera.
-
-Kada primiš izravnu poruku, prikazat će se ispod tvog avatara za jednostavniji pristup."</string>
-    <string name="tip_friends_list_title">Pogledaj svoje prijatelje</string>
-    <string name="tip_instant_invite_body">"Prijeđi mišem preko bilo kojeg glasovnog ili tekstualnog kanala kako bi ti se prikazao gumb za dijeljenje. S tim generiranim linkom možeš pozvati ljude izravno u odabrani kanal.
-
-Napredni linkovi pozivnica ti omogućuju podešavanje dodatnih postavki kao što su koliko se ljudi može pridružiti koristeći taj link ili koliko dugo taj link traje."</string>
-    <string name="tip_instant_invite_title">Pozovi svoje prijatelje</string>
-    <string name="tip_organize_by_topic_body">"**Tekstualni kanali** ti omogućuju da odvojiš svoje tekstualne razgovore po temama. Možeš se bez problema prebacivati iz jednog kanala u drugi ili čak **@spomenuti** prijatelje, te im tako poslati obavijesti na računalo ili mobitel.
-
-**Glasovni kanali** ti omogućuju da odvojiš svoje razgovore po grupama, koliko god velike ili male one bile.
-Klikni na kanal za pridruživanje razgovoru. Ostat ćeš u glasovnom kanalu čak iako promjeniš tekstualni kanal!"</string>
-    <string name="tip_organize_by_topic_title">Organizacija po kanalima</string>
-    <string name="tip_server_settings_body">"Klikni ovdje za pristup postavkama svog servera.
-
-Možeš upravljati raznim stvarima, dozvolama i ulogama, odabrati regiju servera, postaviti AFK kanal, upravljati pozivnim linkovima, bananim članovima ili čak u potpunosti izbrisati svoj server."</string>
-    <string name="tip_server_settings_title">Upravljaj svojim serverom</string>
-    <string name="tip_voice_conversations_body">"Ovo je tvoja **glasovna upravljačka ploča.**
-
-Koristi ove tipke za uključivanje svog mikrofona, isključivanje zvuka ili promjenu postavki.
-Možeš postaviti svoj način razgovora na **Glasovnu aktivnost** ili **Push to Talk** pritiskom na kotačić."</string>
-    <string name="tip_voice_conversations_title">Dobar glas daleko se čuje</string>
-    <string name="tip_whos_online_body">"Ova lista prikazuje tko je u trenutnom kanalu.
-
-Svima koji koriste aplikaciju za računalo može u obliku statusa biti prikazana igra koju trenutno igraju. Klikom na korisnika prikazat će se **individualne postavke** kao što su upravljanje glasnoćom i kontrole za administratora."</string>
-    <string name="tip_whos_online_title">Što igraš?</string>
-    <string name="tip_writing_messages_body">"Na ovom mjestu ćeš moći tipkati sve svoje ideje i razmišljanja.
-Da bi sve izgledalo bolje, možeš **podebljati** i _nakositi_ svoj tekst. Također možeš brzinski **povući i ispustiti** slike i datoteke direktno ovdje kako bi tvoji prijatelji vidjeli te nove animacije s mačkama. Nemoj sad pretjerati."</string>
-    <string name="tip_writing_messages_title">Razgovaraj s nekim</string>
     <string name="title">Naslov</string>
     <string name="too_many_animated_emoji">Ponestalo ti je mjesta za animirane emojie.</string>
     <string name="too_many_emoji">Ponestalo ti je mjesta za emojie.</string>
@@ -2749,7 +2707,6 @@ Da bi sve izgledalo bolje, možeš **podebljati** i _nakositi_ svoj tekst. Tako
     <string name="tts_current">Za trenutno odabrani kanal</string>
     <string name="tts_never">Nikada</string>
     <string name="tutorial_close">Kužim!</string>
-    <string name="tutorial_skip">Već si profić? [Preskoči savjete](onSkipClick)</string>
     <string name="tweet_us">Tweetaj nam</string>
     <string name="two_fa">Dvofaktorska autentikacija</string>
     <string name="two_fa_activate">Aktiviraj</string>

com.discord/res/values-hu/strings.xml

@@ -2805,47 +2805,6 @@ Biztos vagy ebben?"</string>
     <string name="three_platform_accounts_detected">Szia! Nem szeretnéd csatlakoztatni a(z) **%1$s**, **%2$s**, és **%3$s** fiókodat, hogy megtaláld a Discordot használó barátaidat?</string>
     <string name="three_users_typing">**%1$s**, **%2$s**, és **%3$s** éppen gépel…</string>
     <string name="timeout_error">A művelet túl sokáig tartott, kérlek próbáld meg újra.</string>
-    <string name="tip_create_first_server_body">"Kattints erre a plusz gombra, hogy létrehozd a saját szerveredet.
-
-Minden szerver egy egyedi hely, egyedi csoportoknak. Ha már nincs rá szükséged, ki is törölheted. A legjobb viszont az, hogy annyi szervert hozhatsz létre, amennyit csak szeretnél, hiszen teljesen ingyenesek."</string>
-    <string name="tip_create_first_server_title">Hozd létre a saját szervered</string>
-    <string name="tip_create_more_servers_body">"Kattints erre a plusz gombra, hogy létrehozz egy új szervert.
-
-Mivel a szerverek ingyenesek, annyit hozol létre, amennyit akarsz. Minden szerver lehet egy egyedi hely, egyedi csoportoknak. Ki is törölhetsz szervereket, ha már nincs rájuk szükséged."</string>
-    <string name="tip_create_more_servers_title">Szerverek mindenhol!</string>
-    <string name="tip_direct_messages_body">"Ezen a listán mindenkit láthatsz az összes szerverről.
-
-Beszélgethetsz négyszemközt, ha kiválasztod a barátod és írsz neki valamit! A privát üzenetek kiválóak az emberek elérésére, mert akkor is értesítik őket, ha nincsenek gépnél (AFK)."</string>
-    <string name="tip_direct_messages_title">Indíts privát beszélgetést</string>
-    <string name="tip_friends_list_body">"Kattints ide, hogy megnézhesd közvetlen üzeneteidet és lásd mindenkinek az állapotát az összes szervereden.
-
-Ha privát üzenetet kapsz, a profilképed alatt fog megjelenni a könnyű elérés érdekében."</string>
-    <string name="tip_friends_list_title">Lásd barátaidat</string>
-    <string name="tip_instant_invite_body">"Vidd az egered bármelyik szöveg vagy hang csatornára, hogy hozzáférj a **Megosztás** gombhoz. Az így készített linkkel tudsz meghívni embereket közvetlenül az általad kiválasztott csatornára.
-
-A meghívó link beállításainál megadhatod, hogy hány ember csatlakozhat a link segítségével, és mennyi ideig legyen érvényes."</string>
-    <string name="tip_instant_invite_title">Hívd meg a barátaid</string>
-    <string name="tip_organize_by_topic_body">"**Szöveg csatornák** lehetővé teszik, hogy a beszélgetések témák alapján különítsd el. Könnyedén válthatsz a csatornák között és **@megemlítheted** barátaid, hogy értesítést küld számítógépükre, vagy telefonjukra.
-
-**Hang csatornák** lehetővé teszik, hogy a beszélgetéseket elkülönítsd egymástól. Kattints a csatornára, hogy csatlakozz egy beszélgetéshez. Akkor is bent maradsz a hang csatornában, ha szöveg csatornát váltasz!"</string>
-    <string name="tip_organize_by_topic_title">Csatornák szerinti rendezés</string>
-    <string name="tip_server_settings_body">"Kattints ide hogy elérd a szervered beállításait.
-
-Minden féle dolgot módosíthatsz, mint például jogok és rangok, kiválaszthatod a hang szervered régióját, beállíthatsz AFK csatornát, kezelheted a meghívókat, a kitiltott felhasználókat vagy akár kitörölheted az egész szervered."</string>
-    <string name="tip_server_settings_title">Irányítsd a szervered</string>
-    <string name="tip_voice_conversations_body">"Ez a **hang vezérlőpaneled.**
-
-Használd ezeket a gombokat, hogy lenémítsd a mikrofonod, süketítsd a fejhallgatódat, vagy megváltoztasd a beállításaidat.
-Átállíthatod a beszéd módodat **Voice Activityről Push to Talkra** a fogaskerékre kattintással."</string>
-    <string name="tip_voice_conversations_title">Emeld meg a hangod</string>
-    <string name="tip_whos_online_body">"Ez a lista mutatja ki van a jelenlegi csatornába.
-
-Bárki aki az asztali alkalmazást használja mutatni fogja mivel játszik. Ha rákattintasz egy felhasználóra, akkor megjelennek az egyedi beállítások, mint a hangerő vagy admin vezérlés."</string>
-    <string name="tip_whos_online_title">Mivel játszol?</string>
-    <string name="tip_writing_messages_body">"Ide fogod írni az összes véleményedet és ötletedet.
-
-Hogy minden csilivili legyen, támogatjuk a Markdown kifejezéseket, így **kiemelheted a lényeget**, vagy __elmondhatod, mit csinálsz.__ Vagy akár **behúzhatod** a képeidet, és fájljaidat ide, hogy gyorsan megoszd azokat a macskás GIFeket. De azért ne túl sokat."</string>
-    <string name="tip_writing_messages_title">Beszélgess</string>
     <string name="title">Cím</string>
     <string name="too_many_animated_emoji">Nincs több hely új animált emotikonoknak.</string>
     <string name="too_many_emoji">Nincs több hely új emotikonoknak.</string>
@@ -2862,7 +2821,6 @@ Hogy minden csilivili legyen, támogatjuk a Markdown kifejezéseket, így **kiem
     <string name="tts_current">Jelenleg kiválasztott csatornához</string>
     <string name="tts_never">Soha</string>
     <string name="tutorial_close">Oks!</string>
-    <string name="tutorial_skip">Már profi vagy? [Ugord át a tippeket](onSkipClick)</string>
     <string name="tweet_us">Tweetelj nekünk</string>
     <string name="two_fa">Kétlépcsős hitelesítés</string>
     <string name="two_fa_activate">Aktiválás</string>

com.discord/res/values-it/strings.xml

@@ -2830,50 +2830,6 @@ Procedere?"</string>
     <string name="three_platform_accounts_detected">Ciao! Vuoi collegare i tuoi account **%1$s**, **%2$s** e **%3$s** per trovare altri amici che usano Discord?</string>
     <string name="three_users_typing">**%1$s**, **%2$s** e **%3$s** stanno scrivendo…</string>
     <string name="timeout_error">L’operazione ha impiegato troppo tempo, riprova.</string>
-    <string name="tip_create_first_server_body">"Clicca su questo pulsante per creare un server tutto tuo.
-
-I server sono gratuiti e puoi crearne quanti ne vuoi, così potrai interagire liberamente con gruppi diversi. Puoi anche eliminare quelli che non ti servono più."</string>
-    <string name="tip_create_first_server_title">Crea un server tutto tuo</string>
-    <string name="tip_create_more_servers_body">"Clicca su questo pulsante per creare un nuovo server.
-
-I server sono gratuiti e puoi crearne quanti ne vuoi, così potrai interagire liberamente con gruppi diversi. Puoi anche eliminare quelli che non ti servono più."</string>
-    <string name="tip_create_more_servers_title">Server a più non posso!</string>
-    <string name="tip_direct_messages_body">"Da qui potrai vedere gli utenti di tutti i server in cui ti trovi.
-
-Puoi contattare privatamente uno di questi utenti cliccando sul suo nome per aprire la finestra di chat!
-I messaggi diretti sono il modo migliore per inviare notifiche a qualcuno, anche se è inattivo."</string>
-    <string name="tip_direct_messages_title">Parla in privato</string>
-    <string name="tip_friends_list_body">"Clicca qui per mostrare i tuoi messaggi diretti e vedere lo stato degli utenti di tutti i server in cui ti trovi.
-
-I messaggi diretti che riceverai appariranno sotto il tuo avatar per facilitarne l’accesso."</string>
-    <string name="tip_friends_list_title">La lista degli utenti</string>
-    <string name="tip_instant_invite_body">"Passa il mouse su un canale testuale o vocale per mostrarne il tasto di condivisione. Usa il link generato per invitare chi vuoi direttamente in quel canale.
-
-Le impostazioni avanzate degli inviti ti permettono di imporre restrizioni specifiche sul link, come un numero massimo di utilizzi o una durata specifica."</string>
-    <string name="tip_instant_invite_title">Invita i tuoi amici</string>
-    <string name="tip_organize_by_topic_body">"I **canali testuali** ti permettono di separare le conversazioni testuali in base all’argomento trattato. Puoi passare da un canale all’altro in un attimo e puoi anche **@menzionare** gli amici per inviargli una notifica al loro client su desktop o telefono.
-
-I **canali vocali** ti permettono di separare le conversazioni vocali in gruppi piccoli o grandi, a seconda delle necessità. Clicca su un canale per entrarci. Cambiare canale testuale non avrà effetto su quello vocale a cui stai partecipando, e viceversa!"</string>
-    <string name="tip_organize_by_topic_title">Categorie di canali</string>
-    <string name="tip_server_settings_body">"Clicca qui per accedere alle impostazioni del server.
-
-Puoi modificare di tutto e di più: le autorizzazioni, i ruoli, la regione, impostare un canale per gli utenti inattivi, gestire gli inviti inviati, gli utenti banditi, e così via. Oppure puoi decidere di eliminare il server."</string>
-    <string name="tip_server_settings_title">Gestisci il tuo server</string>
-    <string name="tip_voice_conversations_body">"Questo è il tuo **pannello delle opzioni vocali.**
-
-Usa questi pulsanti per riattivare il tuo microfono, silenziare l’audio o modificare le impostazioni.
-Puoi cambiare la modalità dell’ingresso da **Attivazione vocale** a **Push-to-talk** cliccando sull’icona a ingranaggio."</string>
-    <string name="tip_voice_conversations_title">Alza la voce</string>
-    <string name="tip_whos_online_body">"Questo elenco mostra gli utenti del server attuale.
-
-Potrai vedere a cosa stanno giocando gli altri utenti se stanno usando l’app per desktop. Cliccando su un utente ne vedrai le **impostazioni individuali**, come la regolazione del volume o i comandi da amministratore."</string>
-    <string name="tip_whos_online_title">A cosa stai giocando?</string>
-    <string name="tip_writing_messages_body">"Da qui scriverai tutti i tuoi pensieri.
-
-Abbiamo anche incluso il supporto per la sintassi Markdown per permetterti di rendere ciò
-che scrivi **ben evidente** o __sottolineato come si deve__. Puoi anche **trascinare** qui
-le immagini o i file per condividerli con gli altri. Ma non esagerare, eh?"</string>
-    <string name="tip_writing_messages_title">Parla con gli altri</string>
     <string name="title">Titolo</string>
     <string name="too_many_animated_emoji">Hai finito gli slot per le emoji animate.</string>
     <string name="too_many_emoji">Hai finito gli slot per le emoji.</string>
@@ -2890,7 +2846,6 @@ le immagini o i file per condividerli con gli altri. Ma non esagerare, eh?"</str
     <string name="tts_current">Per il canale selezionato</string>
     <string name="tts_never">Mai</string>
     <string name="tutorial_close">Capito!</string>
-    <string name="tutorial_skip">Sai già tutto? [Salta i suggerimenti](onSkipClick)</string>
     <string name="tweet_us">Mandaci un tweet</string>
     <string name="two_fa">Verifica in due passaggi</string>
     <string name="two_fa_activate">Attiva</string>

com.discord/res/values-ja/strings.xml

@@ -2330,48 +2330,6 @@ Discordについて詳しい情報が必要ですか？"</string>
     <string name="this_server_named">%1$s のみ</string>
     <string name="three_users_typing">**%1$s** と **%2$s**、 **%3$s** が入力中…</string>
     <string name="timeout_error">操作の実行がタイムアウトしました。もう一度お試しください。</string>
-    <string name="tip_create_first_server_body">"+ボタンを押すことであなたのサーバーを構築する事ができます。
-
-それぞれのグループ毎にただ一つだけのサーバーを持つことができます。サーバーが不要になった場合はサーバーを消すこともできます。なにより、サーバーが無料なので欲しいだけサーバーを作ることができます。"</string>
-    <string name="tip_create_first_server_title">あなたのサーバーを作りましょう</string>
-    <string name="tip_create_more_servers_body">"+ボタンを押してサーバーを構築しましょう！
-
-サーバーの構築は無料なので、必要なだけ構築することが出来ます。各グループ毎にそれぞれのサーバーを割り当てる事ができます。もしサーバーが不要になればサーバーを削除することができます。"</string>
-    <string name="tip_create_more_servers_title">サーバーはどこにでもあります!</string>
-    <string name="tip_direct_messages_body">"このリストからサーバにいるすべてのメンバーを見ることができます。
-
-あなたはフレンドを選び、1対1のプライベートチャットをすることが出来ます。
-ダイレクトメッセージはAFKであっても通知されるので、何か伝えたい時に最適です。"</string>
-    <string name="tip_direct_messages_title">プライベートチャットの開始</string>
-    <string name="tip_friends_list_body">"ここをクリックすると、ダイレクトメッセージを表示、または参加しているすべてのサーバーのユーザーのログイン状態を見ることができます。
-
-届いたダイレクトメッセージは、あなたのアバターの下に表示され、簡単に開くことができます。"</string>
-    <string name="tip_friends_list_title">友人に会いましょう</string>
-    <string name="tip_instant_invite_body">"テキストチャンネルまたはボイスチャンネルにマウスカーソルを合わせると、共有ボタンが現れここから招待URLを作成することで、そのチャンネルに直接ユーザーを招待できます。
-
-高度な招待設定では、リンクの有効期限やリンクを利用できる回数、URLを読みやすくする設定を利用してリンクを生成することができます。"</string>
-    <string name="tip_instant_invite_title">お友達を招待する</string>
-    <string name="tip_organize_by_topic_body">"**テキストチャンネル**を使うことでチャットのやり取りを話題ごとに分けることができます。チャンネル間の移動は簡単に行え、**@メンション**で友人のデスクトップ及び携帯などに通知することができます。
-
-**ボイスチャンネル**を使うことで大小に関係なく、あなたの好きなように会話グループが作れます。クリックして会話に参加できます。テキストチャンネルを移動してもボイスチャンネルは移動しません。"</string>
-    <string name="tip_organize_by_topic_title">チャンネルについて</string>
-    <string name="tip_server_settings_body">"サーバーの設定にアクセスするにはここをクリックします。 
-
-権限や役職、音声サーバー地域を選択、AFK チャネルを設定、招待リンクの管理、BANされたユーザーの管理またはサーバーの削除などを変更できます。"</string>
-    <string name="tip_server_settings_title">サーバーの管理</string>
-    <string name="tip_voice_conversations_body">"これは、 **音声コントロールパネル** です。
-
-これらのボタンを使うことでマイクを有効にしたり、スピーカーミュートしたり、各設定を変更したりできます。
-マイク入力モードを音声検出からプッシュトゥトークに変更するには歯車ボタンをクリックしてください。"</string>
-    <string name="tip_voice_conversations_title">産声をあげましょう</string>
-    <string name="tip_whos_online_body">"このリストは現在のチャンネルにいるユーザーを表示します。
-
-デスクトップアプリを使用しているユーザーの場合、現在プレイ中のゲームも表示されます。ユーザーをクリックすることでボリュームコントロール、また管理者であれば管理者権限を実行できます。"</string>
-    <string name="tip_whos_online_title">何をプレイしていますか?</string>
-    <string name="tip_writing_messages_body">"ここに、あなたの言いたいことを入力しましょう。
-
-マークダウン記法をサポートしているので、 **要点** を示したり、 __強調__ したりできます。また、ドラッグアンドドロップで猫GIFなどの画像やファイルを簡単に共有できます。"</string>
-    <string name="tip_writing_messages_title">会話しましょう</string>
     <string name="title">タイトル</string>
     <string name="too_many_reactions_alert_body">このメッセージにはたくさんのリアクションがあるため、リアクションを追加できませんでした。</string>
     <string name="too_many_reactions_alert_header">あちゃー！</string>
@@ -2386,7 +2344,6 @@ Discordについて詳しい情報が必要ですか？"</string>
     <string name="tts_current">現在の選択したチャンネルのみ</string>
     <string name="tts_never">行わない</string>
     <string name="tutorial_close">分かった！</string>
-    <string name="tutorial_skip">もう知ってる？[tipsをスキップする](onSkipClick)</string>
     <string name="tweet_us">私たちにツイートする</string>
     <string name="two_fa">2段階認証</string>
     <string name="two_fa_activate">アクティベート</string>

com.discord/res/values-ko/strings.xml

@@ -2030,49 +2030,6 @@
     <string name="this_server">이 서버</string>
     <string name="this_server_named">%1$s 만</string>
     <string name="timeout_error">작업이 완료되는 데에 너무 오래 걸렸습니다, 다시 시도해 주세요.</string>
-    <string name="tip_create_first_server_body">"새 서버가 필요할 때는 여기에 있는 더하기 버튼을 눌러보세요.
-
-부담 없이 서버를 만들어 원하는 사람끼리 모일 수 있고 필요 없을 때는 서버를 삭제할 수 있습니다."</string>
-    <string name="tip_create_first_server_title">나만의 서버를 만들어보세요</string>
-    <string name="tip_create_more_servers_body">"새 서버가 필요할 때는 여기에 있는 더하기 버튼을 눌러보세요.
-
-부담 없이 서버를 만들어 원하는 사람끼리 모일 수 있고 필요 없을 때는 서버를 삭제할 수 있습니다."</string>
-    <string name="tip_create_more_servers_title">서버를 잔뜩 만들어보세요!</string>
-    <string name="tip_direct_messages_body">"자신이 속한 서버에 있는 사람들을 여기에서 확인해보세요.
-
-개인적으로 할 말이 있는 상대를 선택해보세요!
-개인 메시지를 받은 상대는 알림이 나타나기 때문에 잠수라도 문제 없습니다."</string>
-    <string name="tip_direct_messages_title">개인적인 대화를 나눠보세요</string>
-    <string name="tip_friends_list_body">"여기를 누르면 개인 메시지와 서버 내 사람들의 상황을 확인해볼 수 있습니다.
-
-개인 메시지를 받으면 자신의 아바타 밑에 나타나 쉽게 확인할 수 있습니다."</string>
-    <string name="tip_friends_list_title">친구와 만나보세요</string>
-    <string name="tip_instant_invite_body">"텍스트 채널이나 음성 채널에 마우스를 올리면 공유 버튼이 나타납니다. 초대하고 싶은 채널에서 링크를 만들고 공유해보세요.
-
-고급 설정에서는 사용 횟수나 유효시간에 제한을 둘 수 있습니다."</string>
-    <string name="tip_instant_invite_title">친구를 초대해보세요</string>
-    <string name="tip_organize_by_topic_body">"**채팅 채널**을 이용해 주제 별로 다른 이야기를 나눠보세요. 당신은 채널들을 자유로이 돌아다닐 수 있고 **@언급**을 통해 친구들의 데스크탑PC 나 핸드폰에 알림을 보내세요.
-
-**음성 채널**을 이용해 당신이 원하는 만큼의 사람들과 대화를 나눠보세요.
-대화에 참여하려면 채널을 클릭하세요. 채팅 채널로 돌아가도 음성 채널에 남아있게 됩니다."</string>
-    <string name="tip_organize_by_topic_title">채널별로 정리해보세요</string>
-    <string name="tip_server_settings_body">"서버 설정을 바꾸고 싶다면 여기를 눌러보세요.
-
-권한이나 역할, 서버 위치, 잠수 채널, 초대 링크, 차단 목록 등을 여기에서 관리할 수 있으며, 서버 삭제도 여기에서 할 수 있습니다."</string>
-    <string name="tip_server_settings_title">서버를 관리해보세요</string>
-    <string name="tip_voice_conversations_body">"여기에서 **음성 설정**을 변경할 수 있습니다.
-
-마이크와 소리를 켜고 끄거나 설정을 변경할 수 있습니다.
-녹음 방식을 **음성 감지에서 누르며 말하기(PTT)**로 변경하려면 톱니바퀴 모양을 눌러보세요."</string>
-    <string name="tip_voice_conversations_title">목소리를 내보세요</string>
-    <string name="tip_whos_online_body">"현재 보고 있는 채널에 누가 있는지는 여기에서 확인할 수 있습니다.
-
-데스크톱 버전을 사용하는 사람은 자신이 하고 있는 게임의 이름도 표시되며, 원하는 사람을 선택해 개별적으로 음량을 조정하거나 관리할 수 있는 **설정 창**을 열어볼 수 있습니다."</string>
-    <string name="tip_whos_online_title">무얼 하고 있나요?</string>
-    <string name="tip_writing_messages_body">"자신의 의견과 아이디어를 적는 곳입니다.
-
-멋진 사용을 위해 마크다운 문법을 지원합니다. **강조** 하거나 __밑줄__을 그을 수 있고, 이미지나 파일을 여기에 **드래그 &amp; 드롭** 해서 고양이 GIF같은걸 빠르게 공유 할 수 있습니다. 너무 많이는 말고요."</string>
-    <string name="tip_writing_messages_title">대화를 나눠보세요</string>
     <string name="title">제목</string>
     <string name="too_many_emoji">이모지 창이 가득 찼습니다.</string>
     <string name="too_many_reactions_alert_body">이 메세지에는 반응이 너무 많기 때문에 당신의 반응이 추가되지 않았습니다.</string>
@@ -2088,7 +2045,6 @@
     <string name="tts_current">보고 있는 채널만</string>
     <string name="tts_never">사용 안 함</string>
     <string name="tutorial_close">알겠어요!</string>
-    <string name="tutorial_skip">이미 잘 알고 계시나요? [팁을 생략할 수 있습니다](onSkipClick)</string>
     <string name="tweet_us">트위터에서 알려주세요</string>
     <string name="two_fa">2단계 인증</string>
     <string name="two_fa_activate">활성화하기</string>

com.discord/res/values-lt/strings.xml

@@ -2721,49 +2721,6 @@ Ar tikrai norite tęsti?"</string>
     <string name="three_platform_accounts_detected">Ei! Ar norėtum prijungti savo **%1$s**, **%2$s** ir **%3$s** paskyras, kad rastum draugus, kurie irgi naudoja Discord?</string>
     <string name="three_users_typing">**%1$s**, **%2$s** ir **%3$s** rašo…</string>
     <string name="timeout_error">Operacija per ilgai užtruko, prašome bandyti dar kartą.</string>
-    <string name="tip_create_first_server_body">"Spustelėkite šį plius mygtuką, kad sukurtumėte naują serverį. 
-
-Kiekvienas serveris leidžia Jums turėti unikalią vietą įvairioms žmonių grupėms. Jūs galite ištrinti serverius, jei jums jų nebereikia. Vienas iš geriausių dalykų, serveriai yra nemokami, galite sukurti tiek, kiek norite."</string>
-    <string name="tip_create_first_server_title">Sukurti Savo Serverį</string>
-    <string name="tip_create_more_servers_body">"Spustelėkite šį plius mygtuką, kad sukurtumėte naują serverį. 
-
-Serveriai yra nemokami, galite sukurti tiek, kiek norite. Kiekviename serveryje Jums leidžia turėti unikalią vietą įvairioms žmonių grupėms. Jūs galite ištrinti serverius, jei jums jų nebereikia."</string>
-    <string name="tip_create_more_servers_title">Serveriai Visur!</string>
-    <string name="tip_direct_messages_body">"Čia galite matyti visus vartotojus iš visų savo serverių.
-
-Galite turėti akis į akį pokalbį pasirenkant bet kurį draugą!
-Asmeninės žinutės yra puikios norint susisiekti su žmogumi net tada, kai jie yra nuėję nuo kompiuterio."</string>
-    <string name="tip_direct_messages_title">Pradėti privatų pokalbį</string>
-    <string name="tip_friends_list_body">"Spauskite čia, norėdami peržiūrėti asmenines žinutes ir naudotojų būseną visuose serveriuose.
-
-Kai gausite AŽ tiesioginę žinutę, ji pasirodys čia po Jūsų avataru."</string>
-    <string name="tip_friends_list_title">Matyti savo draugus</string>
-    <string name="tip_instant_invite_body">"Pelyte užvedus ant teksto ar balso kanalo galima rasti dalinimosi mygtuką. Panaudojus sukurta nuorodą galima vartotojus pakviesti tiesiai į pasirinktąjį kanalą.
-
-Sudėtingesnės nuorodos taip pat leidžia Jums nustatyti leidžiama vartotojų kiekį ir kiek nuoroda galios laiko."</string>
-    <string name="tip_instant_invite_title">Pakvieskite savo draugus</string>
-    <string name="tip_organize_by_topic_body">"**Pokalbių kanalai** leidžia atskirti pokalbius pagal temą. Galite lengvai judėti tarp kanalų ir **@paminėti** draugus, kad nusiųstų pranešimą į jų darbalaukį ar telefoną.
-
-**Balso kanalai** leidžia atskirti savo pokalbius į mažesnes ar didesnes grupes. 
-Spustelėkite ant kanalo, kad prisijungtumėte prie balso pokalbių. Jūs liksite balso kanaluose net jeigu pakeisite pokalbių kanalą!"</string>
-    <string name="tip_organize_by_topic_title">Organizuokite pagal Kanalus</string>
-    <string name="tip_server_settings_body">"Norint keisti serverio nustatymus spauskite čia.
-
-Galite keisti visokio tipo leidimus ir roles, pasirinkti serverio regioną, tvarkyti AFK kanalą, keisti pakvietimus bei užblokuotus naudotojus ar net ištrinti visą serverį."</string>
-    <string name="tip_server_settings_title">Valdyti savo serverį</string>
-    <string name="tip_voice_conversations_body">"Tai yra jūsų **balso valdymo skydas.**
-
-Naudokite šiuos mygtukus, norėdami įjungti mikrofoną, išjungti ausines ar tvarkyti nustatymus.
-Galite keisti kalbėjimo režimą iš **funkcijos \"Voice Activity\" į funkciją \"Push to talk\"** paspausdami nustatymų mygtuką."</string>
-    <string name="tip_voice_conversations_title">Padidinti balso garsumą</string>
-    <string name="tip_whos_online_body">"Šiame sąraše parodomi prie dabartinio kanalo prisijungę žmonės.
-
-Naudojant kompiuterio aplikaciją taip pat galima matyti kas kokį žaidimą žaidžia. Paspaudus ant naudotojo vardo bus galima keisti **asmeninius nustatymus**, t.y. garsumas, nutildymas ir t.t."</string>
-    <string name="tip_whos_online_title">Kokį Žaidimą Jūs Žaidžiate?</string>
-    <string name="tip_writing_messages_body">"Čia galėsite rašyti savo nuomonę ir idėjas.
-
-Kad būtų dar įmantriau, mes įdėjome Žymėjimo sintaksės pagalbą, dabar galite **žymėti viską** ar __trypti kojomis. __Taip pat galite **įdėti** nuotraukas ar failus, kad būtų galima greičiau dalintis tais kačių GIF'ais. Aišku, ne per daug."</string>
-    <string name="tip_writing_messages_title">Pasikalbėti</string>
     <string name="title">Pavadinimas</string>
     <string name="too_many_animated_emoji">Jums nebeliko vietos naujiems animuotiems emoji.</string>
     <string name="too_many_emoji">Jums nebeliko vietos naujiems emoji.</string>
@@ -2779,7 +2736,6 @@ Kad būtų dar įmantriau, mes įdėjome Žymėjimo sintaksės pagalbą, dabar g
     <string name="tts_current">Dabar pasirinktam kanalui</string>
     <string name="tts_never">Niekada</string>
     <string name="tutorial_close">Supratau!</string>
-    <string name="tutorial_skip">Jau PRO? [Praleisti patarimus](onSkipClick)</string>
     <string name="tweet_us">\"Patweetinkit\" Mums</string>
     <string name="two_fa">Dviejų faktorių atpažinimas</string>
     <string name="two_fa_activate">Aktyvinti</string>

com.discord/res/values-nl/strings.xml

@@ -1850,47 +1850,6 @@ Weet u zeker dat u dit wil?"</string>
     <string name="theme_dark">Donker</string>
     <string name="theme_light">Licht</string>
     <string name="this_server">Deze server</string>
-    <string name="tip_create_first_server_body">"Klik op deze plusknop om je eigen server aan te maken.
-
-Omdat servers gratis zijn, kun je er zo veel maken als je zelf wilt. Elke server geeft je een unieke plek om met verschillende groepen mensen samen te komen. Je kunt servers ook verwijderen als je ze niet meer nodig hebt."</string>
-    <string name="tip_create_first_server_title">Maak je eigen server aan</string>
-    <string name="tip_create_more_servers_body">"Klik op deze plusknop om een nieuwe server aan te maken.
-
-Omdat servers gratis zijn, kun je er zo veel maken als je zelf wilt. Elke server geeft je een unieke plek om met verschillende groepen mensen samen te komen. Je kunt servers ook verwijderen als je ze niet meer nodig hebt."</string>
-    <string name="tip_create_more_servers_title">Overal servers!</string>
-    <string name="tip_direct_messages_body">"Bekijk alle leden van al je servers via deze lijst. 
-
-Je kunt een privégesprek beginnen door een vriend te selecteren. Persoonlijke berichten zijn ideaal om mensen te bereiken via notificaties als ze eventjes weg zijn."</string>
-    <string name="tip_direct_messages_title">Begin een privégesprek</string>
-    <string name="tip_friends_list_body">"Klik hier om je persoonlijke berichten te bekijken en de status van iedereen in al je servers te zien.
-
-Als je een persoonlijk bericht ontvangt zal deze verschijnen naast je profielafbeelding zodat je het bericht eenvoudig kunt openen."</string>
-    <string name="tip_friends_list_title">Bekijk je vrienden</string>
-    <string name="tip_instant_invite_body">"Houd je muis over welk tekst- of spraakkanaal dan ook om de deelknop weer te geven. Gebruik de gegenereerde koppeling om mensen direct uit te nodigen voor het gekozen kanaal.
-
-Geavanceerde uitnodigingslinks geven je de mogelijkheid om gebruikslimieten in te stellen, zoals hoeveel mensen kunnen verbinden met die koppeling of hoe lang de koppeling werkt."</string>
-    <string name="tip_instant_invite_title">Nodig je vrienden uit</string>
-    <string name="tip_organize_by_topic_body">"Met **tekstkanalen** kun je gesprekken opdelen per onderwerp. Je kunt gemakkelijk wisselen tussen kanalen en je vrienden **@vermelden** om een notificatie naar hun desktop of telefoon te sturen.
-
-Met **spraakkanalen** kun je met kleine of grote groepen praten.
-Klik op een kanaal om deel te nemen aan het gesprek. Zelfs als je van tekstkanaal wisselt, blijf je in het spraakkanaal!"</string>
-    <string name="tip_organize_by_topic_title">Gebruik meerdere Kanalen</string>
-    <string name="tip_server_settings_body">"Klik hier om de serverinstellingen te openen.
-
-Je kunt allerlei dingen aanpassen zoals rechten en rollen, je serverregio kiezen, een AFK-kanaal opzetten, uitnodigingen beheren, verbannen gebruikers beheren of zelfs je server helemaal verwijderen."</string>
-    <string name="tip_server_settings_title">Beheer je server</string>
-    <string name="tip_voice_conversations_body">"Dit is je **spraak-configuratiescherm**.
-
-Gebruik deze knoppen om je microfoon of koptelefoon te dempen of instellingen aan te passen. Je kunt je spraakmodus aanpassen van **spraakactivatie naar push-to-talk** door op het tandwiel te klikken."</string>
-    <string name="tip_voice_conversations_title">Laat van je horen</string>
-    <string name="tip_whos_online_body">"Deze lijst laat zien wie er in het huidige kanaal zitten.
-
-Van iedereen die de desktop-app gebruikt kun je zien welk spel ze nu spelen. Als je op een gebruiker klikt zie je de **individuele instellingen** zoals volume en admin-instellingen."</string>
-    <string name="tip_whos_online_title">Wat ben je aan het spelen?</string>
-    <string name="tip_writing_messages_body">"Hier kun je al je meningen en ideeën kwijt.
-
-We hebben ondersteuning voor markdownsyntax toegevoegd zodat je **jezelf duidelijk kunt maken** of __met je voeten kunt stampen__. Je kunt ook afbeeldingen en bestanden **hierheen slepen** om snel kattenanimaties te delen. Maar probeer je wel in te houden."</string>
-    <string name="tip_writing_messages_title">Start een gesprek</string>
     <string name="title">Titel</string>
     <string name="too_many_reactions_alert_header">"D'oh!"</string>
     <string name="total_results">%1$s</string>
@@ -1903,7 +1862,6 @@ We hebben ondersteuning voor markdownsyntax toegevoegd zodat je **jezelf duideli
     <string name="tts_current">Voor het momenteel geselecteerde kanaal</string>
     <string name="tts_never">Nooit</string>
     <string name="tutorial_close">Begrepen!</string>
-    <string name="tutorial_skip">Heb je al ervaring? [Sla de tips over](onSkipClick)</string>
     <string name="tweet_us">Tweet ons</string>
     <string name="two_fa">Tweetrapsauthenticatie</string>
     <string name="two_fa_activate">Activeren</string>

com.discord/res/values-no/strings.xml

@@ -1299,43 +1299,6 @@ Er du sikker på at du vil gjøre dette?"</string>
     <string name="theme_light">Lys</string>
     <string name="theme_updated">Temaet har blitt oppdatert.</string>
     <string name="this_server">Denne serveren</string>
-    <string name="tip_create_first_server_body">"Klikk på denne pluss-knappen for å lage din egen server.
-
-Hver server lar deg ha et unikt sted for ulike grupper av mennesker. Du kan og slette en server
-dersom du ikke trenger den lenger. Best av alt; fordi serverne er gratis, kan du lage så mange
-du vil."</string>
-    <string name="tip_create_first_server_title">Opprett din egen server</string>
-    <string name="tip_create_more_servers_body">"Klikk på denne pluss knappen for å opprette en ny server.
-
-Du kan opprette så mange servere du vil, helt gratis. Hver server lar deg ha en unik plass for forskjellige grupper av folk. Du kan også slette servere hvis du ikke trenger den lenger."</string>
-    <string name="tip_create_more_servers_title">Servere overalt!</string>
-    <string name="tip_direct_messages_body">"Se alle på tvers av alle dine servere fra denne listen.
-
-Du kan ha en privat en-til-en chat-samtale ved å velge en venn og prate i vei!
-Direktemeldinger er toppers for å nå folk via varslinger selv om de er borte fra skjermen."</string>
-    <string name="tip_direct_messages_title">Start en privat samtale</string>
-    <string name="tip_friends_list_body">"Klikk her for å vise direktemeldinger og se statusene til alle medlemmene i alle serverene dine.
-
-Når du mottar en direktemelding, vil det dukke opp under avataren din her for enkel tilgang."</string>
-    <string name="tip_friends_list_title">Se vennene dine</string>
-    <string name="tip_instant_invite_title">Inviter vennene dine</string>
-    <string name="tip_organize_by_topic_title">Organiser etter kanaler</string>
-    <string name="tip_server_settings_body">"Klikk her for tilgang til dine server innstillinger.
-
-Du kan endre alle slags ting som tillatelser og roller, velge region for din tale-server, sette opp en AFK-kanal,
-administrere invitasjonlenker, administrere utestengte brukere, eller til og med slette serveren din fullstendig."</string>
-    <string name="tip_server_settings_title">Kontroller serveren din</string>
-    <string name="tip_voice_conversations_body">"Dette er ditt **kontrollpanel for tale.**
-
-Bruk disse knappene for å fjerne demping av din mikrofon, slå av lyd, eller endre innstillinger.
-Du kan justere din talemodus fra **taleaktivitet til trykk-og-snakk** ved å trykke på tannhjulet."</string>
-    <string name="tip_voice_conversations_title">Hev Stemmen Din</string>
-    <string name="tip_whos_online_body">"Denne listen viser hvem som er i den aktuelle kanalen.
-
-Alle som bruker skrivebordsapplikasjonen vil også vise hvilket spill de spiller. Ved å klikke på en
-bruker vil du få opp **individuelle innstillinger** som volum- eller adminkontroller."</string>
-    <string name="tip_whos_online_title">Hva spiller du?</string>
-    <string name="tip_writing_messages_title">Ha en samtale</string>
     <string name="tr">Tyrkisk</string>
     <string name="transfer_ownership">Overfør eierskap</string>
     <string name="try_again">Prøv igjen</string>
@@ -1343,7 +1306,6 @@ bruker vil du få opp **individuelle innstillinger** som volum- eller adminkontr
     <string name="tts_current">For gjeldende kanal</string>
     <string name="tts_never">Aldri</string>
     <string name="tutorial_close">Forstått!</string>
-    <string name="tutorial_skip">Allerede en proff? [Hopp over tipsene](onSkipClick)</string>
     <string name="tweet_us">Tweet oss</string>
     <string name="two_users_typing">**%1$s** og **%2$s** skriver…</string>
     <string name="uk">Ukrainsk</string>

com.discord/res/values-pl/strings.xml

@@ -2772,50 +2772,6 @@ Czy jesteś pewien, że chcesz to zrobić?"</string>
     <string name="three_platform_accounts_detected">Witaj! Czy chcesz połączyć swoje konta **%1$s**, **%2$s** i **%3$s**, aby znaleźć znajomych, którzy też mają Discorda?</string>
     <string name="three_users_typing">**%1$s**, **%2$s** i **%3$s** piszą…</string>
     <string name="timeout_error">Operacja zajęła zbyt długo, spróbuj ponownie.</string>
-    <string name="tip_create_first_server_body">"Kliknij na plus, aby stworzyć swój własny serwer.
-
-Każdy serwer pozwala Ci na posiadanie własnego miejsca dla różnych grup znajomych. Możesz zawsze usunąć serwer jeśli nie ma już na niego potrzeby. A co najlepsze, możesz tworzyć tyle serwerów ile Ci się podoba, ponieważ wszystkie są za darmo."</string>
-    <string name="tip_create_first_server_title">Stwórz swój własny serwer</string>
-    <string name="tip_create_more_servers_body">"Kliknij przycisk plusa by utworzyć nowy serwer.
-
-Ponieważ serwery są darmowe, możesz stworzyć ich dowolną liczbę. Każdy serwer pozwala Ci stworzyć unikatowe miejsce dla różnych grup ludzi. Możesz również usunąć serwery, gdy przestaną być potrzebne."</string>
-    <string name="tip_create_more_servers_title">Serwery wszędzie!</string>
-    <string name="tip_direct_messages_body">"Możesz widzieć wszystkich znajomych ze wszystkich Twoich serwerów.
-
-Z każdym z nich możesz rozpocząć prywatną konwersacje poprzez wybranie znajomego z listy. Prywatne wiadomości są świetnym sposobem by skontaktować się z pojedynczą osobą, nawet jeśli są zajęci czymś innym. Jest to możliwe dzięki powiadomieniom na ich urządzeniu."</string>
-    <string name="tip_direct_messages_title">Rozpocznij prywatną konwersację</string>
-    <string name="tip_friends_list_body">"Kliknij tutaj, aby wyświetlić prywatne wiadomości i status każdego użytkownika na wszystkich swoich serwerach.
-
-Otrzymane prywatne wiadomości ukażą się pod Twoim awatarem dla szybkiego i łatwego dostępu."</string>
-    <string name="tip_friends_list_title">Zobacz znajomych</string>
-    <string name="tip_instant_invite_body">"Najedź myszką na jakikolwiek kanał tekstowy lub głosowy, by odkryć przycisk udostępniania. Użyj wygenerowanego linka, by zapraszać ludzi na wybrany kanał.
-
-Zaawansowane ustawienia zaproszeń pozwalają na ograniczenie ilości zapraszanych ludzi lub dozwolonego czasu ważności zapraszania."</string>
-    <string name="tip_instant_invite_title">Zaproś swoich znajomych</string>
-    <string name="tip_organize_by_topic_body">"**Kanały tekstowe** pozwalają Tobie dzielić czaty na tematy. Możesz swobodnie się poruszać między kanałami, a nawet **@wzmieniać** o znajomych, aby wysłać powiadomienie na ich pulpit lub telefon.
-
-**Kanały głosowe** pozwalają Tobie dzielić rozmowy na grupy o dowolnej wielkości. Kliknij na kanał aby dołączyć do rozmowy. Zostaniesz w tym kanale nawet gdy przejdziesz na inny kanał tekstowy!"</string>
-    <string name="tip_organize_by_topic_title">Organizacja kanałów</string>
-    <string name="tip_server_settings_body">"Kliknij tutaj, aby uzyskać dostęp do ustawień Twojego serwera.
-
-Możesz modyfikować wiele różnych rzeczy, takich jak uprawnienia i role, wybór regionu swoich serwerów głosowych,
-ustawienia kanału AFK, zarządzanie linkami z zaproszeniami, zbanowanymi użytkownikami lub nawet całkowite usunięcie twojego serweru."</string>
-    <string name="tip_server_settings_title">Kontroluj swój serwer</string>
-    <string name="tip_voice_conversations_body">"To jest Twój **panel sterowania głosem**.
-
-Użyj tych przycisków aby włączyć mikrofon, wyłączyć dźwięk lub zmodyfikować ustawienia.
-Możesz zmienić swój tryb przechwytywania z **Aktywacji Głosowej na Naciśnij I Mów** klikając na zębatkę."</string>
-    <string name="tip_voice_conversations_title">Mów głośniej</string>
-    <string name="tip_whos_online_body">"Ta lista pokazuje kto jest obecny na kanale.
-
-Przy każdym kto używa pobranej aplikacji widoczny będzie również tytuł obecnie uruchomionej gry. Kliknięcie na nazwę użytkownika odkryje jego **ustawienia indywidualne**, jak kontrola głośności czy opcje administracyjne."</string>
-    <string name="tip_whos_online_title">W co grasz?</string>
-    <string name="tip_writing_messages_body">"To jest miejsce gdzie będzisz wpisywał wszystkie swoje opcje i pomysły.
-
-Aby było wszystko tip-top, dołączyliśmy składnę dla zaznaczeń, żeby wskazać **coś ważnego** lub
-__tupnąć w podłogę.__ Możesz także **przeciągać i upuszczać** obrazki oraz pliki w tym miejscu aby szybko
-się podzielić tymi kocimi gifami. Tylko nie przesadzaj."</string>
-    <string name="tip_writing_messages_title">Porozmawiaj z innymi</string>
     <string name="title">Tytuł</string>
     <string name="too_many_animated_emoji">Skończyły ci się sloty na animowane emoji.</string>
     <string name="too_many_emoji">Skończyły ci się sloty na emoji.</string>
@@ -2831,7 +2787,6 @@ się podzielić tymi kocimi gifami. Tylko nie przesadzaj."</string>
     <string name="tts_current">Dla aktualnie wybranego kanału</string>
     <string name="tts_never">Nigdy</string>
     <string name="tutorial_close">Zrozumiano!</string>
-    <string name="tutorial_skip">Już to wiesz? [Pomiń porady](onSkipClick)</string>
     <string name="tweet_us">Tweetnij do nas</string>
     <string name="two_fa">Weryfikacja dwuetapowa</string>
     <string name="two_fa_activate">Aktywuj</string>

com.discord/res/values-pt-rBR/strings.xml

@@ -2837,52 +2837,6 @@ Deseja mesmo fazer isso?"</string>
     <string name="three_platform_accounts_detected">Ei! Você gostaria de conectar suas contas do **%1$s**, **%2$s** e **%3$s** para encontrar amigos que também usam o Discord?</string>
     <string name="three_users_typing">**%1$s**, **%2$s** e **%3$s** estão digitando…</string>
     <string name="timeout_error">A operação demorou muito para ser concluída. Por favor, tente novamente.</string>
-    <string name="tip_create_first_server_body">"Clique neste botão de mais para criar seu próprio servidor.
-
-Cada servidor lhe permite ter um lugar único para diferentes grupos de pessoas. Você também pode excluir um servidor caso não precise mais dele. O melhor de tudo: como servidores são gratuitos, você pode criar quantos quiser."</string>
-    <string name="tip_create_first_server_title">Crie seu próprio servidor</string>
-    <string name="tip_create_more_servers_body">"Clique neste botão de mais para criar um novo servidor.
-
-Como os servidores são gratuitos, você pode criar quantos quiser. Cada servidor lhe permite ter um lugar único para diferentes grupos de pessoas. Você também pode excluir servidores se não precisar mais deles."</string>
-    <string name="tip_create_more_servers_title">Servidores em todo lugar!</string>
-    <string name="tip_direct_messages_body">"Veja as pessoas de todos os seus servidores nesta lista.
-
-Você pode ter uma conversa privada simplesmente escolhendo um amigo e começar a conversar.
-Mensagens diretas são uma ótima forma de alcançar as pessoas através de notificações mesmo quando estão ausentes."</string>
-    <string name="tip_direct_messages_title">Iniciar uma conversa privada</string>
-    <string name="tip_friends_list_body">"Clique aqui para ver suas mensagens diretas e o status de todos em seus servidores.
-
-Ao receber uma mensagem direta, será mostrada abaixo do seu avatar para fácil acesso."</string>
-    <string name="tip_friends_list_title">Veja seus amigos</string>
-    <string name="tip_instant_invite_body">"Passe o mouse por cima de qualquer canal de texto ou voz para revelar o botão de compartilhar. Use o link gerado para convidar pessoas diretamente ao canal escolhido.
-
-Links de convite avançados permitem que você configure restrições de uso, como quantas pessoas podem usar o link ou por quanto tempo ele vai funcionar."</string>
-    <string name="tip_instant_invite_title">Convide seus amigos</string>
-    <string name="tip_organize_by_topic_body">"Os **canais de texto** permitem que você separe suas conversas em tópicos. Você pode alternar
-entre esses canais facilmente e até **@mencionar** amigos para enviar notificações aos seus
-computadores ou celulares.
-
-Os **canais de voz** permitem que você separe suas conversas em grupos pequenos ou grandes,
-como você quiser. Clique em um canal de voz para se conectar. Você ficará naquele canal de voz 
-mesmo que alterne entre canais de texto!"</string>
-    <string name="tip_organize_by_topic_title">Organizar por canais</string>
-    <string name="tip_server_settings_body">"Clique aqui para acessar as configurações do seu servidor.
-
-Você pode alterar o que quiser: permissões, cargos, alterar a região, criar um canal para ausentes, gerenciar convites e usuários banidos ou até mesmo excluir o seu servidor."</string>
-    <string name="tip_server_settings_title">Controle seu servidor</string>
-    <string name="tip_voice_conversations_body">"Este é seu **painel de controle de voz.**
-
-Use esses botões para reativar seu microfone, silenciar o áudio ou modificar as configurações.
-Você pode mudar seu modo de fala de **detecção de voz** para **pressionar-para-falar** ao clicar na engrenagem."</string>
-    <string name="tip_voice_conversations_title">Aumente sua voz</string>
-    <string name="tip_whos_online_body">"Esta lista mostra quem está no canal atual.
-
-Qualquer um utilizando o aplicativo no computador também mostrará o que está jogando no momento. Clicar em um usuário revelará **configurações individuais**, como controle de volume ou controles de administrador."</string>
-    <string name="tip_whos_online_title">O que está jogando?</string>
-    <string name="tip_writing_messages_body">"É aqui que você estará digitando todas as suas opiniões e ideias.
-
-Para deixar as coisas mais refinadas, incluímos a sintaxe Markdown para que você possa **chamar a atenção** ou __bater o pé.__ Você também pode **arrastar e soltar** imagens ou arquivos aqui diretamente para compartilhar aqueles GIFs de gatinhos. Mas não muitos."</string>
-    <string name="tip_writing_messages_title">Converse</string>
     <string name="title">Título</string>
     <string name="too_many_animated_emoji">Não há mais espaço para emojis animados.</string>
     <string name="too_many_emoji">Não há mais espaço para emojis.</string>
@@ -2898,7 +2852,6 @@ Para deixar as coisas mais refinadas, incluímos a sintaxe Markdown para que voc
     <string name="tts_current">Para o canal atual</string>
     <string name="tts_never">Nunca</string>
     <string name="tutorial_close">Entendi!</string>
-    <string name="tutorial_skip">Já sabe de tudo? Sabichão… [Desative as dicas](onSkipClick)</string>
     <string name="tweet_us">Envie um tweet para nós</string>
     <string name="two_fa">Verificação em duas etapas</string>
     <string name="two_fa_activate">Ativar</string>