diff --git a/public/app/features/annotations/partials/editor.html b/public/app/features/annotations/partials/editor.html
index 62175e5278f..289f368ad0e 100644
--- a/public/app/features/annotations/partials/editor.html
+++ b/public/app/features/annotations/partials/editor.html
@@ -27,7 +27,7 @@
 						{{annotation.name}}
 					</td>
 					<td style="width:90%" ng-show="annotation.builtIn" class="pointer" ng-click="ctrl.edit(annotation)">
-						<i class="fa fa-comment"></i> &nbsp;
+						<i class="gicon gicon-annotation"></i> &nbsp;
 						<em class="muted">{{annotation.name}} (Built-in)</em>
 					</td>
 					<td class="pointer" ng-click="ctrl.edit(annotation)">
@@ -49,7 +49,7 @@
 			<div class="empty-list-cta">
 				<div class="empty-list-cta__title">There are no custom annotation queries added yet</div>
 				<a ng-click="ctrl.setupNew()" class="empty-list-cta__button btn btn-xlarge btn-success">
-					<i class="gicon gicon-dashboard-new"></i>
+					<i class="gicon gicon-add-annotation"></i>
 					Add Annotation Query
 				</a>
 				<div class="grafana-info-box">
diff --git a/public/app/features/dashlinks/editor.html b/public/app/features/dashlinks/editor.html
index 14d43b5bd4f..f6c6552e6bb 100644
--- a/public/app/features/dashlinks/editor.html
+++ b/public/app/features/dashlinks/editor.html
@@ -11,7 +11,7 @@
         There are no dashboard links added yet
       </div>
       <a ng-click="ctrl.setupNew()" class="empty-list-cta__button btn btn-xlarge btn-success">
-        <i class="gicon gicon-dashboard-new"></i>
+        <i class="gicon gicon-add-link"></i>
         Add Dashboard Link
       </a>
       <div class="grafana-info-box">
diff --git a/public/app/features/templating/partials/editor.html b/public/app/features/templating/partials/editor.html
index c199c421a96..2fb80a6ac50 100644
--- a/public/app/features/templating/partials/editor.html
+++ b/public/app/features/templating/partials/editor.html
@@ -12,7 +12,7 @@
 			<div class="empty-list-cta">
 				<div class="empty-list-cta__title">There are no variables added yet</div>
 				<a ng-click="setMode('new')" class="empty-list-cta__button btn btn-xlarge btn-success">
-					<i class="gicon gicon-dashboard-new"></i>
+					<i class="gicon gicon-add-variable"></i>
 					Add variable
 				</a>
 				<div class="grafana-info-box">
diff --git a/public/img/icons_dark_theme/icon_json.svg b/public/img/icons_dark_theme/icon_json.svg
index 13b22046a80..30b0d9d0972 100644
--- a/public/img/icons_dark_theme/icon_json.svg
+++ b/public/img/icons_dark_theme/icon_json.svg
@@ -3,18 +3,32 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="64px" height="64px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
 <style type="text/css">
