diff --git a/public/app/features/datasources/partials/edit.html b/public/app/features/datasources/partials/edit.html
index 7ae595a30b6..27476f684c8 100644
--- a/public/app/features/datasources/partials/edit.html
+++ b/public/app/features/datasources/partials/edit.html
@@ -42,7 +42,7 @@
 						Type
 					</li>
 					<li>
-						<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>
+						<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>
 					</li>
 				</ul>
 				<div class="clearfix"></div>
diff --git a/public/img/checkbox.png b/public/img/checkbox.png
index a1256ec8b95..877f6ddcc2c 100644
Binary files a/public/img/checkbox.png and b/public/img/checkbox.png differ
diff --git a/public/img/checkbox_white.png b/public/img/checkbox_white.png
index 877f6ddcc2c..dbff6d5ab64 100644
Binary files a/public/img/checkbox_white.png and b/public/img/checkbox_white.png differ
diff --git a/public/less/variables.dark.less b/public/less/variables.dark.less
index e1a81829870..715aa4f2660 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_white.png';
+@checkboxImageUrl: '../img/checkbox.png';
 
 // GRID
 // --------------------------------------------------