diff --git a/src/app/features/admin/partials/datasources.html b/src/app/features/admin/partials/datasources.html
index 1199fea27f5..9d179817f4e 100644
--- a/src/app/features/admin/partials/datasources.html
+++ b/src/app/features/admin/partials/datasources.html
@@ -26,14 +26,26 @@
 								<em>No datasources defined</em>
 							</div>
 							<table class="grafana-options-table">
+								<tr>
+									<td><strong>Name<strong></td>
+									<td><strong>Url<strong></td>
+									<td><strong><strong></td>
+									<td><strong><strong></td>
+									<td><strong><strong></td>
+								</tr>
 								<tr ng-repeat="ds in datasources">
 									<td style="width:1%">
-										<i class="icon-hdd"></i> &nbsp;
+										<i class="fa fa-database"></i> &nbsp;
 										{{ds.name}}
 									</td>
 									<td style="width:90%">
 										{{ds.url}}
 									</td>
+									<td style="width:2%" class="text-center">
+										<span ng-if="ds.isDefault">
+											<span class="label label-info">default</span>
+										</span>
+									</td>
 									<td style="width: 1%">
 										<a ng-click="edit(ds)" class="btn btn-success btn-mini">
 											<i class="fa fa-edit"></i>
@@ -60,6 +72,7 @@
 								<label class="small">Type</label>
 								<select class="input-medium" ng-model="current.type" ng-options="f for f in ['graphite', 'influxdb', 'opentsdb']" ng-change="typeChanged()"></select>
 							</div>
+							<editor-opt-bool text="Mark as default" model="current.isDefault" change="render()"></editor-opt-bool>
 						</div>
 
 						<div class="editor-row">
diff --git a/src/views/index.html b/src/views/index.html
index dc2d53fbaca..34cfe0c7bbb 100644
--- a/src/views/index.html
+++ b/src/views/index.html
@@ -36,7 +36,7 @@
 			<div class="page-alert-list">
 				<div ng-repeat='alert in dashAlerts.list' class="alert-{{alert.severity}} alert">
 					<button type="button" class="alert-close" ng-click="dashAlerts.clear(alert)">
-						<i class="icon-remove-sign"></i>
+						<i class="fa fa-times-circle"></i>
 					</button>
 					<div class="alert-title">{{alert.title}}</div>
 					<div ng-bind-html='alert.text'></div>