diff --git a/app/src/main/res/drawable/ic_code_grey_36dp.xml b/app/src/main/res/drawable/ic_code_grey.xml
similarity index 54%
rename from app/src/main/res/drawable/ic_code_grey_36dp.xml
rename to app/src/main/res/drawable/ic_code_grey.xml
index 382786f1..e88ec8d4 100644
--- a/app/src/main/res/drawable/ic_code_grey_36dp.xml
+++ b/app/src/main/res/drawable/ic_code_grey.xml
@@ -1,5 +1,5 @@
-<vector android:height="36dp" android:tint="#4B4B4B"
+<vector android:height="@dimen/editor_format_button_size" android:tint="#4B4B4B"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="36dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="@dimen/editor_format_button_size" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M9.4,16.6L4.8,12l4.6,-4.6L8,6l-6,6 6,6 1.4,-1.4zM14.6,16.6l4.6,-4.6 -4.6,-4.6L16,6l6,6 -6,6 -1.4,-1.4z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_format_align_center_grey_36dp.xml b/app/src/main/res/drawable/ic_format_align_center_grey.xml
similarity index 54%
rename from app/src/main/res/drawable/ic_format_align_center_grey_36dp.xml
rename to app/src/main/res/drawable/ic_format_align_center_grey.xml
index 001540aa..bb2ac52f 100644
--- a/app/src/main/res/drawable/ic_format_align_center_grey_36dp.xml
+++ b/app/src/main/res/drawable/ic_format_align_center_grey.xml
@@ -1,5 +1,5 @@
-<vector android:height="36dp" android:tint="#4B4B4B"
+<vector android:height="@dimen/editor_format_button_size" android:tint="#4B4B4B"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="36dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="@dimen/editor_format_button_size" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M7,15v2h10v-2L7,15zM3,21h18v-2L3,19v2zM3,13h18v-2L3,11v2zM7,7v2h10L17,7L7,7zM3,3v2h18L21,3L3,3z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_format_align_left_grey_36dp.xml b/app/src/main/res/drawable/ic_format_align_left_grey.xml
similarity index 54%
rename from app/src/main/res/drawable/ic_format_align_left_grey_36dp.xml
rename to app/src/main/res/drawable/ic_format_align_left_grey.xml
index c0688aef..1eb7f3da 100644
--- a/app/src/main/res/drawable/ic_format_align_left_grey_36dp.xml
+++ b/app/src/main/res/drawable/ic_format_align_left_grey.xml
@@ -1,5 +1,5 @@
-<vector android:height="36dp" android:tint="#4B4B4B"
+<vector android:height="@dimen/editor_format_button_size" android:tint="#4B4B4B"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="36dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="@dimen/editor_format_button_size" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M15,15L3,15v2h12v-2zM15,7L3,7v2h12L15,7zM3,13h18v-2L3,11v2zM3,21h18v-2L3,19v2zM3,3v2h18L21,3L3,3z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_format_align_right_grey_36dp.xml b/app/src/main/res/drawable/ic_format_align_right_grey.xml
similarity index 54%
rename from app/src/main/res/drawable/ic_format_align_right_grey_36dp.xml
rename to app/src/main/res/drawable/ic_format_align_right_grey.xml
index f486de4a..e6545636 100644
--- a/app/src/main/res/drawable/ic_format_align_right_grey_36dp.xml
+++ b/app/src/main/res/drawable/ic_format_align_right_grey.xml
@@ -1,5 +1,5 @@
-<vector android:height="36dp" android:tint="#4B4B4B"
+<vector android:height="@dimen/editor_format_button_size" android:tint="#4B4B4B"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="36dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="@dimen/editor_format_button_size" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M3,21h18v-2L3,19v2zM9,17h12v-2L9,15v2zM3,13h18v-2L3,11v2zM9,9h12L21,7L9,7v2zM3,3v2h18L21,3L3,3z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_format_bold_grey_36dp.xml b/app/src/main/res/drawable/ic_format_bold_grey.xml
similarity index 81%
rename from app/src/main/res/drawable/ic_format_bold_grey_36dp.xml
rename to app/src/main/res/drawable/ic_format_bold_grey.xml
index 2a0ef3cf..a4681ef2 100644
--- a/app/src/main/res/drawable/ic_format_bold_grey_36dp.xml
+++ b/app/src/main/res/drawable/ic_format_bold_grey.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="36dp"
-        android:height="36dp"
+        android:width="@dimen/editor_format_button_size"
+        android:height="@dimen/editor_format_button_size"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
diff --git a/app/src/main/res/drawable/ic_format_color_text_36dp.xml b/app/src/main/res/drawable/ic_format_color_text.xml
similarity index 65%
rename from app/src/main/res/drawable/ic_format_color_text_36dp.xml
rename to app/src/main/res/drawable/ic_format_color_text.xml
index d241a9b0..1a9d484b 100644
--- a/app/src/main/res/drawable/ic_format_color_text_36dp.xml
+++ b/app/src/main/res/drawable/ic_format_color_text.xml
@@ -1,6 +1,6 @@
-<vector android:height="36dp"
+<vector android:height="@dimen/editor_format_button_size"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="36dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="@dimen/editor_format_button_size" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillAlpha=".36" android:fillColor="@color/colorAccent" android:pathData="M0,20h24v4H0z"/>
     <path android:fillColor="#FF4B4B4B" android:pathData="M11,3L5.5,17h2.25l1.12,-3h6.25l1.12,3h2.25L13,3h-2zM9.62,12L12,5.67 14.38,12L9.62,12z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_format_italic_grey.xml b/app/src/main/res/drawable/ic_format_italic_grey.xml