-	.st0{fill:#E3E3E3;}
+	.st0{fill:#E3E2E2;}
 </style>
 <g>
-	<path class="st0" d="M17.1,50.5c-0.8,0-1.7-0.3-2.3-1L0,34.8l14-14c1.3-1.3,3.4-1.3,4.6,0c1.3,1.3,1.3,3.4,0,4.6l-9.3,9.3
-		l10.2,10.2c1.3,1.3,1.3,3.4,0,4.6C18.8,50.2,17.9,50.5,17.1,50.5z"/>
+	<path class="st0" d="M0.1,31.8c0-1.6,1-2.9,2.5-3.4c0.5-0.2,1-0.4,1.4-0.6c0.9-0.6,1.4-1.5,1.4-2.7v-9.9c0-2,0.4-3.5,1.1-4.5
+		c0.7-1,1.9-1.7,3.4-2.2c0.9-0.3,2-0.4,3.3-0.5c1.8-0.2,3.3,1.2,3.3,3v0.1c0,1.4-1,2.6-2.4,3c-0.1,0-0.1,0-0.2,0.1
+		c-0.5,0.2-0.8,0.4-1.1,0.7c-0.3,0.3-0.4,0.7-0.4,1.3v10.3c0,1.6-0.4,2.9-1.2,3.7c-0.8,0.9-2.1,1.4-4,1.7v0.3c1.8,0.3,3.2,0.9,4,1.7
+		c0.8,0.8,1.2,2,1.2,3.6v10.4c0,0.6,0.2,1,0.5,1.3c0.3,0.3,0.7,0.5,1.2,0.7c0,0,0.1,0,0.1,0c1.4,0.4,2.3,1.6,2.3,3v0
+		c0,1.8-1.6,3.3-3.4,3.1c-1.3-0.1-2.3-0.3-3.2-0.6c-1.6-0.5-2.7-1.2-3.4-2.2c-0.7-1-1-2.5-1-4.5v-9.8c0-1.1-0.5-2-1.4-2.7
+		c-0.4-0.3-0.8-0.5-1.3-0.6c-1.5-0.5-2.5-1.8-2.5-3.4V31.8z"/>
 </g>
 <g>
-	<path class="st0" d="M47.7,50.5c-0.8,0-1.7-0.3-2.3-1c-1.3-1.3-1.3-3.4,0-4.6l9.3-9.3L44.5,25.4c-1.3-1.3-1.3-3.4,0-4.6
-		c1.3-1.3,3.4-1.3,4.6,0L64,35.6l-14,14C49.4,50.2,48.6,50.5,47.7,50.5z"/>
+	<g>
+		<path class="st0" d="M64,32.2c0,1.6-1,2.9-2.5,3.4c-0.5,0.2-0.9,0.4-1.3,0.6c-1,0.6-1.4,1.5-1.4,2.7v9.8c0,2-0.4,3.5-1.1,4.5
+			c-0.7,1-1.8,1.7-3.4,2.2c-0.9,0.3-1.9,0.4-3.2,0.6c-1.8,0.2-3.4-1.3-3.4-3.1v0c0-1.4,1-2.7,2.4-3c0.4-0.1,0.6-0.2,0.9-0.3
+			c0.6-0.4,0.9-0.9,0.9-1.7V37.4c0-1.6,0.4-2.8,1.2-3.6c0.8-0.8,2.1-1.4,4-1.7v-0.3c-1.8-0.3-3.1-0.8-4-1.7
+			c-0.8-0.9-1.2-2.1-1.2-3.7V16.2c0-0.6-0.1-1-0.4-1.3c-0.3-0.3-0.6-0.5-1.1-0.7c-0.1,0-0.1,0-0.2-0.1c-1.4-0.4-2.4-1.6-2.4-3v-0.1
+			c0-1.8,1.6-3.2,3.3-3.1c1.3,0.1,2.4,0.3,3.2,0.5c1.6,0.5,2.7,1.2,3.4,2.2c0.7,1,1.1,2.5,1.1,4.5v9.9c0,1.2,0.5,2.1,1.4,2.7
+			c0.4,0.3,0.8,0.5,1.3,0.6c1.5,0.5,2.6,1.8,2.6,3.4V32.2z"/>
+	</g>
+	<g>
+		<path class="st0" d="M42.9,55.5h-6.5c-1.7,0-3.1-1.4-3.1-3.1c0-1.7,1.4-3.1,3.1-3.1h3.4V14.7h-2.6c-1.7,0-3.1-1.4-3.1-3.1
+			s1.4-3.1,3.1-3.1h5.7c1.7,0,3.1,1.4,3.1,3.1v40.9C46,54.1,44.6,55.5,42.9,55.5z"/>
+	</g>
 </g>
 <g>
-	<path class="st0" d="M25.5,54c-0.4,0-0.9-0.1-1.3-0.3c-1.8-0.7-2.7-2.8-2-4.6l13.4-33.8c0.7-1.8,2.8-2.7,4.6-2
-		c1.8,0.7,2.7,2.8,2,4.6L28.8,51.7C28.2,53.1,26.9,54,25.5,54z"/>
+	<path class="st0" d="M20.4,8.5H27c1.7,0,3.1,1.4,3.1,3.1s-1.4,3.1-3.1,3.1h-3.4v34.6h2.6c1.7,0,3.1,1.4,3.1,3.1s-1.4,3.1-3.1,3.1
+		h-5.7c-1.7,0-3.1-1.4-3.1-3.1V11.6C17.3,9.9,18.7,8.5,20.4,8.5z"/>
 </g>
 </svg>
diff --git a/public/img/icons_light_theme/icon_json.svg b/public/img/icons_light_theme/icon_json.svg
index 0b88bae45ce..42ea7083403 100644
--- a/public/img/icons_light_theme/icon_json.svg
+++ b/public/img/icons_light_theme/icon_json.svg
@@ -6,15 +6,29 @@
 	.st0{fill:#555555;}
 </style>
 <g>
-	<path class="st0" d="M17.1,50.5c-0.8,0-1.7-0.3-2.3-1L0,34.8l14-14c1.3-1.3,3.4-1.3,4.6,0c1.3,1.3,1.3,3.4,0,4.6l-9.3,9.3
-		l10.2,10.2c1.3,1.3,1.3,3.4,0,4.6C18.8,50.2,17.9,50.5,17.1,50.5z"/>
+	<path class="st0" d="M0.1,31.8c0-1.6,1-2.9,2.5-3.4c0.5-0.2,1-0.4,1.4-0.6c0.9-0.6,1.4-1.5,1.4-2.7v-9.9c0-2,0.4-3.5,1.1-4.5
+		c0.7-1,1.9-1.7,3.4-2.2c0.9-0.3,2-0.4,3.3-0.5c1.8-0.2,3.3,1.2,3.3,3v0.1c0,1.4-1,2.6-2.4,3c-0.1,0-0.1,0-0.2,0.1
+		c-0.5,0.2-0.8,0.4-1.1,0.7c-0.3,0.3-0.4,0.7-0.4,1.3v10.3c0,1.6-0.4,2.9-1.2,3.7c-0.8,0.9-2.1,1.4-4,1.7v0.3c1.8,0.3,3.2,0.9,4,1.7
+		c0.8,0.8,1.2,2,1.2,3.6v10.4c0,0.6,0.2,1,0.5,1.3c0.3,0.3,0.7,0.5,1.2,0.7c0,0,0.1,0,0.1,0c1.4,0.4,2.3,1.6,2.3,3v0
+		c0,1.8-1.6,3.3-3.4,3.1c-1.3-0.1-2.3-0.3-3.2-0.6c-1.6-0.5-2.7-1.2-3.4-2.2c-0.7-1-1-2.5-1-4.5v-9.8c0-1.1-0.5-2-1.4-2.7
+		c-0.4-0.3-0.8-0.5-1.3-0.6c-1.5-0.5-2.5-1.8-2.5-3.4V31.8z"/>
 </g>
 <g>
-	<path class="st0" d="M47.7,50.5c-0.8,0-1.7-0.3-2.3-1c-1.3-1.3-1.3-3.4,0-4.6l9.3-9.3L44.5,25.4c-1.3-1.3-1.3-3.4,0-4.6
-		c1.3-1.3,3.4-1.3,4.6,0L64,35.6l-14,14C49.4,50.2,48.6,50.5,47.7,50.5z"/>
+	<g>
+		<path class="st0" d="M64,32.2c0,1.6-1,2.9-2.5,3.4c-0.5,0.2-0.9,0.4-1.3,0.6c-1,0.6-1.4,1.5-1.4,2.7v9.8c0,2-0.4,3.5-1.1,4.5
+			c-0.7,1-1.8,1.7-3.4,2.2c-0.9,0.3-1.9,0.4-3.2,0.6c-1.8,0.2-3.4-1.3-3.4-3.1v0c0-1.4,1-2.7,2.4-3c0.4-0.1,0.6-0.2,0.9-0.3
+			c0.6-0.4,0.9-0.9,0.9-1.7V37.4c0-1.6,0.4-2.8,1.2-3.6c0.8-0.8,2.1-1.4,4-1.7v-0.3c-1.8-0.3-3.1-0.8-4-1.7
+			c-0.8-0.9-1.2-2.1-1.2-3.7V16.2c0-0.6-0.1-1-0.4-1.3c-0.3-0.3-0.6-0.5-1.1-0.7c-0.1,0-0.1,0-0.2-0.1c-1.4-0.4-2.4-1.6-2.4-3v-0.1
+			c0-1.8,1.6-3.2,3.3-3.1c1.3,0.1,2.4,0.3,3.2,0.5c1.6,0.5,2.7,1.2,3.4,2.2c0.7,1,1.1,2.5,1.1,4.5v9.9c0,1.2,0.5,2.1,1.4,2.7
+			c0.4,0.3,0.8,0.5,1.3,0.6c1.5,0.5,2.6,1.8,2.6,3.4V32.2z"/>
+	</g>
+	<g>
+		<path class="st0" d="M42.9,55.5h-6.5c-1.7,0-3.1-1.4-3.1-3.1c0-1.7,1.4-3.1,3.1-3.1h3.4V14.7h-2.6c-1.7,0-3.1-1.4-3.1-3.1
+			s1.4-3.1,3.1-3.1h5.7c1.7,0,3.1,1.4,3.1,3.1v40.9C46,54.1,44.6,55.5,42.9,55.5z"/>
+	</g>
 </g>
 <g>
-	<path class="st0" d="M25.5,54c-0.4,0-0.9-0.1-1.3-0.3c-1.8-0.7-2.7-2.8-2-4.6l13.4-33.8c0.7-1.8,2.8-2.7,4.6-2
-		c1.8,0.7,2.7,2.8,2,4.6L28.8,51.7C28.2,53.1,26.9,54,25.5,54z"/>
+	<path class="st0" d="M20.4,8.5H27c1.7,0,3.1,1.4,3.1,3.1s-1.4,3.1-3.1,3.1h-3.4v34.6h2.6c1.7,0,3.1,1.4,3.1,3.1s-1.4,3.1-3.1,3.1
+		h-5.7c-1.7,0-3.1-1.4-3.1-3.1V11.6C17.3,9.9,18.7,8.5,20.4,8.5z"/>
 </g>
 </svg>