diff --git a/pkg/api/index.go b/pkg/api/index.go
index 01e85f92654..4a94a418c8e 100644
--- a/pkg/api/index.go
+++ b/pkg/api/index.go
@@ -104,6 +104,7 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) {
 		{Text: "Home", Url: setting.AppSubUrl + "/", Icon: "fa fa-fw fa-home"},
 		{Text: "Playlists", Id: "playlists", Url: setting.AppSubUrl + "/playlists", Icon: "fa fa-fw fa-film"},
 		{Text: "Snapshots", Id: "snapshots", Url: setting.AppSubUrl + "/dashboard/snapshots", Icon: "icon-gf icon-gf-fw icon-gf-snapshot"},
+		{Text: "Dashboard List", Description: "Manage Dashboards And Folders", Id: "dashboards", Url: setting.AppSubUrl + "/dashboards", Icon: "fa fa-fw fa-bars"},
 	}
 
 	data.NavTree = append(data.NavTree, &dtos.NavLink{
@@ -208,21 +209,16 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) {
 			Children: []*dtos.NavLink{
 				{
 					Text:        "Data Sources",
-					Icon:        "icon-gf icon-gf-fw icon-gf-datasources",
+					Icon:        "gicon gicon-datasources",
 					Description: "Add and configure data sources",
 					Id:          "datasources",
 					Url:         setting.AppSubUrl + "/datasources",
 					Children: []*dtos.NavLink{
-						{Text: "List", Url: setting.AppSubUrl + "/datasources", Icon: "icon-gf icon-gf-datasources"},
+						{Text: "List", Url: setting.AppSubUrl + "/datasources", Icon: "gicon gicon-datasources"},
 						{Text: "New", Url: setting.AppSubUrl + "/datasources", Icon: "fa fa-fw fa-plus"},
 					},
 				},
-				{
-					Text:        "Dashboard List",
-					Description: "Manage Dashboards And Folders",
-					Id:          "dashboards",
-					Url:         setting.AppSubUrl + "/dashboards",
-				},
+
 				{
 					Text:        "Preferences",
 					Id:          "org",
diff --git a/public/app/features/dashboard/dashgrid/AddPanelPanel.tsx b/public/app/features/dashboard/dashgrid/AddPanelPanel.tsx
index 5b03cb8af54..8415d9c14b2 100644
--- a/public/app/features/dashboard/dashgrid/AddPanelPanel.tsx
+++ b/public/app/features/dashboard/dashgrid/AddPanelPanel.tsx
@@ -34,7 +34,7 @@ export class AddPanelPanel extends React.Component<AddPanelPanelProps, AddPanelP
       .value();
 
     // add special row type
-    panels.push({id: 'row', name: 'Row', sort: 8, info: {logos: {small: 'public/img/icn-panel.svg'}}});
+    panels.push({id: 'row', name: 'Row', sort: 8, info: {logos: {small: 'public/img/icn-row.svg'}}});
 
     // add sort by sort property
     return _.sortBy(panels, 'sort');
diff --git a/public/img/icn-row.svg b/public/img/icn-row.svg
new file mode 100644
index 00000000000..5218991033b
--- /dev/null
+++ b/public/img/icn-row.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 20.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<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="100px" height="100px" viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#898989;}
+	.st1{fill:url(#SVGID_1_);}
+</style>
+<g>
+	<path class="st0" d="M0,98V74.4c0-1.1,0.9-2,2-2H98c1.1,0,2,0.9,2,2V98c0,1.1-0.9,2-2,2H2C0.9,100,0,99.1,0,98z"/>
+	<path class="st0" d="M0,24.7v-22C0,1.2,1.2,0,2.6,0h94.8c1.4,0,2.6,1.2,2.6,2.8v22c0,1.5-1.2,2.8-2.6,2.8H2.6
+		C1.2,27.5,0,26.3,0,24.7z"/>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="50" y1="94.582" x2="50" y2="11.6586">
+		<stop  offset="0" style="stop-color:#FFF23A"/>
+		<stop  offset="4.010540e-02" style="stop-color:#FEE62D"/>
+		<stop  offset="0.1171" style="stop-color:#FED41A"/>
+		<stop  offset="0.1964" style="stop-color:#FDC90F"/>
+		<stop  offset="0.2809" style="stop-color:#FDC60B"/>
+		<stop  offset="0.6685" style="stop-color:#F28F3F"/>
+		<stop  offset="0.8876" style="stop-color:#ED693C"/>
+		<stop  offset="1" style="stop-color:#E83E39"/>
+	</linearGradient>
+	<path class="st1" d="M0,61.8V38.2c0-1.1,0.9-2,2-2H98c1.1,0,2,0.9,2,2v23.6c0,1.1-0.9,2-2,2H2C0.9,63.8,0,62.9,0,61.8z"/>
+</g>
+</svg>
diff --git a/public/img/icons_dark_theme/icon_add_folder.svg b/public/img/icons_dark_theme/icon_add_folder.svg
index 3eddd5ddc5d..0e3357d1086 100644
--- a/public/img/icons_dark_theme/icon_add_folder.svg
+++ b/public/img/icons_dark_theme/icon_add_folder.svg
@@ -7,11 +7,12 @@
 	.st1{fill:url(#SVGID_1_);}
 </style>
 <g>
-	<path class="st0" d="M33.9,47.9v-7.2c0-2.4,1.9-4.3,4.3-4.3h4.4v-4.4c0-2.4,1.9-4.3,4.3-4.3H54c2.4,0,4.3,1.9,4.3,4.3v4.4h1.4
-		L63.8,26c0.9-2.2-0.8-4.4-3.2-4.4H16.2c-1.9,0-3.5,1.2-4.1,2.9L3.3,51.4h6.4h26C34.6,50.6,33.9,49.3,33.9,47.9z"/>
-	<path class="st0" d="M14.6,18.2H60v-0.8c0-3.2-2.6-5.8-5.8-5.8h-25L28,8.5l0-0.1c-0.5-1-1.5-1.6-2.6-1.6H12.7
-		c-1.1,0-2.1,0.6-2.6,1.7l-1.2,3.2H5.8c-3.2,0-5.8,2.6-5.8,5.8v33.9l9.2-29.1C10,19.8,12.1,18.2,14.6,18.2z"/>
-	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="50.3805" y1="69.5624" x2="50.3805" y2="18.6477">
+	<path class="st0" d="M13.6,16.1h42.5v-0.8c0-3-2.4-5.4-5.4-5.4H27.3L26.1,7l0-0.1c-0.4-0.9-1.4-1.5-2.4-1.5H11.9
+		c-1,0-2,0.6-2.4,1.5L8.3,9.9H5.4c-3,0-5.4,2.4-5.4,5.4v27.1v1V47l0.4-1.3c0,0,0,0,0,0l0.9-2.8l7.3-23.1
+		C9.3,17.6,11.3,16.1,13.6,16.1z"/>
+	<path class="st0" d="M29.3,39.6c0-3.2,2.6-5.8,5.8-5.8h4.1v-4.1c0-3.2,2.6-5.8,5.8-5.8h8.3c2.2,0,4.1,1.2,5,3l1.2-3.3
+		c0.8-2.1-0.8-4.4-3-4.4H15.1c-1.7,0-3.3,1.1-3.8,2.8L3.1,48.5H9h20.3c0-0.2,0-0.4,0-0.6V39.6z"/>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="49.157" y1="79.0477" x2="49.157" y2="10.375">
 		<stop  offset="0" style="stop-color:#FFF23A"/>
 		<stop  offset="4.010540e-02" style="stop-color:#FEE62D"/>
 		<stop  offset="0.1171" style="stop-color:#FED41A"/>
@@ -21,8 +22,8 @@
 		<stop  offset="0.8876" style="stop-color:#ED693C"/>
 		<stop  offset="1" style="stop-color:#E83E39"/>
 	</linearGradient>
-	<path class="st1" d="M62.6,40h-4.4h-0.3h-3.2v-7.9c0-0.4-0.3-0.7-0.7-0.7h-7.2c-0.4,0-0.7,0.3-0.7,0.7V40h-7.9
-		c-0.4,0-0.7,0.3-0.7,0.7v7.2c0,0.4,0.3,0.7,0.7,0.7h7.9v2.8v1.1v4c0,0.4,0.3,0.7,0.7,0.7H54c0.4,0,0.7-0.3,0.7-0.7v-7.9h7.9
-		c0.4,0,0.7-0.3,0.7-0.7v-7.2C63.3,40.4,63,40,62.6,40z"/>
+	<path class="st1" d="M63.2,38.8h-5h-0.4h-3.7v-0.7v-8.4c0-0.4-0.4-0.8-0.8-0.8H45c-0.4,0-0.8,0.4-0.8,0.8v9.1h-9.1
+		c-0.4,0-0.8,0.4-0.8,0.8v8.3c0,0.2,0.1,0.4,0.3,0.6c0.1,0.1,0.3,0.2,0.5,0.2h9.1v3.2v1.3v4.6c0,0.4,0.4,0.8,0.8,0.8h8.3
+		c0.4,0,0.8-0.4,0.8-0.8v-9.1h9.1c0.4,0,0.8-0.4,0.8-0.8v-8.3C64,39.2,63.6,38.8,63.2,38.8z"/>
 </g>
 </svg>
diff --git a/public/img/icons_dark_theme/icon_data_sources.svg b/public/img/icons_dark_theme/icon_data_sources.svg
new file mode 100644
index 00000000000..5cce28eb217
--- /dev/null
+++ b/public/img/icons_dark_theme/icon_data_sources.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 20.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<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="100px" height="100px" viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#E2E2E2;}
+</style>
+<g>
+	<path class="st0" d="M50,84.1c-22.1,0-40.7-6.5-49.3-16.2C0.2,69.1,0,70.4,0,71.7c0,13,22.9,23.9,50,23.9s50-11,50-23.9
+		c0-1.3-0.2-2.6-0.7-3.9C90.7,77.5,72.1,84.1,50,84.1z"/>
+	<path class="st0" d="M50,62.3c-22.1,0-40.7-6.5-49.3-16.2C0.2,47.4,0,48.7,0,50c0,13,22.9,23.9,50,23.9s50-11,50-23.9
+		c0-1.3-0.2-2.6-0.7-3.9C90.7,55.8,72.1,62.3,50,62.3z"/>
+	<path class="st0" d="M0,28.3c0,13,22.9,23.9,50,23.9s50-11,50-23.9S77.1,4.3,50,4.3S0,15.3,0,28.3z"/>
+</g>
+</svg>
diff --git a/public/img/icons_dark_theme/icon_import_dashboard.svg b/public/img/icons_dark_theme/icon_import_dashboard.svg
index 20b3e6c27e8..d21511c31c5 100644
--- a/public/img/icons_dark_theme/icon_import_dashboard.svg
+++ b/public/img/icons_dark_theme/icon_import_dashboard.svg
@@ -3,30 +3,28 @@
 <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;}
 	.st1{fill:url(#SVGID_1_);}
 </style>
-<g>
-	<path class="st0" d="M7.8,28.6H25c3.1,0,5.7-2.6,5.7-5.7V5.7C30.7,2.6,28.1,0,25,0H7.8C4.6,0,2.1,2.6,2.1,5.7v17.2
-		C2.1,26.1,4.6,28.6,7.8,28.6z"/>
-	<path class="st0" d="M56.2,0H39c-3.1,0-5.7,2.6-5.7,5.7v17.2c0,3.1,2.6,5.7,5.7,5.7h17.2c3.1,0,5.7-2.6,5.7-5.7V5.7
-		C61.9,2.6,59.4,0,56.2,0z"/>
-	<path class="st0" d="M21,52.5h-4.3c-2.2,0-4.1-1.3-4.9-3.3c-0.8-2-0.4-4.3,1.2-5.8l12.8-12.8c-0.2,0-0.5-0.1-0.8-0.1H7.8
-		c-3.1,0-5.7,2.6-5.7,5.7v17.2c0,3.1,2.6,5.7,5.7,5.7H21v-3.1V52.5z"/>
-	<path class="st0" d="M56.2,30.5H39c-0.3,0-0.5,0-0.8,0.1l3.3,3.3l2.8,2.8l6.8,6.8c1.5,1.5,2,3.8,1.2,5.8c-0.8,2-2.8,3.3-4.9,3.3H43
-		v6.6h13.2c3.1,0,5.7-2.6,5.7-5.7V36.2C61.9,33,59.4,30.5,56.2,30.5z"/>
-	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="32" y1="87.7672" x2="32" y2="19.0301">
-		<stop  offset="0" style="stop-color:#FFF33B"/>
-		<stop  offset="5.948725e-02" style="stop-color:#FFE029"/>
-		<stop  offset="0.1303" style="stop-color:#FFD218"/>
-		<stop  offset="0.2032" style="stop-color:#FEC90F"/>
-		<stop  offset="0.2809" style="stop-color:#FDC70C"/>
-		<stop  offset="0.6685" style="stop-color:#F3903F"/>
-		<stop  offset="0.8876" style="stop-color:#ED683C"/>
-		<stop  offset="1" style="stop-color:#E93E3A"/>
-	</linearGradient>
-	<path class="st1" d="M48.3,46.2l-6.8-6.8l-2.8-2.8l-4-4l-0.1-0.1L33,30.9c-0.3-0.3-0.6-0.4-1-0.4c-0.3,0-0.7,0.1-1,0.4l-1.7,1.7
-		l-0.1,0.1L15.7,46.2c-0.9,0.9-0.2,2.3,1,2.3h7c0.7,0,1.4,0.6,1.4,1.4v0.5v5.6v3.1v0.1v3.4c0,0.7,0.6,1.4,1.4,1.4h11.3
-		c0.7,0,1.4-0.6,1.4-1.4v-3.4v-0.1v-9.2c0-0.7,0.6-1.4,1.4-1.4h7C48.5,48.5,49.1,47,48.3,46.2z"/>
-</g>
+<path class="st0" d="M8.1,26.5h15.6c2.8,0,5.2-2.3,5.2-5.2V5.8c0-2.8-2.3-5.2-5.2-5.2H8.1c-2.8,0-5.2,2.3-5.2,5.2v15.6
+	C2.9,24.2,5.3,26.5,8.1,26.5z"/>
+<path class="st0" d="M51.9,0.6H36.3c-2.8,0-5.2,2.3-5.2,5.2v15.6c0,2.8,2.3,5.2,5.2,5.2h15.6c2.8,0,5.2-2.3,5.2-5.2V5.8
+	C57.1,2.9,54.7,0.6,51.9,0.6z"/>
+<path class="st0" d="M9.8,50.6c-1-2.4-0.4-5,1.4-6.8l12.8-12.8l1.6-1.6c0.2-0.2,0.4-0.3,0.6-0.5c-0.7-0.4-1.6-0.6-2.5-0.6H8.1
+	c-2.8,0-5.2,2.3-5.2,5.2v15.6c0,2.8,2.3,5.2,5.2,5.2h5.4C11.9,53.5,10.5,52.2,9.8,50.6z"/>
+<path class="st0" d="M51.9,28.2H36.3c-0.9,0-1.7,0.2-2.5,0.6c0.2,0.2,0.4,0.3,0.6,0.5l1.6,1.6l3.8,3.8l2.6,2.6l6.4,6.4
+	c1.8,1.8,2.3,4.5,1.4,6.8c-0.7,1.7-2.1,2.9-3.7,3.5h5.4c2.8,0,5.2-2.3,5.2-5.2V33.3C57.1,30.5,54.7,28.2,51.9,28.2z"/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="30" y1="77.0702" x2="30" y2="17.5">
+	<stop  offset="0" style="stop-color:#FFF23A"/>
+	<stop  offset="4.010540e-02" style="stop-color:#FEE62D"/>
+	<stop  offset="0.1171" style="stop-color:#FED41A"/>
+	<stop  offset="0.1964" style="stop-color:#FDC90F"/>
+	<stop  offset="0.2809" style="stop-color:#FDC60B"/>
+	<stop  offset="0.6685" style="stop-color:#F28F3F"/>
+	<stop  offset="0.8876" style="stop-color:#ED693C"/>
+	<stop  offset="1" style="stop-color:#E83E39"/>
+</linearGradient>
+<path class="st1" d="M45.3,47.3l-6.4-6.4l-2.6-2.6l-3.8-3.8l-1.3-1.3l-0.3-0.3c-0.2-0.2-0.6-0.4-0.9-0.4s-0.7,0.1-0.9,0.4l-0.3,0.3
+	l-1.3,1.3L14.7,47.3c-0.8,0.8-0.2,2.2,0.9,2.2h6.5c0.7,0,1.3,0.6,1.3,1.3v0.4v2.9v2.4v3.1v3.2c0,0.7,0.6,1.3,1.3,1.3h10.6
+	c0.7,0,1.3-0.6,1.3-1.3v-3.2v-5.4v-3.4c0-0.7,0.6-1.3,1.3-1.3h6.5C45.5,49.4,46.1,48.1,45.3,47.3z"/>
 </svg>
diff --git a/public/img/icons_dark_theme/icon_new_dashboard.svg b/public/img/icons_dark_theme/icon_new_dashboard.svg
index a7927425ba5..33f116dcab1 100644
--- a/public/img/icons_dark_theme/icon_new_dashboard.svg
+++ b/public/img/icons_dark_theme/icon_new_dashboard.svg
@@ -7,27 +7,26 @@
 	.st1{fill:url(#SVGID_1_);}
 </style>
 <g>
-	<path class="st0" d="M22.9,0.6H5.7C2.6,0.6,0,3.2,0,6.4v17.2c0,3.2,2.6,5.7,5.7,5.7h17.2c3.2,0,5.7-2.6,5.7-5.7V6.4
-		C28.7,3.2,26.1,0.6,22.9,0.6z"/>
-	<path class="st0" d="M37,29.3h17.2c3.2,0,5.7-2.6,5.7-5.7V6.4c0-3.2-2.6-5.7-5.7-5.7H37c-3.2,0-5.7,2.6-5.7,5.7v17.2
-		C31.3,26.7,33.8,29.3,37,29.3z"/>
-	<path class="st0" d="M22.9,31.2H5.7c-3.2,0-5.7,2.6-5.7,5.7v17.2c0,3.2,2.6,5.7,5.7,5.7h17.2c3.2,0,5.7-2.6,5.7-5.7V36.9
-		C28.7,33.7,26.1,31.2,22.9,31.2z"/>
-	<path class="st0" d="M43.1,58.8h-4.5c-2.3,0-4.2-1.9-4.2-4.2v-7.3c0-2.3,1.9-4.2,4.2-4.2h4.5v-4.5c0-2.3,1.9-4.2,4.2-4.2h7.3
-		c2.3,0,4.2,1.9,4.2,4.2v4.5h0.1h1v-6.2c0-3.2-2.6-5.7-5.7-5.7H37c-3.2,0-5.7,2.6-5.7,5.7v17.2c0,3.2,2.6,5.7,5.7,5.7h6.1v-0.6V58.8
-		z"/>
-	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="50.9085" y1="76.5403" x2="50.9085" y2="16.4935">
-		<stop  offset="0" style="stop-color:#FBEE41"/>
-		<stop  offset="4.010540e-02" style="stop-color:#FBE334"/>
-		<stop  offset="0.1171" style="stop-color:#FCD321"/>
-		<stop  offset="0.1964" style="stop-color:#FCC916"/>
-		<stop  offset="0.2809" style="stop-color:#FCC612"/>
-		<stop  offset="0.6685" style="stop-color:#F18F40"/>
-		<stop  offset="0.8876" style="stop-color:#EC683B"/>
-		<stop  offset="1" style="stop-color:#E63F39"/>
+	<path class="st0" d="M20.7,0.6H5.2C2.3,0.6,0,2.9,0,5.8v15.6c0,2.8,2.3,5.2,5.2,5.2h15.6c2.8,0,5.2-2.3,5.2-5.2V5.8
+		C25.9,2.9,23.6,0.6,20.7,0.6z"/>
+	<path class="st0" d="M33.4,26.5H49c2.8,0,5.2-2.3,5.2-5.2V5.8c0-2.8-2.3-5.2-5.2-5.2H33.4c-2.8,0-5.2,2.3-5.2,5.2v15.6
+		C28.2,24.2,30.6,26.5,33.4,26.5z"/>
+	<path class="st0" d="M20.7,28.2H5.2c-2.8,0-5.2,2.3-5.2,5.2v15.6c0,2.8,2.3,5.2,5.2,5.2h15.6c2.8,0,5.2-2.3,5.2-5.2V33.3
+		C25.9,30.5,23.6,28.2,20.7,28.2z"/>
+	<path class="st0" d="M35.1,39.2h4.1v-4.1c0-3.2,2.6-5.8,5.8-5.8h7.1c-0.9-0.7-2-1.1-3.2-1.1H33.4c-2.8,0-5.2,2.3-5.2,5.2v15.6
+		c0,1.2,0.4,2.3,1.1,3.1v-7C29.3,41.8,31.9,39.2,35.1,39.2z"/>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="49.157" y1="90.4824" x2="49.157" y2="15.655">
+		<stop  offset="0" style="stop-color:#FFF23A"/>
+		<stop  offset="4.010540e-02" style="stop-color:#FEE62D"/>
+		<stop  offset="0.1171" style="stop-color:#FED41A"/>
+		<stop  offset="0.1964" style="stop-color:#FDC90F"/>
+		<stop  offset="0.2809" style="stop-color:#FDC60B"/>
+		<stop  offset="0.6685" style="stop-color:#F28F3F"/>
+		<stop  offset="0.8876" style="stop-color:#ED693C"/>
+		<stop  offset="1" style="stop-color:#E83E39"/>
 	</linearGradient>
-	<path class="st1" d="M63.3,46.6h-2.8h-0.6h-1h-0.3h-3.3v-8c0-0.4-0.3-0.7-0.7-0.7h-7.3c-0.4,0-0.7,0.3-0.7,0.7v8h-8
-		c-0.4,0-0.7,0.3-0.7,0.7v7.3c0,0.4,0.3,0.7,0.7,0.7h8v2.8v1.1v0.6v0.7v2.8c0,0.4,0.3,0.7,0.7,0.7h7.3c0.4,0,0.7-0.3,0.7-0.7v-2.9
-		v-0.7v-4.5h4.5h0.7h2.8c0.4,0,0.7-0.3,0.7-0.7v-7.3C64,46.9,63.7,46.6,63.3,46.6z"/>
+	<path class="st1" d="M63.2,44.2h-5h-0.4h-3.7h0v-0.7v-8.4c0-0.4-0.4-0.8-0.8-0.8H45c-0.4,0-0.8,0.4-0.8,0.8v9.1h-9.1
+		c-0.4,0-0.8,0.4-0.8,0.8v8.3c0,0.2,0.1,0.4,0.3,0.6c0.1,0.1,0.3,0.2,0.5,0.2c0,0,0,0,0.1,0h9.1v3.2v1.3v4.6c0,0.4,0.4,0.8,0.8,0.8
+		h8.3c0.4,0,0.8-0.4,0.8-0.8v-9.1h9.1c0.4,0,0.8-0.4,0.8-0.8V45C64,44.6,63.6,44.2,63.2,44.2z"/>
 </g>
 </svg>
diff --git a/public/img/icons_light_theme/icon_data_sources.svg b/public/img/icons_light_theme/icon_data_sources.svg
new file mode 100644
index 00000000000..3a6e65e8761
--- /dev/null
+++ b/public/img/icons_light_theme/icon_data_sources.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 20.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<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="100px" height="100px" viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#555555;}
+</style>
+<g>
+	<path class="st0" d="M50,84.1c-22.1,0-40.7-6.5-49.3-16.2C0.2,69.1,0,70.4,0,71.7c0,13,22.9,23.9,50,23.9s50-11,50-23.9
+		c0-1.3-0.2-2.6-0.7-3.9C90.7,77.5,72.1,84.1,50,84.1z"/>
+	<path class="st0" d="M50,62.3c-22.1,0-40.7-6.5-49.3-16.2C0.2,47.4,0,48.7,0,50c0,13,22.9,23.9,50,23.9s50-11,50-23.9
+		c0-1.3-0.2-2.6-0.7-3.9C90.7,55.8,72.1,62.3,50,62.3z"/>
+	<path class="st0" d="M0,28.3c0,13,22.9,23.9,50,23.9s50-11,50-23.9s-22.9-24-50-24S0,15.3,0,28.3z"/>
+</g>
+</svg>
diff --git a/public/img/icons_light_theme/icon_import_dashboard.svg b/public/img/icons_light_theme/icon_import_dashboard.svg
index 3a83c0fe829..d1b5f2fe17e 100644
--- a/public/img/icons_light_theme/icon_import_dashboard.svg
+++ b/public/img/icons_light_theme/icon_import_dashboard.svg
@@ -6,27 +6,25 @@
 	.st0{fill:#555555;}
 	.st1{fill:url(#SVGID_1_);}
 </style>
-<g>
-	<path class="st0" d="M7.8,28.6H25c3.1,0,5.7-2.6,5.7-5.7V5.7C30.7,2.6,28.1,0,25,0H7.8C4.6,0,2.1,2.6,2.1,5.7v17.2
-		C2.1,26.1,4.6,28.6,7.8,28.6z"/>
-	<path class="st0" d="M56.2,0H39c-3.1,0-5.7,2.6-5.7,5.7v17.2c0,3.1,2.6,5.7,5.7,5.7h17.2c3.1,0,5.7-2.6,5.7-5.7V5.7
-		C61.9,2.6,59.4,0,56.2,0z"/>
-	<path class="st0" d="M21,52.5h-4.3c-2.2,0-4.1-1.3-4.9-3.3c-0.8-2-0.4-4.3,1.2-5.8l12.8-12.8c-0.2,0-0.5-0.1-0.8-0.1H7.8
-		c-3.1,0-5.7,2.6-5.7,5.7v17.2c0,3.1,2.6,5.7,5.7,5.7H21v-3.1V52.5z"/>
-	<path class="st0" d="M56.2,30.5H39c-0.3,0-0.5,0-0.8,0.1l3.3,3.3l2.8,2.8l6.8,6.8c1.5,1.5,2,3.8,1.2,5.8c-0.8,2-2.8,3.3-4.9,3.3H43
-		v6.6h13.2c3.1,0,5.7-2.6,5.7-5.7V36.2C61.9,33,59.4,30.5,56.2,30.5z"/>
-	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="32" y1="87.7672" x2="32" y2="19.0301">
-		<stop  offset="0" style="stop-color:#FFF33B"/>
-		<stop  offset="5.948725e-02" style="stop-color:#FFE029"/>
-		<stop  offset="0.1303" style="stop-color:#FFD218"/>
-		<stop  offset="0.2032" style="stop-color:#FEC90F"/>
-		<stop  offset="0.2809" style="stop-color:#FDC70C"/>
-		<stop  offset="0.6685" style="stop-color:#F3903F"/>
-		<stop  offset="0.8876" style="stop-color:#ED683C"/>
-		<stop  offset="1" style="stop-color:#E93E3A"/>
-	</linearGradient>
-	<path class="st1" d="M48.3,46.2l-6.8-6.8l-2.8-2.8l-4-4l-0.1-0.1L33,30.9c-0.3-0.3-0.6-0.4-1-0.4c-0.3,0-0.7,0.1-1,0.4l-1.7,1.7
-		l-0.1,0.1L15.7,46.2c-0.9,0.9-0.2,2.3,1,2.3h7c0.7,0,1.4,0.6,1.4,1.4v0.5v5.6v3.1v0.1v3.4c0,0.7,0.6,1.4,1.4,1.4h11.3
-		c0.7,0,1.4-0.6,1.4-1.4v-3.4v-0.1v-9.2c0-0.7,0.6-1.4,1.4-1.4h7C48.5,48.5,49.1,47,48.3,46.2z"/>
-</g>
+<path class="st0" d="M8.1,26.5h15.6c2.8,0,5.2-2.3,5.2-5.2V5.8c0-2.8-2.3-5.2-5.2-5.2H8.1c-2.8,0-5.2,2.3-5.2,5.2v15.6
+	C2.9,24.2,5.3,26.5,8.1,26.5z"/>
+<path class="st0" d="M51.9,0.6H36.3c-2.8,0-5.2,2.3-5.2,5.2v15.6c0,2.8,2.3,5.2,5.2,5.2h15.6c2.8,0,5.2-2.3,5.2-5.2V5.8
+	C57.1,2.9,54.7,0.6,51.9,0.6z"/>
+<path class="st0" d="M9.8,50.6c-1-2.4-0.4-5,1.4-6.8l12.8-12.8l1.6-1.6c0.2-0.2,0.4-0.3,0.6-0.5c-0.7-0.4-1.6-0.6-2.5-0.6H8.1
+	c-2.8,0-5.2,2.3-5.2,5.2v15.6c0,2.8,2.3,5.2,5.2,5.2h5.4C11.9,53.5,10.5,52.2,9.8,50.6z"/>
+<path class="st0" d="M51.9,28.2H36.3c-0.9,0-1.7,0.2-2.5,0.6c0.2,0.2,0.4,0.3,0.6,0.5l1.6,1.6l3.8,3.8l2.6,2.6l6.4,6.4
+	c1.8,1.8,2.3,4.5,1.4,6.8c-0.7,1.7-2.1,2.9-3.7,3.5h5.4c2.8,0,5.2-2.3,5.2-5.2V33.3C57.1,30.5,54.7,28.2,51.9,28.2z"/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="30" y1="77.0702" x2="30" y2="17.5">
+	<stop  offset="0" style="stop-color:#FFF23A"/>
+	<stop  offset="4.010540e-02" style="stop-color:#FEE62D"/>
+	<stop  offset="0.1171" style="stop-color:#FED41A"/>
+	<stop  offset="0.1964" style="stop-color:#FDC90F"/>
+	<stop  offset="0.2809" style="stop-color:#FDC60B"/>
+	<stop  offset="0.6685" style="stop-color:#F28F3F"/>
+	<stop  offset="0.8876" style="stop-color:#ED693C"/>
+	<stop  offset="1" style="stop-color:#E83E39"/>
+</linearGradient>
+<path class="st1" d="M45.3,47.3l-6.4-6.4l-2.6-2.6l-3.8-3.8l-1.3-1.3l-0.3-0.3c-0.2-0.2-0.6-0.4-0.9-0.4s-0.7,0.1-0.9,0.4l-0.3,0.3
+	l-1.3,1.3L14.7,47.3c-0.8,0.8-0.2,2.2,0.9,2.2h6.5c0.7,0,1.3,0.6,1.3,1.3v0.4v2.9v2.4v3.1v3.2c0,0.7,0.6,1.3,1.3,1.3h10.6
+	c0.7,0,1.3-0.6,1.3-1.3v-3.2v-5.4v-3.4c0-0.7,0.6-1.3,1.3-1.3h6.5C45.5,49.4,46.1,48.1,45.3,47.3z"/>
 </svg>
diff --git a/public/img/icons_light_theme/icon_new_dashboard.svg b/public/img/icons_light_theme/icon_new_dashboard.svg
index 68c24e648d4..9ed93e4732b 100644
--- a/public/img/icons_light_theme/icon_new_dashboard.svg
+++ b/public/img/icons_light_theme/icon_new_dashboard.svg
@@ -7,27 +7,26 @@
 	.st1{fill:url(#SVGID_1_);}
 </style>
 <g>
-	<path class="st0" d="M22.9,0.6H5.7C2.6,0.6,0,3.2,0,6.4v17.2c0,3.2,2.6,5.7,5.7,5.7h17.2c3.2,0,5.7-2.6,5.7-5.7V6.4
-		C28.7,3.2,26.1,0.6,22.9,0.6z"/>
-	<path class="st0" d="M37,29.3h17.2c3.2,0,5.7-2.6,5.7-5.7V6.4c0-3.2-2.6-5.7-5.7-5.7H37c-3.2,0-5.7,2.6-5.7,5.7v17.2
-		C31.3,26.7,33.8,29.3,37,29.3z"/>
-	<path class="st0" d="M22.9,31.2H5.7c-3.2,0-5.7,2.6-5.7,5.7v17.2c0,3.2,2.6,5.7,5.7,5.7h17.2c3.2,0,5.7-2.6,5.7-5.7V36.9
-		C28.7,33.7,26.1,31.2,22.9,31.2z"/>
-	<path class="st0" d="M43.1,58.8h-4.5c-2.3,0-4.2-1.9-4.2-4.2v-7.3c0-2.3,1.9-4.2,4.2-4.2h4.5v-4.5c0-2.3,1.9-4.2,4.2-4.2h7.3
-		c2.3,0,4.2,1.9,4.2,4.2v4.5h0.1h1v-6.2c0-3.2-2.6-5.7-5.7-5.7H37c-3.2,0-5.7,2.6-5.7,5.7v17.2c0,3.2,2.6,5.7,5.7,5.7h6.1v-0.6V58.8
-		z"/>
-	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="50.9085" y1="76.5403" x2="50.9085" y2="16.4935">
-		<stop  offset="0" style="stop-color:#FBEE41"/>
-		<stop  offset="4.010540e-02" style="stop-color:#FBE334"/>
-		<stop  offset="0.1171" style="stop-color:#FCD321"/>
-		<stop  offset="0.1964" style="stop-color:#FCC916"/>
-		<stop  offset="0.2809" style="stop-color:#FCC612"/>
-		<stop  offset="0.6685" style="stop-color:#F18F40"/>
-		<stop  offset="0.8876" style="stop-color:#EC683B"/>
-		<stop  offset="1" style="stop-color:#E63F39"/>
+	<path class="st0" d="M20.7,0.6H5.2C2.3,0.6,0,2.9,0,5.8v15.6c0,2.8,2.3,5.2,5.2,5.2h15.6c2.8,0,5.2-2.3,5.2-5.2V5.8
+		C25.9,2.9,23.6,0.6,20.7,0.6z"/>
+	<path class="st0" d="M33.4,26.5H49c2.8,0,5.2-2.3,5.2-5.2V5.8c0-2.8-2.3-5.2-5.2-5.2H33.4c-2.8,0-5.2,2.3-5.2,5.2v15.6
+		C28.2,24.2,30.6,26.5,33.4,26.5z"/>
+	<path class="st0" d="M20.7,28.2H5.2c-2.8,0-5.2,2.3-5.2,5.2v15.6c0,2.8,2.3,5.2,5.2,5.2h15.6c2.8,0,5.2-2.3,5.2-5.2V33.3
+		C25.9,30.5,23.6,28.2,20.7,28.2z"/>
+	<path class="st0" d="M35.1,39.2h4.1v-4.1c0-3.2,2.6-5.8,5.8-5.8h7.1c-0.9-0.7-2-1.1-3.2-1.1H33.4c-2.8,0-5.2,2.3-5.2,5.2v15.6
+		c0,1.2,0.4,2.3,1.1,3.1v-7C29.3,41.8,31.9,39.2,35.1,39.2z"/>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="49.157" y1="90.4824" x2="49.157" y2="15.655">
+		<stop  offset="0" style="stop-color:#FFF23A"/>
+		<stop  offset="4.010540e-02" style="stop-color:#FEE62D"/>
+		<stop  offset="0.1171" style="stop-color:#FED41A"/>
+		<stop  offset="0.1964" style="stop-color:#FDC90F"/>
+		<stop  offset="0.2809" style="stop-color:#FDC60B"/>
+		<stop  offset="0.6685" style="stop-color:#F28F3F"/>
+		<stop  offset="0.8876" style="stop-color:#ED693C"/>
+		<stop  offset="1" style="stop-color:#E83E39"/>
 	</linearGradient>
-	<path class="st1" d="M63.3,46.6h-2.8h-0.6h-1h-0.3h-3.3v-8c0-0.4-0.3-0.7-0.7-0.7h-7.3c-0.4,0-0.7,0.3-0.7,0.7v8h-8
-		c-0.4,0-0.7,0.3-0.7,0.7v7.3c0,0.4,0.3,0.7,0.7,0.7h8v2.8v1.1v0.6v0.7v2.8c0,0.4,0.3,0.7,0.7,0.7h7.3c0.4,0,0.7-0.3,0.7-0.7v-2.9
-		v-0.7v-4.5h4.5h0.7h2.8c0.4,0,0.7-0.3,0.7-0.7v-7.3C64,46.9,63.7,46.6,63.3,46.6z"/>
+	<path class="st1" d="M63.2,44.2h-5h-0.4h-3.7h0v-0.7v-8.4c0-0.4-0.4-0.8-0.8-0.8H45c-0.4,0-0.8,0.4-0.8,0.8v9.1h-9.1
+		c-0.4,0-0.8,0.4-0.8,0.8v8.3c0,0.2,0.1,0.4,0.3,0.6c0.1,0.1,0.3,0.2,0.5,0.2c0,0,0,0,0.1,0h9.1v3.2v1.3v4.6c0,0.4,0.4,0.8,0.8,0.8
+		h8.3c0.4,0,0.8-0.4,0.8-0.8v-9.1h9.1c0.4,0,0.8-0.4,0.8-0.8V45C64,44.6,63.6,44.2,63.2,44.2z"/>
 </g>
 </svg>
diff --git a/public/sass/base/_icons.scss b/public/sass/base/_icons.scss
index e3361e9e9e5..3769ea4ff92 100644
--- a/public/sass/base/_icons.scss
+++ b/public/sass/base/_icons.scss
@@ -15,6 +15,10 @@
   background-image: url('../img/icons_#{$theme-name}_theme/icon_alert.svg');
 }
 
+.gicon-datasources {
+  background-image: url('../img/icons_#{$theme-name}_theme/icon_data_sources.svg');
+}
+
 .gicon-dashboard {
   background-image: url('../img/icons_#{$theme-name}_theme/icon_dashboard.svg');
 }