diff --git a/app/src/main/res/layout/item_status.xml b/app/src/main/res/layout/item_status.xml
index cc609016b..bfe1a3a0e 100644
--- a/app/src/main/res/layout/item_status.xml
+++ b/app/src/main/res/layout/item_status.xml
@@ -94,29 +94,28 @@
             android:layout_below="@id/status_display_name"
             android:lineSpacingMultiplier="1.1"
             android:textColor="?android:textColorPrimary"
-            android:visibility="gone"
-            android:textSize="?attr/status_text_medium" />
+            android:textSize="?attr/status_text_medium"
+            android:visibility="gone" />
 
         <ToggleButton
             android:id="@+id/status_content_warning_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@+id/status_content_warning_description"
-            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="4dp"
+            android:layout_marginTop="4dp"
             android:background="?attr/content_warning_button"
             android:minHeight="0dp"
             android:minWidth="150dp"
-            android:paddingBottom="6dp"
+            android:paddingBottom="4dp"
             android:paddingLeft="16dp"
             android:paddingRight="16dp"
-            android:paddingTop="6dp"
-            android:layout_marginTop="4dp"
-            android:layout_marginBottom="4dp"
+            android:paddingTop="4dp"
             android:textAllCaps="true"
             android:textOff="@string/status_content_warning_show_more"
             android:textOn="@string/status_content_warning_show_less"
-            android:visibility="gone"
-            android:textSize="?attr/status_text_medium" />
+            android:textSize="?attr/status_text_medium"
+            android:visibility="gone" />
     </RelativeLayout>
 
     <TextView
diff --git a/app/src/main/res/layout/item_status_detailed.xml b/app/src/main/res/layout/item_status_detailed.xml
index f442a4169..18085df3d 100644
--- a/app/src/main/res/layout/item_status_detailed.xml
+++ b/app/src/main/res/layout/item_status_detailed.xml
@@ -60,7 +60,7 @@
         android:lineSpacingMultiplier="1.1"
         android:textColor="?android:textColorPrimary"
         android:textIsSelectable="true"
-        android:textSize="?attr/status_text_medium"
+        android:textSize="?attr/status_text_large"
         tools:text="CW this is a long long long long long long long long content warning" />
 
     <ToggleButton
@@ -68,20 +68,19 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@+id/status_content_warning_description"
-        android:layout_centerHorizontal="true"
         android:layout_marginBottom="4dp"
         android:layout_marginTop="4dp"
         android:background="?attr/content_warning_button"
         android:minHeight="0dp"
         android:minWidth="150dp"
-        android:paddingBottom="6dp"
+        android:paddingBottom="4dp"
         android:paddingLeft="16dp"
         android:paddingRight="16dp"
-        android:paddingTop="6dp"
+        android:paddingTop="4dp"
         android:textAllCaps="true"
         android:textOff="@string/status_content_warning_show_more"
         android:textOn="@string/status_content_warning_show_less"
-        android:textSize="?attr/status_text_medium" />
+        android:textSize="?attr/status_text_large" />
 
     <TextView
         android:id="@+id/status_content"
diff --git a/app/src/main/res/layout/item_status_notification.xml b/app/src/main/res/layout/item_status_notification.xml
index 6f898b35d..415727121 100644
--- a/app/src/main/res/layout/item_status_notification.xml
+++ b/app/src/main/res/layout/item_status_notification.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--This applies only to favourite and rebnotificationsEnabledions.-->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/notification_container"
     android:layout_width="match_parent"
@@ -89,14 +88,14 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@+id/notification_content_warning_description"
-        android:layout_centerHorizontal="true"
+        android:layout_toEndOf="@id/notification_status_avatar"
         android:background="?attr/content_warning_button"
         android:minHeight="0dp"
         android:minWidth="150dp"
-        android:paddingBottom="6dp"
+        android:paddingBottom="4dp"
         android:paddingLeft="16dp"
         android:paddingRight="16dp"
-        android:paddingTop="6dp"
+        android:paddingTop="4dp"
         android:layout_marginTop="4dp"
         android:layout_marginBottom="4dp"
         android:textAllCaps="true"