diff --git a/app/src/main/res/layout-sw600dp/activity_toot.xml b/app/src/main/res/layout-sw600dp/activity_toot.xml
index 1476e4984..442241a44 100644
--- a/app/src/main/res/layout-sw600dp/activity_toot.xml
+++ b/app/src/main/res/layout-sw600dp/activity_toot.xml
@@ -84,8 +84,8 @@
                 <ImageButton
                     android:id="@+id/toot_picture"
                     android:layout_width="50dp"
-                    android:layout_height="50dp"
-                    android:background="@color/mastodonC4"
+                    android:layout_height="wrap_content"
+                    style="@style/Base.Widget.AppCompat.Button.Colored"
                     android:src="@drawable/ic_insert_photo"
                     tools:ignore="ContentDescription" />
                 <ImageButton
@@ -93,8 +93,8 @@
                     android:layout_marginStart="5dp"
                     android:id="@+id/toot_visibility"
                     android:layout_width="50dp"
-                    android:layout_height="50dp"
-                    android:background="@color/mastodonC4"
+                    android:layout_height="wrap_content"
+                    style="@style/Base.Widget.AppCompat.Button.Colored"
                     android:src="@drawable/ic_action_globe"
                     tools:ignore="ContentDescription" />
                 <Button
diff --git a/app/src/main/res/layout/activity_toot.xml b/app/src/main/res/layout/activity_toot.xml
index 035b28176..f677c55da 100644
--- a/app/src/main/res/layout/activity_toot.xml
+++ b/app/src/main/res/layout/activity_toot.xml
@@ -83,18 +83,18 @@
                 android:layout_height="wrap_content">
                 <ImageButton
                     android:id="@+id/toot_picture"
-                    android:layout_width="40dp"
-                    android:layout_height="40dp"
-                    android:background="@color/mastodonC4"
+                    android:layout_width="50dp"
+                    android:layout_height="wrap_content"
+                    style="@style/Base.Widget.AppCompat.Button.Colored"
                     android:src="@drawable/ic_insert_photo"
                     tools:ignore="ContentDescription" />
                 <ImageButton
                     android:layout_marginLeft="5dp"
                     android:layout_marginStart="5dp"
                     android:id="@+id/toot_visibility"
-                    android:layout_width="40dp"
-                    android:layout_height="40dp"
-                    android:background="@color/mastodonC4"
+                    android:layout_width="50dp"
+                    android:layout_height="wrap_content"
+                    style="@style/Base.Widget.AppCompat.Button.Colored"
                     android:src="@drawable/ic_action_globe"
                     tools:ignore="ContentDescription" />
                 <Button