diff --git a/public/app/features/plugins/ds_edit_ctrl.ts b/public/app/features/plugins/ds_edit_ctrl.ts
index d2ca7a82dc4..57e43983b8c 100644
--- a/public/app/features/plugins/ds_edit_ctrl.ts
+++ b/public/app/features/plugins/ds_edit_ctrl.ts
@@ -134,6 +134,24 @@ export class DataSourceEditCtrl {
         });
       }
     };
+
+    confirmDelete() {
+      this.backendSrv.delete('/api/datasources/' + this.current.id).then(() => {
+        this.$location.path('datasources');
+      });
+    }
+
+    delete(s) {
+      this.$scope.appEvent('confirm-modal', {
+        title: 'Delete',
+        text: 'Are you sure you want to delete this datasource?',
+        yesText: "Delete",
+        icon: "fa-trash",
+        onConfirm: () => {
+          this.confirmDelete();
+        }
+      });
+    }
 }
 
 coreModule.controller('DataSourceEditCtrl', DataSourceEditCtrl);
diff --git a/public/app/features/plugins/partials/ds_edit.html b/public/app/features/plugins/partials/ds_edit.html
index 3305bfd67af..1470a312bb0 100644
--- a/public/app/features/plugins/partials/ds_edit.html
+++ b/public/app/features/plugins/partials/ds_edit.html
@@ -66,6 +66,9 @@
         <button type="submit" class="btn btn-success" ng-show="!ctrl.isNew" ng-click="ctrl.saveChanges()">Save</button>
         <button type="submit" class="btn btn-secondary" ng-show="!ctrl.isNew" ng-click="ctrl.saveChanges(true)">
           Test Connection
+        </button>
+				<button type="submit" class="btn btn-danger" ng-show="!ctrl.isNew" ng-click="ctrl.delete()">
+					Delete
         </button>
         <a class="btn btn-link" href="datasources">Cancel</a>
       </div>
diff --git a/public/app/features/plugins/partials/ds_list.html b/public/app/features/plugins/partials/ds_list.html
index 314c165a3ac..c5ca9f514a4 100644
--- a/public/app/features/plugins/partials/ds_list.html
+++ b/public/app/features/plugins/partials/ds_list.html
@@ -18,23 +18,28 @@
 
 		<ol class="card-list" >
 			<li class="card-item-wrapper" ng-repeat="ds in ctrl.datasources">
-				<div class="card-item" >
+				<a class="card-item" href="datasources/edit/{{ds.id}}/">
 					<div class="card-item-header">
 						<i class="icon-gf icon-gf-{{ds.type}}"></i>
 						{{ds.type}}
 					</div>
 					<div class="card-item-body">
-						<a href="datasources/edit/{{ds.id}}">
-							<figure class="card-item-figure">
-								<img ng-src="{{ds.typeLogoUrl}}">
-							</figure>
-						</a>
+						<figure class="card-item-figure">
+							<img ng-src="{{ds.typeLogoUrl}}">
+						</figure>
 						<div class="card-item-details">
-							<a class="card-item-name" href="datasources/edit/{{ds.id}}/">{{ds.name}}</a>
-							<div class="card-item-sub-name">{{ds.url}}</div>
+							<div class="card-item-name">
+								{{ds.name}}
+								<span ng-if="ds.isDefault">
+									<span class="btn btn-secondary btn-mini">default</span>
+								</span>
+							</div>
+							<div class="card-item-sub-name">
+								{{ds.url}}
+							</div>
 						</div>
 					</div>
-				</div>
+				</a>
 			</li>
 		</ol>
 	</section>
@@ -43,49 +48,4 @@
 		<em>No data sources defined</em>
 	</div>
 
-	<table class="filter-table" ng-if="ctrl.datasources.length > 0">
-		<thead>
-			<tr>
-				<th><strong>name</strong></th>
-				<th><strong>type</strong></th>
-				<th><strong>url</strong></th>
-				<th style="width: 60px;"></th>
-				<th style="width: 85px;"></th>
-				<th style="width: 44px;"></th>
-			</tr>
-		</thead>
-		<tbody>
-			<tr ng-repeat="ds in ctrl.datasources">
-				<td>
-					<a href="datasources/edit/{{ds.id}}">
-						<i class="icon-gf inline-icon-gf icon-gf-datasources"></i> &nbsp; {{ds.name}}
-					</a>
-				</td>
-				<td>
-					<span>{{ds.type}}</span>
-				</td>
-				<td>
-					<span>{{ds.url}}</span>
-				</td>
-				<td class="text-center">
-					<span ng-if="ds.isDefault">
-						<span class="btn btn-secondary btn-mini">default</span>
-					</span>
-				</td>
-				<td class="text-right">
-					<a href="datasources/edit/{{ds.id}}" class="btn btn-inverse btn-small">
-						<i class="fa fa-edit"></i>
-						Edit
-					</a>
-				</td>
-				<td class="text-right">
-					<a ng-click="ctrl.removeDataSource(ds)" class="btn btn-danger btn-small">
-						<i class="fa fa-remove"></i>
-					</a>
-				</td>
-			</tr>
-		</tbody>
-	</table>
-
-</div>
 </div>
diff --git a/public/sass/components/_cards.scss b/public/sass/components/_cards.scss
index eb5c6875ac0..01f619bf4c2 100644
--- a/public/sass/components/_cards.scss
+++ b/public/sass/components/_cards.scss
@@ -106,8 +106,14 @@
 .card-list-layout-list {
 
   .card-item-wrapper {
+    padding: 0;
     width: 100%;
-    padding: 0 0 1.5rem 0rem;
+  }
+
+  .card-item {
+    border-bottom: .2rem solid $page-bg;
+    border-radius: 0;
+    box-shadow: none;
   }
 
   .card-item-header {