new file mode 100644
index 00000000..ee452438
--- /dev/null
+++ b/app/src/main/res/drawable/ic_format_italic_grey.xml
@@ -0,0 +1,4 @@
+<vector android:height="@dimen/editor_format_button_size" android:viewportHeight="24.0"
+    android:viewportWidth="24.0" android:width="@dimen/editor_format_button_size" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF4B4B4B" android:pathData="M10,4v3h2.21l-3.42,8H6v3h8v-3h-2.21l3.42,-8H18V4z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_format_italic_grey_36dp.xml b/app/src/main/res/drawable/ic_format_italic_grey_36dp.xml
deleted file mode 100644
index 31ae9249..00000000
--- a/app/src/main/res/drawable/ic_format_italic_grey_36dp.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<vector android:height="36dp" android:viewportHeight="24.0"
-    android:viewportWidth="24.0" android:width="36dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF4B4B4B" android:pathData="M10,4v3h2.21l-3.42,8H6v3h8v-3h-2.21l3.42,-8H18V4z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_format_list_bulleted_black_36dp.xml b/app/src/main/res/drawable/ic_format_list_bulleted_black.xml
similarity index 70%
rename from app/src/main/res/drawable/ic_format_list_bulleted_black_36dp.xml
rename to app/src/main/res/drawable/ic_format_list_bulleted_black.xml
index 228e7a79..774e618c 100644
--- a/app/src/main/res/drawable/ic_format_list_bulleted_black_36dp.xml
+++ b/app/src/main/res/drawable/ic_format_list_bulleted_black.xml
@@ -1,5 +1,5 @@
-<vector android:height="36dp" android:tint="#4B4B4B"
+<vector android:height="@dimen/editor_format_button_size" android:tint="#4B4B4B"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="36dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="@dimen/editor_format_button_size" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M4,10.5c-0.83,0 -1.5,0.67 -1.5,1.5s0.67,1.5 1.5,1.5 1.5,-0.67 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM4,4.5c-0.83,0 -1.5,0.67 -1.5,1.5S3.17,7.5 4,7.5 5.5,6.83 5.5,6 4.83,4.5 4,4.5zM4,16.5c-0.83,0 -1.5,0.68 -1.5,1.5s0.68,1.5 1.5,1.5 1.5,-0.68 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM7,19h14v-2L7,17v2zM7,13h14v-2L7,11v2zM7,5v2h14L21,5L7,5z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_format_quote_grey.xml b/app/src/main/res/drawable/ic_format_quote_grey.xml
new file mode 100644
index 00000000..dc0ebe5b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_format_quote_grey.xml
@@ -0,0 +1,5 @@
+<vector android:height="@dimen/editor_format_button_size" android:tint="#4B4B4B"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="@dimen/editor_format_button_size" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M6,17h3l2,-4L11,7L5,7v6h3zM14,17h3l2,-4L19,7h-6v6h3z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_format_size_black.xml b/app/src/main/res/drawable/ic_format_size_black.xml
new file mode 100644
index 00000000..400ad0a7
--- /dev/null
+++ b/app/src/main/res/drawable/ic_format_size_black.xml
@@ -0,0 +1,5 @@
+<vector android:height="@dimen/editor_format_button_size" android:tint="#4B4B4B"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="@dimen/editor_format_button_size" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M9,4v3h5v12h3L17,7h5L22,4L9,4zM3,12h3v7h3v-7h3L12,9L3,9v3z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_format_size_black_36dp.xml b/app/src/main/res/drawable/ic_format_size_black_36dp.xml
deleted file mode 100644
index 54e5a142..00000000
--- a/app/src/main/res/drawable/ic_format_size_black_36dp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="36dp" android:tint="#4B4B4B"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="36dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M9,4v3h5v12h3L17,7h5L22,4L9,4zM3,12h3v7h3v-7h3L12,9L3,9v3z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_format_underlined_grey_36dp.xml b/app/src/main/res/drawable/ic_format_underlined_grey.xml
similarity index 57%
rename from app/src/main/res/drawable/ic_format_underlined_grey_36dp.xml
rename to app/src/main/res/drawable/ic_format_underlined_grey.xml
index 68fa161a..1fc2bf7f 100644
--- a/app/src/main/res/drawable/ic_format_underlined_grey_36dp.xml
+++ b/app/src/main/res/drawable/ic_format_underlined_grey.xml
@@ -1,5 +1,5 @@
-<vector android:height="36dp" android:tint="#4B4B4B"
+<vector android:height="@dimen/editor_format_button_size" android:tint="#4B4B4B"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="36dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="@dimen/editor_format_button_size" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M12,17c3.31,0 6,-2.69 6,-6L18,3h-2.5v8c0,1.93 -1.57,3.5 -3.5,3.5S8.5,12.93 8.5,11L8.5,3L6,3v8c0,3.31 2.69,6 6,6zM5,19v2h14v-2L5,19z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_functions_black.xml b/app/src/main/res/drawable/ic_functions_black.xml
new file mode 100644
index 00000000..305b9658
--- /dev/null
+++ b/app/src/main/res/drawable/ic_functions_black.xml
@@ -0,0 +1,5 @@
+<vector android:height="@dimen/editor_format_button_size" android:tint="#4B4B4B"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="@dimen/editor_format_button_size" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M18,4H6v2l6.5,6L6,18v2h12v-3h-7l5,-5 -5,-5h7z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_functions_black_36dp.xml b/app/src/main/res/drawable/ic_functions_black_36dp.xml
deleted file mode 100644
index 5c2bf617..00000000
--- a/app/src/main/res/drawable/ic_functions_black_36dp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="36dp" android:tint="#4B4B4B"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="36dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M18,4H6v2l6.5,6L6,18v2h12v-3h-7l5,-5 -5,-5h7z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_insert_link_gre_36dp.xml b/app/src/main/res/drawable/ic_insert_link_grey.xml
similarity index 66%
rename from app/src/main/res/drawable/ic_insert_link_gre_36dp.xml
rename to app/src/main/res/drawable/ic_insert_link_grey.xml
index ca131ec9..1f0b5787 100644
--- a/app/src/main/res/drawable/ic_insert_link_gre_36dp.xml
+++ b/app/src/main/res/drawable/ic_insert_link_grey.xml
@@ -1,5 +1,5 @@
-<vector android:height="36dp" android:tint="#4B4B4B"
+<vector android:height="@dimen/editor_format_button_size" android:tint="#4B4B4B"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="36dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="@dimen/editor_format_button_size" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M3.9,12c0,-1.71 1.39,-3.1 3.1,-3.1h4L11,7L7,7c-2.76,0 -5,2.24 -5,5s2.24,5 5,5h4v-1.9L7,15.1c-1.71,0 -3.1,-1.39 -3.1,-3.1zM8,13h8v-2L8,11v2zM17,7h-4v1.9h4c1.71,0 3.1,1.39 3.1,3.1s-1.39,3.1 -3.1,3.1h-4L13,17h4c2.76,0 5,-2.24 5,-5s-2.24,-5 -5,-5z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_strikethrough_s_grey_36dp.xml b/app/src/main/res/drawable/ic_strikethrough_s_grey.xml
similarity index 88%
rename from app/src/main/res/drawable/ic_strikethrough_s_grey_36dp.xml
rename to app/src/main/res/drawable/ic_strikethrough_s_grey.xml
index 9ee72210..f1712056 100644
--- a/app/src/main/res/drawable/ic_strikethrough_s_grey_36dp.xml
+++ b/app/src/main/res/drawable/ic_strikethrough_s_grey.xml
@@ -1,5 +1,5 @@
-<vector android:height="36dp" android:tint="#4B4B4B"
+<vector android:height="@dimen/editor_format_button_size" android:tint="#4B4B4B"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="36dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="@dimen/editor_format_button_size" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#010101" android:pathData="M7.24,8.75c-0.26,-0.48 -0.39,-1.03 -0.39,-1.67 0,-0.61 0.13,-1.16 0.4,-1.67 0.26,-0.5 0.63,-0.93 1.11,-1.29 0.48,-0.35 1.05,-0.63 1.7,-0.83 0.66,-0.19 1.39,-0.29 2.18,-0.29 0.81,0 1.54,0.11 2.21,0.34 0.66,0.22 1.23,0.54 1.69,0.94 0.47,0.4 0.83,0.88 1.08,1.43 0.25,0.55 0.38,1.15 0.38,1.81h-3.01c0,-0.31 -0.05,-0.59 -0.15,-0.85 -0.09,-0.27 -0.24,-0.49 -0.44,-0.68 -0.2,-0.19 -0.45,-0.33 -0.75,-0.44 -0.3,-0.1 -0.66,-0.16 -1.06,-0.16 -0.39,0 -0.74,0.04 -1.03,0.13 -0.29,0.09 -0.53,0.21 -0.72,0.36 -0.19,0.16 -0.34,0.34 -0.44,0.55 -0.1,0.21 -0.15,0.43 -0.15,0.66 0,0.48 0.25,0.88 0.74,1.21 0.38,0.25 0.77,0.48 1.41,0.7H7.39c-0.05,-0.08 -0.11,-0.17 -0.15,-0.25zM21,12v-2H3v2h9.62c0.18,0.07 0.4,0.14 0.55,0.2 0.37,0.17 0.66,0.34 0.87,0.51 0.21,0.17 0.35,0.36 0.43,0.57 0.07,0.2 0.11,0.43 0.11,0.69 0,0.23 -0.05,0.45 -0.14,0.66 -0.09,0.2 -0.23,0.38 -0.42,0.53 -0.19,0.15 -0.42,0.26 -0.71,0.35 -0.29,0.08 -0.63,0.13 -1.01,0.13 -0.43,0 -0.83,-0.04 -1.18,-0.13s-0.66,-0.23 -0.91,-0.42c-0.25,-0.19 -0.45,-0.44 -0.59,-0.75 -0.14,-0.31 -0.25,-0.76 -0.25,-1.21H6.4c0,0.55 0.08,1.13 0.24,1.58 0.16,0.45 0.37,0.85 0.65,1.21 0.28,0.35 0.6,0.66 0.98,0.92 0.37,0.26 0.78,0.48 1.22,0.65 0.44,0.17 0.9,0.3 1.38,0.39 0.48,0.08 0.96,0.13 1.44,0.13 0.8,0 1.53,-0.09 2.18,-0.28s1.21,-0.45 1.67,-0.79c0.46,-0.34 0.82,-0.77 1.07,-1.27s0.38,-1.07 0.38,-1.71c0,-0.6 -0.1,-1.14 -0.31,-1.61 -0.05,-0.11 -0.11,-0.23 -0.17,-0.33H21z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_text_format_grey_36dp.xml b/app/src/main/res/drawable/ic_text_format_grey.xml
similarity index 55%
rename from app/src/main/res/drawable/ic_text_format_grey_36dp.xml
rename to app/src/main/res/drawable/ic_text_format_grey.xml
index 83b2e497..382416ad 100644
--- a/app/src/main/res/drawable/ic_text_format_grey_36dp.xml
+++ b/app/src/main/res/drawable/ic_text_format_grey.xml
@@ -1,5 +1,5 @@
-<vector android:height="36dp" android:tint="#4B4B4B"
+<vector android:height="@dimen/editor_format_button_size" android:tint="#4B4B4B"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="36dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="@dimen/editor_format_button_size" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M5,17v2h14v-2L5,17zM9.5,12.8h5l0.9,2.2h2.1L12.75,4h-1.5L6.5,15h2.1l0.9,-2.2zM12,5.98L13.87,11h-3.74L12,5.98z"/>
 </vector>
