diff --git a/public/app/partials/metrics.html b/public/app/partials/metrics.html
index 7b30c42a066..80ab429e950 100644
--- a/public/app/partials/metrics.html
+++ b/public/app/partials/metrics.html
@@ -14,7 +14,7 @@
 		<span class="dropdown" ng-if="datasource.meta.type === 'mixed'">
 			<button class="btn btn-inverse dropdown-toggle" data-toggle="dropdown">
 				<i class="fa fa-plus"></i>&nbsp;
-				Query
+				Query &nbsp; <span class="caret"></span>
 			</button>
 
 			<ul class="dropdown-menu" role="menu">
@@ -34,12 +34,12 @@
 	<div class="pull-right dropdown" style="margin-right: 10px;">
 		<button class="btn btn-inverse dropdown-toggle" data-toggle="dropdown" bs-tooltip="'Datasource'">
 			<i class="fa fa-database"></i>&nbsp;
-			{{datasource.name}} <span class="caret"></span>
+			{{datasource.name}} &nbsp; <span class="caret"></span>
 		</button>
 
 		<ul class="dropdown-menu" role="menu">
 			<li ng-repeat="datasource in datasources" role="menuitem">
-				<a ng-click="setDatasource(datasource.value);">{{datasource.name}}</a>
+				<a ng-click="setDatasource(datasource);">{{datasource.name}}</a>
 			</li>
 		</ul>
 	</div>
diff --git a/public/css/less/bootswatch.dark.less b/public/css/less/bootswatch.dark.less
index 4d83d04199c..ff15f4884ec 100644
--- a/public/css/less/bootswatch.dark.less
+++ b/public/css/less/bootswatch.dark.less
@@ -358,7 +358,6 @@ div.subnav {
 
 // BUTTONS
 // -----------------------------------------------------
-
 .btn {
 	padding: 5px 12px;
 	background-image: none;
@@ -389,13 +388,6 @@ div.subnav {
 }
 
 .btn-group {
-
-	& > .btn:first-child,
-	& > .btn:last-child,
-	& > .dropdown-toggle {
-		.border-radius(0);
-	}
-
 	& > .btn + .dropdown-toggle {
 		.box-shadow(none);
 	}
diff --git a/public/vendor/bootstrap/less/bootstrap.less b/public/vendor/bootstrap/less/bootstrap.less
index 758dbde9848..79621cebf4c 100644
--- a/public/vendor/bootstrap/less/bootstrap.less
+++ b/public/vendor/bootstrap/less/bootstrap.less
@@ -32,6 +32,7 @@
 
 // Components: Buttons & Alerts
 @import "buttons.less";
+// @import "button-groups.less";
 @import "alerts.less"; // Note: alerts share common CSS with buttons and thus have styles in buttons.less
 
 // Components: Nav