diff --git a/public/app/features/dashboard/partials/graphiteImport.html b/public/app/features/dashboard/partials/graphiteImport.html
index b3ffaaefcc1..d004db27c02 100644
--- a/public/app/features/dashboard/partials/graphiteImport.html
+++ b/public/app/features/dashboard/partials/graphiteImport.html
@@ -3,22 +3,21 @@
 	<div ng-if="datasources.length > 0">
 		<h2 style="margin-top: 30px;">Load dashboard from Graphite-Web</h2>
 
-		<div class="tight-form last">
-			<ul class="tight-form-list">
-				<li class="tight-form-item" style="width: 150px">
-					<strong>Data source</strong>
-				</li>
-				<li>
+		<div class="gf-form-group">
+			<div class="gf-form-inline">
+				<div class="gf-form">
+					<span class="gf-form-label width-10">Data source</span>
+				</div>
+				<div class="gf-form width-30">
 					<div class="gf-form-select-wrapper">
-						<select type="text" ng-model="options.sourceName" class="input-medium tight-form-input" ng-options="f for f in datasources">
+						<select type="text" ng-model="options.sourceName" class="gf-form-input max-width-10" ng-options="f for f in datasources">
 						</select>
 					</div>
-				</li>
-				<li style="float: right">
-					<button class="btn btn-inverse tight-form-btn" ng-click="listAll()">List dashboards</button>
-				</li>
-				<div class="clearfix"></div>
-			</ul>
+				</div>
+				<div class="gf-form">
+					<button class="btn btn-inverse pull-right" ng-click="listAll()">List dashboards</button>
+				</div>
+			</div>
 		</div>
 
 		<table class="grafana-options-table" style="margin-top: 20px;">