diff --git a/app/src/main/res/layout/activity_topic_quick_reply_row.xml b/app/src/main/res/layout/activity_topic_quick_reply_row.xml
index eb8569c5..84ff1b6a 100644
--- a/app/src/main/res/layout/activity_topic_quick_reply_row.xml
+++ b/app/src/main/res/layout/activity_topic_quick_reply_row.xml
@@ -84,6 +84,8 @@
                 android:id="@+id/reply_editorview"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
                 android:background="@color/card_background"
                 card_view:hint="Post message" />
         </LinearLayout>
diff --git a/app/src/main/res/layout/editor_view.xml b/app/src/main/res/layout/editor_view.xml
index 0c36c0cd..a51ee8e1 100644
--- a/app/src/main/res/layout/editor_view.xml
+++ b/app/src/main/res/layout/editor_view.xml
@@ -8,96 +8,109 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        app:columnWidth="36dp">
+        app:columnWidth="28dp">
         <!--bold, italic, etc buttons-->
         <android.support.v7.widget.AppCompatImageButton
             android:id="@+id/bold_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:srcCompat="@drawable/ic_format_bold_grey_36dp"
+            android:layout_marginEnd="@dimen/editor_format_button_margin_between"
+            app:srcCompat="@drawable/ic_format_bold_grey"
             android:background="?android:selectableItemBackground"/>
 
         <android.support.v7.widget.AppCompatImageButton
             android:id="@+id/italic_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:srcCompat="@drawable/ic_format_italic_grey_36dp"
