diff --git a/lib/Styles/Gtk/Button.scss b/lib/Styles/Gtk/Button.scss
index c015f69ac..68971c045 100644
--- a/lib/Styles/Gtk/Button.scss
+++ b/lib/Styles/Gtk/Button.scss
@@ -8,9 +8,10 @@ button {
     &.image-button {
         @extend .circular;
 
-        padding: rem(4px);
+        padding: calc(0.5rem - 2px);
         min-height: 16px;
         min-width: 16px;
+
         transition:
             background duration("expand") easing(),
             transform duration("expand") easing("ease-out-back");
@@ -43,7 +44,9 @@ button {
     &.text-button {
         @extend %raised;
 
-        padding: rem(2px) rem(4px);
+        min-height: 16px;
+        min-width: 16px;
+        padding: calc(0.5rem - 2px);
     }
 
     // Almost certainly a button with text and image
diff --git a/lib/Styles/Gtk/Entry.scss b/lib/Styles/Gtk/Entry.scss
index 5183df82f..6b5981770 100644
--- a/lib/Styles/Gtk/Entry.scss
+++ b/lib/Styles/Gtk/Entry.scss
@@ -4,7 +4,9 @@ entry {
     background-color: bg-color(1);
     border: 1px solid $border-color;
     border-spacing: $button-spacing;
-    padding: $button-spacing;
+    padding: calc(0.5rem - 2px);
+    min-height: 16px;
+    min-width: 16px;
 
     placeholder {
         @extend .dim-label;