diff --git a/app/src/main/res/drawable/toggle_small.9.png b/app/src/main/res/drawable/toggle_small.9.png
new file mode 100644
index 00000000..5b910ee2
Binary files /dev/null and b/app/src/main/res/drawable/toggle_small.9.png differ
diff --git a/app/src/main/res/drawable/toggle_small.xml b/app/src/main/res/drawable/toggle_small.xml
deleted file mode 100644
index b6b80bfc..00000000
--- a/app/src/main/res/drawable/toggle_small.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/color_background_dark" />
-    <corners android:radius="3dp" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/toggle_small_light.9.png b/app/src/main/res/drawable/toggle_small_light.9.png
new file mode 100644
index 00000000..24bb1f7e
Binary files /dev/null and b/app/src/main/res/drawable/toggle_small_light.9.png differ
diff --git a/app/src/main/res/drawable/toggle_small_light.xml b/app/src/main/res/drawable/toggle_small_light.xml
deleted file mode 100644
index 6f317d60..00000000
--- a/app/src/main/res/drawable/toggle_small_light.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="#ffefefef" />
-    <corners android:radius="2dp" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_status.xml b/app/src/main/res/layout/item_status.xml
index 41112611..ad8c21f7 100644
--- a/app/src/main/res/layout/item_status.xml
+++ b/app/src/main/res/layout/item_status.xml
@@ -119,35 +119,34 @@
     </RelativeLayout>
 
     <com.keylesspalace.tusky.view.FlowLayout
+        android:id="@+id/status_content_warning_bar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:id="@+id/status_content_warning_bar"
-        android:visibility="gone"
-        android:layout_toRightOf="@+id/status_avatar"
-        android:layout_toEndOf="@+id/status_avatar"
         android:layout_below="@+id/status_name_bar"
         android:layout_marginBottom="4dp"
-        app:paddingHorizontal="4dp"
-        android:focusable="true">
+        android:layout_toEndOf="@+id/status_avatar"
+        android:layout_toRightOf="@+id/status_avatar"
+        android:focusable="true"
+        android:visibility="gone"
+        app:paddingHorizontal="4dp">
 
         <TextView
+            android:id="@+id/status_content_warning_description"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:id="@+id/status_content_warning_description"
             android:textColor="?android:textColorPrimary" />
 
         <ToggleButton
+            android:id="@+id/status_content_warning_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:minWidth="0dp"
+            android:background="?attr/content_warning_button"
             android:minHeight="0dp"
-            android:id="@+id/status_content_warning_button"
-            android:textOn="@string/status_content_warning_show_less"
-            android:textOff="@string/status_content_warning_show_more"
-            android:padding="3dp"
-            android:textSize="12sp"
+            android:minWidth="0dp"
             android:textAllCaps="true"
-            android:background="?attr/content_warning_button" />
+            android:textOff="@string/status_content_warning_show_more"
+            android:textOn="@string/status_content_warning_show_less"
+            android:textSize="12sp" />
 
     </com.keylesspalace.tusky.view.FlowLayout>