diff --git a/public/app/features/datasources/partials/edit.html b/public/app/features/datasources/partials/edit.html
index 6113ebed18b..7ae595a30b6 100644
--- a/public/app/features/datasources/partials/edit.html
+++ b/public/app/features/datasources/partials/edit.html
@@ -31,8 +31,7 @@
 					</li>
 					<li class="norm-form-item trans">
 						<input class="cr1" id="current.isDefault" type="checkbox" ng-model="current.isDefault" ng-checked="current.isDefault">
-						<label for="current.isDefault" class="cr1"></label>
-						Default
+						<label for="current.isDefault" class="cr1">Default</label>
 					</li>
 				</ul>
 				<div class="clearfix"></div>
@@ -43,7 +42,7 @@
 						Type
 					</li>
 					<li>
-						<select class="input-xlarge norm-form-input norm-form-auto" ng-model="current.type" ng-options="k as v.name for (k, v) in types" ng-change="typeChanged()"></select>
+						<select class="input-xlarge norm-form-input norm-form-auto norm-form-input-boxbox" ng-model="current.type" ng-options="k as v.name for (k, v) in types" ng-change="typeChanged()"></select>
 					</li>
 				</ul>
 				<div class="clearfix"></div>
diff --git a/public/img/checkbox_white.png b/public/img/checkbox_white.png
index dbff6d5ab64..877f6ddcc2c 100644
Binary files a/public/img/checkbox_white.png and b/public/img/checkbox_white.png differ
diff --git a/public/less/dropdown.less b/public/less/dropdown.less
index 40d8b53fa86..1497c255432 100644
--- a/public/less/dropdown.less
+++ b/public/less/dropdown.less
@@ -15,6 +15,7 @@
   padding: 0 12px 0 6px;
   border: @grafanaPanelBorder;
   background-color: @grafanaSelectBackground;
+  background-color: red;
   overflow: hidden;
   vertical-align: top;
   -webkit-border-radius: 3px;
@@ -39,7 +40,7 @@
   text-indent: .01px;
   text-overflow: '';
   -webkit-appearance: none;
-  -moz-appearance: menulist-text; // was set to "window" and caused odd display on windos and linux.
+  -moz-appearance: menulist-text; // was set to "window" and caused odd display on windows and linux.
   appearance: none;
 }
 
diff --git a/public/less/forms.less b/public/less/forms.less
index 3afe3e02ab5..61693f63ece 100644
--- a/public/less/forms.less
+++ b/public/less/forms.less
@@ -18,20 +18,19 @@ input[type="checkbox"].cr1 {
 
 label.cr1 {
   display: inline-block;
-  height: 18px;
+  height: 19px;
   position: relative;
-  top: -2px;
   clear: none;
   text-indent: 2px;
   margin: 0 0 0px 0;
-  padding: 0 0 0 23px;
-  vertical-align:middle;
+  padding: 0 0 0 20px;
+  vertical-align: top;
   background: url(@checkboxImageUrl) left top no-repeat;
   cursor:pointer;
 }
 
 input[type="checkbox"]:checked+label {
-  background: url(@checkboxImageUrl) 0px -18px no-repeat;
+  background: url(@checkboxImageUrl) 0px -21px no-repeat;
 }
 
 .gf-form {
diff --git a/public/less/normform.less b/public/less/normform.less
index 496679fd5b0..2aba22c9e7f 100644
--- a/public/less/normform.less
+++ b/public/less/normform.less
@@ -17,6 +17,7 @@
     display: inline;
     padding-right: 4px;
     margin-bottom: 0;
+    margin-left: 5px;
   }
 }
 
diff --git a/public/less/variables.dark.less b/public/less/variables.dark.less
index 715aa4f2660..e1a81829870 100644
--- a/public/less/variables.dark.less
+++ b/public/less/variables.dark.less
@@ -307,7 +307,7 @@
 @popoverArrowOuterColor:  rgba(0,0,0,.25);
 
 // images
-@checkboxImageUrl: '../img/checkbox.png';
+@checkboxImageUrl: '../img/checkbox_white.png';
 
 // GRID
 // --------------------------------------------------