diff --git a/src/resources/css/craft.scss b/src/resources/css/craft.scss
index 8bd628004e1..1237dcbd08c 100644
--- a/src/resources/css/craft.scss
+++ b/src/resources/css/craft.scss
@@ -228,7 +228,7 @@ ul.icons li a:hover { text-decoration: none; color: $linkcolor; }
 /*  Buttons
 /* ----------------------------------------*/
 
-.toolbar { position: relative; margin: 30px 0; height: 31px; }
+.toolbar { position: relative; margin: 30px 0; height: 30px; }
 .toolbar .spinner { position: absolute; top: 0; right: -24px; }
 .toolbar table { width: 100%; }
 .toolbar table td:not(:first-child) { padding-left: 15px; }
@@ -357,7 +357,7 @@ div.btn.submit input { position: absolute; left: 100%; }
 .colorpicker { z-index: 2; }
 
 /* switch */
-.lightswitch { position: relative; border: none !important; width: 80px; height: 31px; overflow: hidden; cursor: pointer; @include unselectable; overflow: hidden; }
+.lightswitch { position: relative; border: none !important; width: 80px; height: 30px; overflow: hidden; cursor: pointer; @include unselectable; overflow: hidden; }
 .lightswitch:after { display: block; position: absolute; z-index: 1; top: 0; left: 0; width: 100%; height: 100%; content: '.'; text-indent: -100%;
 	-webkit-box-shadow: inset 0 0 0 1px rgba(0,0,0,0.15);
 	        box-shadow: inset 0 0 0 1px rgba(0,0,0,0.15);
@@ -370,9 +370,9 @@ div.btn.submit input { position: absolute; left: 100%; }
 .lightswitch .container { margin-left: -50px; width: 130px; }
 .lightswitch.on .container { margin-left: 0; }
 
-.lightswitch .label { float: left; padding: 0 5px; width: 40px; height: 31px; line-height: 31px; text-align: center; text-transform: uppercase; }
+.lightswitch .label { float: left; padding: 0 5px; width: 40px; height: 30px; line-height: 30px; text-align: center; text-transform: uppercase; }
 .lightswitch .label.on { color: #fff; text-shadow: 0 0px 3px rgba(0,0,0,0.5); background-color: hsl(203, 79%, 50%); }
-.lightswitch .handle { position: relative; float: left; padding: 0; width: 30px; height: 31px; @include linear-gradient(#e5e5e5, #fff);
+.lightswitch .handle { position: relative; float: left; padding: 0; width: 30px; height: 30px; @include linear-gradient(#e5e5e5, #fff);
 	-webkit-box-shadow: 0 0 0 1px rgba(0,0,0,0.15);
 	        box-shadow: 0 0 0 1px rgba(0,0,0,0.15);
 }
@@ -697,7 +697,7 @@ input.text,
 textarea.text,
 .text input,
 .text textarea,
-table.editable textarea { font-size: 13px; line-height: 17px; color: $textcolor; min-height: 31px;
+table.editable textarea { font-size: 13px; line-height: 16px; color: $textcolor; min-height: 30px;
 	-webkit-box-sizing: border-box;
 	   -moz-box-sizing: border-box;
 	        box-sizing: border-box;