diff --git a/gtk-3.0/scss/apps/_unity-greeter.scss b/gtk-3.0/scss/apps/_unity-greeter.scss
index 5ca899e..5bbfee3 100644
--- a/gtk-3.0/scss/apps/_unity-greeter.scss
+++ b/gtk-3.0/scss/apps/_unity-greeter.scss
@@ -64,7 +64,7 @@
         background-color: fade-out($black, .7);
         border-color: fade-out($white, .4);
         border-radius: 5px;
-        padding: 7px;
+        padding: 6px;
         color: $white;
         text-shadow: none;
     }
@@ -94,9 +94,12 @@
     }
 
     .lightdm.option-button {
-        padding: 5px;
         background: none;
-        border: 0;
+        border-width: 0;
+    }
+
+    .lightdm.option-button:insensitive:insensitive {
+        background: none;
     }
 
     .lightdm.toggle-button {
diff --git a/gtk-3.0/scss/widgets/_calendar.scss b/gtk-3.0/scss/widgets/_calendar.scss
index 409eb5b..5c7ca32 100644
--- a/gtk-3.0/scss/widgets/_calendar.scss
+++ b/gtk-3.0/scss/widgets/_calendar.scss
@@ -4,16 +4,25 @@
 
 @include exports("calendar") {
     GtkCalendar {
-        padding: $spacing;
+        padding: 1px 3px;
         outline-offset: -1px;
 
         &:inconsistent { color: mix($fg_color, $bg_color, .5); }
 
         &.view, &.highlight, &.header, &.button {
             &, &:focus, &:hover, &:insensitive {
-                border: 0;
                 background-color: transparent;
                 background-image: none;
+                border-width: 0;
+                border-radius: 0;
+            }
+        }
+
+        &.button {
+            &, &:focus, &:hover, &:insensitive {
+                color: $white;
+                border-width: 0;
+                box-shadow: none;
             }
         }