+            android:layout_marginEnd="@dimen/editor_format_button_margin_between"
+            app:srcCompat="@drawable/ic_format_italic_grey"
             android:background="?android:selectableItemBackground"/>
 
         <android.support.v7.widget.AppCompatImageButton
             android:id="@+id/underline_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:srcCompat="@drawable/ic_format_underlined_grey_36dp"
+            android:layout_marginEnd="@dimen/editor_format_button_margin_between"
+            app:srcCompat="@drawable/ic_format_underlined_grey"
             android:background="?android:selectableItemBackground"/>
 
         <android.support.v7.widget.AppCompatImageButton
             android:id="@+id/strikethrough_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:srcCompat="@drawable/ic_strikethrough_s_grey_36dp"
+            android:layout_marginEnd="@dimen/editor_format_button_margin_between"
+            app:srcCompat="@drawable/ic_strikethrough_s_grey"
             android:background="?android:selectableItemBackground"/>
 
         <android.support.v7.widget.AppCompatImageButton
             android:id="@+id/text_color_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:srcCompat="@drawable/ic_format_color_text_36dp"
+            android:layout_marginEnd="@dimen/editor_format_button_margin_between"
+            app:srcCompat="@drawable/ic_format_color_text"
             android:background="?android:selectableItemBackground"/>
 
         <android.support.v7.widget.AppCompatImageButton
             android:id="@+id/text_size_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:srcCompat="@drawable/ic_format_size_black_36dp"
