diff --git a/app/src/main/res/layout/activity_compose.xml b/app/src/main/res/layout/activity_compose.xml
index c924c8e1a..61dfd9539 100644
--- a/app/src/main/res/layout/activity_compose.xml
+++ b/app/src/main/res/layout/activity_compose.xml
@@ -96,57 +96,79 @@
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
             android:paddingBottom="8dp"
-            android:paddingLeft="16dp"
+            android:paddingStart="8dp"
+            android:paddingLeft="8dp"
+            android:paddingEnd="16dp"
             android:paddingRight="16dp"
             android:paddingTop="4dp">
 
             <ImageButton
                 android:id="@+id/compose_photo_take"
                 style="?attr/image_button_style"
-                android:layout_width="32dp"
-                android:layout_height="32dp"
-                android:layout_marginEnd="8dp"
-                android:layout_marginRight="8dp"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:paddingStart="4dp"
+                android:paddingLeft="4dp"
+                android:paddingTop="4dp"
+                android:paddingEnd="4dp"
+                android:paddingRight="4dp"
+                android:paddingBottom="4dp"
                 app:srcCompat="@drawable/ic_camera_24dp"
                 android:contentDescription="@string/action_photo_take" />
 
             <ImageButton
                 android:id="@+id/compose_photo_pick"
                 style="?attr/image_button_style"
-                android:layout_width="32dp"
-                android:layout_height="32dp"
-                android:layout_marginEnd="8dp"
-                android:layout_marginRight="8dp"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:paddingStart="4dp"
+                android:paddingLeft="4dp"
+                android:paddingTop="4dp"
+                android:paddingEnd="4dp"
+                android:paddingRight="4dp"
+                android:paddingBottom="4dp"
                 app:srcCompat="@drawable/ic_attach_file_24dp"
                 android:contentDescription="@string/action_photo_pick" />
 
             <ImageButton
                 android:id="@+id/action_toggle_visibility"
                 style="?attr/image_button_style"
-                android:layout_width="32dp"
-                android:layout_height="32dp"
-                android:layout_marginEnd="8dp"
-                android:layout_marginRight="8dp"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:paddingStart="4dp"
+                android:paddingLeft="4dp"
+                android:paddingTop="4dp"
+                android:paddingEnd="4dp"
+                android:paddingRight="4dp"
+                android:paddingBottom="4dp"
                 app:srcCompat="@drawable/ic_public_24dp"
                 android:contentDescription="@string/action_compose_options" />
 
             <ImageButton
                 android:id="@+id/compose_save_draft"
                 style="?attr/image_button_style"
-                android:layout_width="32dp"
-                android:layout_height="32dp"
-                android:layout_marginEnd="8dp"
-                android:layout_marginRight="8dp"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:paddingStart="4dp"
+                android:paddingLeft="4dp"
+                android:paddingTop="4dp"
+                android:paddingEnd="4dp"
+                android:paddingRight="4dp"
+                android:paddingBottom="4dp"
                 app:srcCompat="@drawable/ic_save_24dp"
                 android:contentDescription="@string/action_save" />
 
             <ImageButton
                 android:id="@+id/action_hide_media"
                 style="?attr/image_button_style"
-                android:layout_width="32dp"
-                android:layout_height="32dp"
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:paddingStart="4dp"
+                android:paddingLeft="4dp"
+                android:paddingTop="4dp"
+                android:paddingEnd="4dp"
+                android:paddingRight="4dp"
+                android:paddingBottom="4dp"
                 app:srcCompat="@drawable/ic_hide_media_24dp"
                 android:contentDescription="@string/action_hide_media"
                 android:visibility="gone" />