+            android:layout_marginEnd="@dimen/editor_format_button_margin_between"
+            app:srcCompat="@drawable/ic_format_size_black"
             android:background="?android:selectableItemBackground"/>
 
         <android.support.v7.widget.AppCompatImageButton
             android:id="@+id/font_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:srcCompat="@drawable/ic_text_format_grey_36dp"
+            android:layout_marginEnd="@dimen/editor_format_button_margin_between"
+            app:srcCompat="@drawable/ic_text_format_grey"
             android:background="?android:selectableItemBackground"/>
 
         <android.support.v7.widget.AppCompatImageButton
             android:id="@+id/unordered_list_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:srcCompat="@drawable/ic_format_list_bulleted_black_36dp"
+            android:layout_marginEnd="@dimen/editor_format_button_margin_between"
+            app:srcCompat="@drawable/ic_format_list_bulleted_black"
             android:background="?android:selectableItemBackground"/>
 
         <android.support.v7.widget.AppCompatImageButton
             android:id="@+id/align_left_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:srcCompat="@drawable/ic_format_align_left_grey_36dp"
+            android:layout_marginEnd="@dimen/editor_format_button_margin_between"
+            app:srcCompat="@drawable/ic_format_align_left_grey"
             android:background="?android:selectableItemBackground"/>
 
         <android.support.v7.widget.AppCompatImageButton
             android:id="@+id/align_center_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:srcCompat="@drawable/ic_format_align_center_grey_36dp"
+            android:layout_marginEnd="@dimen/editor_format_button_margin_between"
+            app:srcCompat="@drawable/ic_format_align_center_grey"
             android:background="?android:selectableItemBackground"/>
 
         <android.support.v7.widget.AppCompatImageButton
             android:id="@+id/align_right_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:srcCompat="@drawable/ic_format_align_right_grey_36dp"
+            android:layout_marginEnd="@dimen/editor_format_button_margin_between"
+            app:srcCompat="@drawable/ic_format_align_right_grey"
             android:background="?android:selectableItemBackground"/>
 
         <android.support.v7.widget.AppCompatImageButton
             android:id="@+id/link_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:srcCompat="@drawable/ic_insert_link_gre_36dp"
+            android:layout_marginEnd="@dimen/editor_format_button_margin_between"
+            app:srcCompat="@drawable/ic_insert_link_grey"
             android:background="?android:selectableItemBackground"/>
 
         <android.support.v7.widget.AppCompatImageButton
             android:id="@+id/quote_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/editor_format_button_margin_between"
             app:srcCompat="@drawable/ic_format_quote_unchecked_grey_24dp"
             android:background="?android:selectableItemBackground"/>
 
@@ -105,23 +118,23 @@
             android:id="@+id/code_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:srcCompat="@drawable/ic_code_grey_36dp"
+            android:layout_marginEnd="@dimen/editor_format_button_margin_between"
+            app:srcCompat="@drawable/ic_code_grey"
             android:background="?android:selectableItemBackground"/>
 
         <android.support.v7.widget.AppCompatImageButton
             android:id="@+id/math_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:srcCompat="@drawable/ic_functions_black_36dp"
+            android:layout_marginEnd="@dimen/editor_format_button_margin_between"
+            app:srcCompat="@drawable/ic_functions_black"
             android:background="?android:selectableItemBackground"/>
     </gr.thmmy.mthmmy.editorview.AutoFitGridLayout>
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp">
+        android:orientation="horizontal">
 
         <android.support.design.widget.TextInputLayout
             android:id="@+id/editor_edittext_wrapper"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 20a265af..f823f8e5 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -8,4 +8,6 @@
     <dimen name="fab_margins">16dp</dimen>
     <dimen name="progress_bar_height">10dp</dimen>
     <dimen name="big_text">24sp</dimen>
+    <dimen name="editor_format_button_size">24dp</dimen>
+    <dimen name="editor_format_button_margin_between">4dp</dimen>
 </resources>