diff --git a/pkg/api/index.go b/pkg/api/index.go
index 189a6bbb604..0f4674cdd9c 100644
--- a/pkg/api/index.go
+++ b/pkg/api/index.go
@@ -92,9 +92,9 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) {
 			Icon: "fa fa-fw fa-plus",
 			Url:  "#",
 			Children: []*dtos.NavLink{
-				{Text: "Dashboard", Icon: "fa fa-fw fa-plus", Url: setting.AppSubUrl + "/dashboard/new"},
-				{Text: "Folder", Icon: "fa fa-fw fa-plus", Url: setting.AppSubUrl + "/dashboard/new/?editview=new-folder"},
-				{Text: "Import", Icon: "fa fa-fw fa-plus", Url: setting.AppSubUrl + "/dashboard/new/?editview=import"},
+				{Text: "Dashboard", Icon: "gicon gicon-dashboard-new", Url: setting.AppSubUrl + "/dashboard/new"},
+				{Text: "Folder", Icon: "gicon gicon-folder-new", Url: setting.AppSubUrl + "/dashboard/new/?editview=new-folder"},
+				{Text: "Import", Icon: "gicon gicon-dashboard-import", Url: setting.AppSubUrl + "/dashboard/new/?editview=import"},
 			},
 		})
 	}
@@ -108,7 +108,7 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) {
 	data.NavTree = append(data.NavTree, &dtos.NavLink{
 		Text:     "Dashboards",
 		Id:       "dashboards",
-		Icon:     "icon-gf icon-gf-dashboard",
+		Icon:     "gicon gicon-dashboard",
 		Url:      setting.AppSubUrl + "/",
 		Children: dashboardChildNavs,
 	})
@@ -145,7 +145,7 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) {
 		data.NavTree = append(data.NavTree, &dtos.NavLink{
 			Text:     "Alerting",
 			Id:       "alerting",
-			Icon:     "icon-gf icon-gf-alert",
+			Icon:     "gicon gicon-alert",
 			Url:      setting.AppSubUrl + "/alerting/list",
 			Children: alertChildNavs,
 		})
diff --git a/public/app/features/dashboard/dashnav/dashnav.html b/public/app/features/dashboard/dashnav/dashnav.html
index e350bc33caa..dc538fb5500 100644
--- a/public/app/features/dashboard/dashnav/dashnav.html
+++ b/public/app/features/dashboard/dashnav/dashnav.html
@@ -1,13 +1,13 @@
 <div class="navbar">
 	<div class="navbar-inner">
+		<a class="navbar-page-icon" ng-click="ctrl.starDashboard()">
+			<i class="gicon gicon-dashboard-starred"></i>
+		</a>
 
-		<div class="navbar-section-wrapper">
-			<a class="navbar-page-btn" ng-click="ctrl.showSearch()">
-				<i class="icon-gf icon-gf-dashboard"></i>
-				{{ctrl.dashboard.title}}
-				<i class="fa fa-caret-down"></i>
-			</a>
-		</div>
+		<a class="navbar-page-btn" ng-click="ctrl.showSearch()">
+			{{ctrl.dashboard.title}}
+			<i class="fa fa-caret-down"></i>
+		</a>
 
 		<ul class="nav dash-playlist-actions" ng-if="ctrl.playlistSrv.isPlaying">
 			<li>
@@ -21,12 +21,7 @@
 			</li>
 		</ul>
 
-		<ul class="nav pull-left dashnav-action-icons">
-			<li ng-show="::ctrl.dashboard.meta.canStar">
-				<a class="pointer" ng-click="ctrl.starDashboard()">
-					<i class="fa" ng-class="{'fa-star-o': !ctrl.dashboard.meta.isStarred, 'fa-star': ctrl.dashboard.meta.isStarred}" style="color: orange;"></i>
-				</a>
-			</li>
+		<ul class="nav dashnav-action-icons">
 			<li ng-show="::ctrl.dashboard.meta.canShare" class="dropdown">
 				<a class="pointer" ng-click="ctrl.hideTooltip($event)" bs-tooltip="'Share dashboard'" data-placement="bottom" data-toggle="dropdown"><i class="fa fa-share-square-o"></i></a>
 				<ul class="dropdown-menu">
@@ -76,6 +71,9 @@
 			</li>
 		</ul>
 
+		<div class="nav nav--grow">
+		</div>
+
 		<ul class="nav pull-right">
 			<li ng-show="ctrl.dashboard.meta.fullscreen" class="dashnav-back-to-dashboard">
 				<a ng-click="ctrl.exitFullscreen()">
diff --git a/public/app/features/dashboard/folder_modal/folder.html b/public/app/features/dashboard/folder_modal/folder.html
index e875cc724c2..e037923e77a 100644
--- a/public/app/features/dashboard/folder_modal/folder.html
+++ b/public/app/features/dashboard/folder_modal/folder.html
@@ -1,7 +1,7 @@
 <div class="modal-body">
   <div class="modal-header">
     <h2 class="modal-header-title">
-			<i class="fa fa-folder"></i>
+			<i class="gicon gicon-folder-new"></i>
       <span class="p-l-1">New Dashboard Folder</span>
     </h2>
 
diff --git a/public/app/features/panel/panel_ctrl.ts b/public/app/features/panel/panel_ctrl.ts
index fca9050b4ac..94a213ea30a 100644
--- a/public/app/features/panel/panel_ctrl.ts
+++ b/public/app/features/panel/panel_ctrl.ts
@@ -133,11 +133,6 @@ export class PanelCtrl {
     menu.push({text: 'Edit', click: 'ctrl.editPanel();', role: 'Editor', icon: "fa fa-fw fa-edit", shortcut: "e"});
     menu.push({text: 'Share', click: 'ctrl.sharePanel();', icon: "fa fa-fw fa-share", shortcut: "p s"});
 
-    if (!this.fullscreen) {
-      menu.push({ text: 'Duplicate', click: 'ctrl.duplicate()', role: 'Editor', icon: "fa fa-fw fa-copy" });
-    }
-
-    menu.push({divider: true});
     let extendedMenu = this.getExtendedMenu();
     menu.push({text: 'More ...', click: 'ctrl.removePanel();', icon: "fa fa-fw fa-cube", submenu: extendedMenu});
 
@@ -147,9 +142,13 @@ export class PanelCtrl {
   }
 
   getExtendedMenu() {
-    var actions = [{text: 'Panel JSON', click: 'ctrl.editPanelJson(); dismiss();'}];
-    this.events.emit('init-panel-actions', actions);
-    return actions;
+    let menu = [];
+    if (!this.fullscreen) {
+      menu.push({ text: 'Duplicate', click: 'ctrl.duplicate()', role: 'Editor' });
+    }
+    menu.push({text: 'Panel JSON', click: 'ctrl.editPanelJson(); dismiss();' });
+    this.events.emit('init-panel-actions', menu);
+    return menu;
   }
 
   otherPanelInFullscreenMode() {
diff --git a/public/app/features/plugins/partials/ds_edit.html b/public/app/features/plugins/partials/ds_edit.html
index 451a9024a18..d734dbc49db 100644
--- a/public/app/features/plugins/partials/ds_edit.html
+++ b/public/app/features/plugins/partials/ds_edit.html
@@ -57,8 +57,6 @@
 						</plugin-component>
 					</rebuild-on-change>
 
-					<br />
-
 					<div ng-if="ctrl.testing" class="gf-form-group">
 						<h5 ng-show="!ctrl.testing.done">Testing.... <i class="fa fa-spiner fa-spin"></i></h5>
 						<div class="alert-{{ctrl.testing.status}} alert" ng-show="ctrl.testing.done">
@@ -79,6 +77,11 @@
 						</button>
 						<a class="btn btn-link" href="datasources">Cancel</a>
 					</div>
+
+					<br />
+					<br />
+					<br />
+
 				</form>
 			</div>
 		</div>
diff --git "a/public/img/icons_dark_theme/Icon\r" "b/public/img/icons_dark_theme/Icon\r"
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/public/img/icons_dark_theme/icon_add_folder.svg b/public/img/icons_dark_theme/icon_add_folder.svg
new file mode 100644
index 00000000000..d7ac00099e3
--- /dev/null
+++ b/public/img/icons_dark_theme/icon_add_folder.svg
@@ -0,0 +1,31 @@
+<?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="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;}
+	.st1{fill:#F2F2F3;}
+	.st2{fill:url(#SVGID_1_);}
+</style>
+<g>
+	<path class="st0" d="M14.8,19.2h46.3v-0.8c0-3.3-2.7-5.9-5.9-5.9H29.8l-1.3-3.2l0-0.1c-0.5-1-1.5-1.7-2.6-1.7H13
+		c-1.1,0-2.2,0.7-2.7,1.7l-1.2,3.2H5.9c-3.3,0-5.9,2.7-5.9,5.9V49c0,1.9,0.2,1.7,0.5,2.4l1-3l8-25.2C10.1,20.8,12.3,19.2,14.8,19.2z
+		"/>
+	<polygon class="st1" points="0,52.9 1.6,47.9 0,47.9 	"/>
+	<path class="st0" d="M60.6,22.8H16.8c-1.8,0-3.4,1.2-4,2.9L4.2,53.3H11h31.3c-1-0.6-1.7-1.7-1.7-3v-4.8c0-1.9,1.6-3.5,3.5-3.5h2.2
+		v-2.2c0-1.9,1.6-3.5,3.5-3.5h4.8c1.9,0,3.5,1.6,3.5,3.5V42h0.2l5.5-14.7C64.6,25.1,63,22.8,60.6,22.8z"/>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="52.1271" y1="62.3127" x2="52.1271" y2="34.3987">
+		<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="st2" d="M60.2,45.1h-3.1H55v-5.2c0-0.3-0.2-0.5-0.5-0.5h-4.8c-0.3,0-0.5,0.2-0.5,0.5v5.2H44c-0.3,0-0.5,0.2-0.5,0.5
+		v4.8c0,0.3,0.2,0.5,0.5,0.5h5.2v2.6V56c0,0.3,0.2,0.5,0.5,0.5h4.8c0.3,0,0.5-0.2,0.5-0.5v-5.2h5.2c0.3,0,0.5-0.2,0.5-0.5v-4.8
+		C60.7,45.3,60.5,45.1,60.2,45.1z"/>
+</g>
+</svg>
diff --git a/public/img/icons_dark_theme/icon_alert.svg b/public/img/icons_dark_theme/icon_alert.svg
new file mode 100644
index 00000000000..2a3a764a925
--- /dev/null
+++ b/public/img/icons_dark_theme/icon_alert.svg
@@ -0,0 +1,16 @@
+<?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="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;}
+</style>
+<g>
+	<g>
+		<path class="st0" d="M32,64c4.6,0,8.2-3.7,8.2-8.2H23.8C23.8,60.3,27.4,64,32,64z"/>
+	</g>
+	<path class="st0" d="M53.5,42.7V32.3c0-12.8-6.7-23.5-15.9-26.7C37.6,2.5,35.1,0,32,0c-3.1,0-5.6,2.5-5.6,5.6
+		c-9.2,3.2-15.9,13.9-15.9,26.7v10.4C8,42.8,6,44.8,6,47.3s2,4.5,4.5,4.6v0h0.1h42.8h0.1v0c2.5,0,4.5-2.1,4.5-4.6
+		C58,44.8,56,42.8,53.5,42.7z"/>
+</g>
+</svg>
diff --git a/public/img/icons_dark_theme/icon_alert_alt.svg b/public/img/icons_dark_theme/icon_alert_alt.svg
new file mode 100644
index 00000000000..a6c6e9bd051
--- /dev/null
+++ b/public/img/icons_dark_theme/icon_alert_alt.svg
@@ -0,0 +1,108 @@
+<?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="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;}
+	.st1{fill:url(#SVGID_1_);}
+	.st2{fill:url(#SVGID_2_);}
+	.st3{fill:url(#SVGID_3_);}
+	.st4{fill:url(#SVGID_4_);}
+	.st5{fill:url(#SVGID_5_);}
+	.st6{fill:url(#SVGID_6_);}
+</style>
+<g>
+	<g>
+		<path class="st0" d="M32,59.4c3.3,0,6-2.7,6-6H26C26,56.7,28.7,59.4,32,59.4z"/>
+	</g>
+</g>
+<g>
+	<path class="st0" d="M47.7,43.8v-7.6c0-9.4-4.9-17.2-11.6-19.6c0-2.3-1.8-4.1-4.1-4.1c-2.3,0-4.1,1.8-4.1,4.1
+		c-6.7,2.3-11.6,10.2-11.6,19.6v7.6c-1.8,0-3.3,1.5-3.3,3.3c0,1.8,1.5,3.3,3.3,3.3v0h0h31.4h0v0c1.8,0,3.3-1.5,3.3-3.3
+		C51,45.3,49.6,43.9,47.7,43.8z"/>
+</g>
+<g>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="52.0976" y1="33.7801" x2="52.0976" y2="-1.9525">
+		<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="M56.4,24.4c-0.7,0-1.3-0.4-1.5-1c-1.8-4.3-4.6-8.2-8.1-11.3c-0.7-0.6-0.8-1.7-0.2-2.4c0.6-0.7,1.7-0.8,2.4-0.2
+		c3.9,3.4,7.1,7.8,9,12.6c0.4,0.9-0.1,1.8-0.9,2.2C56.8,24.4,56.6,24.4,56.4,24.4z"/>
+</g>
+<g>
+	<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="46.9877" y1="33.7801" x2="46.9877" y2="-1.9525">
+		<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="st2" d="M50.3,26.9c-0.7,0-1.3-0.4-1.5-1c-1.4-3.3-3.5-6.3-6.2-8.6c-0.7-0.6-0.8-1.7-0.2-2.4c0.6-0.7,1.7-0.8,2.4-0.2
+		c3.1,2.7,5.5,6.1,7.1,9.9c0.4,0.9-0.1,1.8-0.9,2.2C50.7,26.8,50.5,26.9,50.3,26.9z"/>
+</g>
+<g>
+	<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="57.4685" y1="33.7801" x2="57.4685" y2="-1.9525">
+		<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="st3" d="M62.3,21.4c-0.7,0-1.3-0.4-1.5-1c-2-4.9-5.2-9.4-9.3-12.9c-0.7-0.6-0.8-1.7-0.2-2.4C52,4.5,53,4.4,53.7,5
+		c4.4,3.8,7.9,8.7,10.2,14.1c0.4,0.9-0.1,1.8-0.9,2.2C62.8,21.4,62.5,21.4,62.3,21.4z"/>
+</g>
+<g>
+	<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="11.902" y1="33.7801" x2="11.902" y2="-1.9525">
+		<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="st4" d="M7.6,24.4c-0.2,0-0.4,0-0.6-0.1c-0.9-0.4-1.3-1.3-0.9-2.2c2-4.8,5.1-9.2,9-12.6c0.7-0.6,1.8-0.5,2.4,0.2
+		c0.6,0.7,0.5,1.8-0.2,2.4c-3.5,3.1-6.4,7-8.1,11.3C8.9,24,8.3,24.4,7.6,24.4z"/>
+</g>
+<g>
+	<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="17.0123" y1="33.7801" x2="17.0123" y2="-1.9525">
+		<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="st5" d="M13.7,26.9c-0.2,0-0.4,0-0.6-0.1c-0.9-0.4-1.3-1.3-0.9-2.2c1.5-3.8,4-7.2,7.1-9.9c0.7-0.6,1.8-0.5,2.4,0.2
+		c0.6,0.7,0.5,1.8-0.2,2.4c-2.7,2.3-4.8,5.3-6.2,8.6C15,26.5,14.4,26.9,13.7,26.9z"/>
+</g>
+<g>
+	<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="6.5315" y1="33.7801" x2="6.5315" y2="-1.9525">
+		<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="st6" d="M1.7,21.4c-0.2,0-0.4,0-0.6-0.1C0.2,21-0.2,20,0.1,19.1C2.3,13.7,5.9,8.8,10.3,5C11,4.4,12,4.5,12.7,5.2
+		c0.6,0.7,0.5,1.8-0.2,2.4c-4,3.5-7.2,8-9.3,12.9C3,21,2.3,21.4,1.7,21.4z"/>
+</g>
+</svg>
diff --git a/public/img/icons_dark_theme/icon_alert_off.svg b/public/img/icons_dark_theme/icon_alert_off.svg
new file mode 100644
index 00000000000..cebbe532ce4
--- /dev/null
+++ b/public/img/icons_dark_theme/icon_alert_off.svg
@@ -0,0 +1,17 @@
+<?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="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;}
+</style>
+<g>
+	<path class="st0" d="M34.5,64c4.5,0,8.1-3.6,8.1-8.1H26.4C26.4,60.4,30,64,34.5,64z"/>
+	<path class="st0" d="M40,6.6c0-3-2.5-5.5-5.5-5.5c-3,0-5.5,2.5-5.5,5.5c-9,3.1-15.6,13.7-15.6,26.2v5L43.2,8.1
+		C42.1,7.5,41.1,7,40,6.6z"/>
+	<path class="st0" d="M55.5,52.1L55.5,52.1L55.5,52.1c2.5,0,4.5-2,4.5-4.5s-2-4.5-4.4-4.5V32.8c0-4.5-0.9-8.8-2.4-12.5L21.4,52.1
+		H55.5z"/>
+	<path class="st0" d="M59,0c-0.9,0-1.7,0.3-2.4,1l-54,54c-1.3,1.3-1.3,3.4,0,4.8c0.7,0.7,1.5,1,2.4,1s1.7-0.3,2.4-1l54-54
+		c1.3-1.3,1.3-3.4,0-4.8C60.7,0.3,59.9,0,59,0z"/>
+</g>
+</svg>
diff --git a/public/img/icons_dark_theme/icon_dashboard.svg b/public/img/icons_dark_theme/icon_dashboard.svg
new file mode 100644
index 00000000000..a5d4e9b491d
--- /dev/null
+++ b/public/img/icons_dark_theme/icon_dashboard.svg
@@ -0,0 +1,18 @@
+<?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="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;}
+</style>
+<g>
+	<path class="st0" d="M24.5,31H6.1C2.7,31,0,28.3,0,24.9V6.5c0-3.4,2.7-6.1,6.1-6.1h18.4c3.4,0,6.1,2.7,6.1,6.1v18.4
+		C30.6,28.3,27.9,31,24.5,31z"/>
+	<path class="st0" d="M57.9,31H39.5c-3.4,0-6.1-2.7-6.1-6.1V6.5c0-3.4,2.7-6.1,6.1-6.1h18.4c3.4,0,6.1,2.7,6.1,6.1v18.4
+		C64,28.3,61.3,31,57.9,31z"/>
+	<path class="st0" d="M24.5,63.6H6.1c-3.4,0-6.1-2.7-6.1-6.1V39.1C0,35.7,2.7,33,6.1,33h18.4c3.4,0,6.1,2.7,6.1,6.1v18.4
+		C30.6,60.9,27.9,63.6,24.5,63.6z"/>
+	<path class="st0" d="M57.9,63.6H39.5c-3.4,0-6.1-2.7-6.1-6.1V39.1c0-3.4,2.7-6.1,6.1-6.1h18.4c3.4,0,6.1,2.7,6.1,6.1v18.4
+		C64,60.9,61.3,63.6,57.9,63.6z"/>
+</g>
+</svg>
diff --git a/public/img/icons_dark_theme/icon_dashboard_fav.svg b/public/img/icons_dark_theme/icon_dashboard_fav.svg
new file mode 100644
index 00000000000..22d2462e922
--- /dev/null
+++ b/public/img/icons_dark_theme/icon_dashboard_fav.svg
@@ -0,0 +1,30 @@
+<?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="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;}
+	.st1{fill:url(#SVGID_1_);}
+</style>
+<g>
+	<path class="st0" d="M23.5,22.7l7-17.3c-0.5-2.8-3-5-6-5H6.1C2.7,0.4,0,3.1,0,6.5v18.4C0,28.3,2.7,31,6.1,31H9l-7.4-6.5L23.5,22.7z
+		"/>
+	<path class="st0" d="M62.5,24.5L55,31h2.9c3.4,0,6.1-2.7,6.1-6.1V6.5c0-3.4-2.7-6.1-6.1-6.1H39.5c-3,0-5.5,2.2-6,5l7,17.3
+		L62.5,24.5z"/>
+	<path class="st0" d="M18.3,39.1l-7-6.1H6.1C2.7,33,0,35.7,0,39.1v18.4c0,3.4,2.7,6.1,6.1,6.1h18.4c3.4,0,6.1-2.7,6.1-6.1v-7.3
+		L13.1,61.2L18.3,39.1z"/>
+	<path class="st0" d="M50.9,61.2L33.4,50.2v7.3c0,3.4,2.7,6.1,6.1,6.1h18.4c3.4,0,6.1-2.7,6.1-6.1V39.1c0-3.4-2.7-6.1-6.1-6.1h-5.1
+		l-7,6.1L50.9,61.2z"/>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="32.0001" y1="63.3894" x2="32.0001" y2="7.0572">
+		<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>
+	<polygon class="st1" points="52.1,27.9 37.6,26.7 32,13 26.4,26.7 11.9,27.9 23,37.6 19.6,52.1 32,44.3 44.4,52.1 41,37.6 	"/>
+</g>
+</svg>
diff --git a/public/img/icons_dark_theme/icon_import_dashboard.svg b/public/img/icons_dark_theme/icon_import_dashboard.svg
new file mode 100644
index 00000000000..20b3e6c27e8
--- /dev/null
+++ b/public/img/icons_dark_theme/icon_import_dashboard.svg
@@ -0,0 +1,32 @@
+<?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="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;}
+	.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>
+</svg>
diff --git a/public/img/icons_dark_theme/icon_new_dashboard.svg b/public/img/icons_dark_theme/icon_new_dashboard.svg
new file mode 100644
index 00000000000..326cbf1ca7f
--- /dev/null
+++ b/public/img/icons_dark_theme/icon_new_dashboard.svg
@@ -0,0 +1,32 @@
+<?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="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;}
+	.st1{fill:url(#SVGID_1_);}
+</style>
+<g>
+	<path class="st0" d="M23,0.4H5.7C2.6,0.4,0,2.9,0,6.1v17.2c0,3.2,2.6,5.7,5.7,5.7H23c3.2,0,5.7-2.6,5.7-5.7V6.1
+		C28.7,2.9,26.1,0.4,23,0.4z"/>
+	<path class="st0" d="M37,29.1h17.2c3.2,0,5.7-2.6,5.7-5.7V6.1c0-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.5,33.9,29.1,37,29.1z"/>
+	<path class="st0" d="M23,30.9H5.7c-3.2,0-5.7,2.6-5.7,5.7v17.2c0,3.2,2.6,5.7,5.7,5.7H23c3.2,0,5.7-2.6,5.7-5.7V36.6
+		C28.7,33.5,26.1,30.9,23,30.9z"/>
+	<path class="st0" d="M37.7,55.6v-6.2c0-2.5,2.1-4.6,4.6-4.6h2.9v-2.9c0-2.5,2.1-4.6,4.6-4.6H56c1.7,0,3.2,1,4,2.4v-3.1
+		c0-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.7h3.1C38.7,58.8,37.7,57.3,37.7,55.6z"/>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="52.8592" y1="87.6694" x2="52.8592" y2="27.0106">
+		<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="M63.4,48.8H60h-3.4v-1v-5.8c0-0.3-0.3-0.6-0.6-0.6h-6.2c-0.3,0-0.6,0.3-0.6,0.6v6.8h-6.8
+		c-0.3,0-0.6,0.3-0.6,0.6v6.2c0,0.3,0.3,0.6,0.6,0.6h5.8h1v3.4V63c0,0.3,0.3,0.6,0.6,0.6H56c0.3,0,0.6-0.3,0.6-0.6v-3.9v0v-2.9h2.9
+		h0.2h3.7c0.3,0,0.6-0.3,0.6-0.6v-6.2C64,49.1,63.7,48.8,63.4,48.8z"/>
+</g>
+</svg>
diff --git a/public/img/icons_dark_theme/icon_notification_channels.svg b/public/img/icons_dark_theme/icon_notification_channels.svg
new file mode 100644
index 00000000000..d3bad3f78f4
--- /dev/null
+++ b/public/img/icons_dark_theme/icon_notification_channels.svg
@@ -0,0 +1,14 @@
+<?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="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;}
+</style>
+<path class="st0" d="M56.3,44.5c-1.6,0-3.2,0.5-4.4,1.4l-8.1-4.7c0.3-1,0.4-2,0.4-3.1c0-5.6-3.8-10.4-9-11.8v-7.5
+	c2.6-1.2,4.5-3.9,4.5-7c0-4.2-3.4-7.7-7.7-7.7s-7.7,3.4-7.7,7.7c0,3.1,1.8,5.7,4.5,7v7.5c-5.2,1.4-9,6.1-9,11.8
+	c0,1.1,0.2,2.1,0.4,3.1l-8.1,4.7c-1.2-0.9-2.8-1.4-4.4-1.4c-4.2,0-7.7,3.4-7.7,7.7s3.4,7.7,7.7,7.7s7.7-3.4,7.7-7.7
+	c0-0.2,0-0.5,0-0.7l8.1-4.7c2.2,2.2,5.3,3.6,8.6,3.6c3.4,0,6.4-1.4,8.6-3.6l8.1,4.7c0,0.2,0,0.5,0,0.7c0,4.2,3.4,7.7,7.7,7.7
+	s7.7-3.4,7.7-7.7S60.6,44.5,56.3,44.5z M32,43.9c-3.2,0-5.8-2.6-5.8-5.8c0-3.2,2.6-5.8,5.8-5.8s5.8,2.6,5.8,5.8
+	C37.8,41.3,35.2,43.9,32,43.9z"/>
+</svg>
diff --git a/public/img/icons_dark_theme/icon_org.svg b/public/img/icons_dark_theme/icon_org.svg
new file mode 100644
index 00000000000..b9aa21c3a9c
--- /dev/null
+++ b/public/img/icons_dark_theme/icon_org.svg
@@ -0,0 +1,40 @@
+<?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="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;}
+</style>
+<g>
+	<path class="st0" d="M63.8,55.9h-2.1c-0.1,0-0.2-0.1-0.2-0.2V20.3c0-0.1-0.1-0.2-0.2-0.2l-20.5-3.1c0,0-0.1,0-0.1,0l-4.7,1.3
+		c-0.1,0-0.2,0.1-0.2,0.2l-1.3,16.4c0,0.2-0.3,0.2-0.3,0V6.7c0-0.1-0.1-0.2-0.2-0.2L13.4,3.4c0,0-0.1,0-0.1,0L5.2,6
+		C5.1,6,5.1,6.1,5.1,6.2L3.2,55.7c0,0.1-0.1,0.2-0.2,0.2H0.2C0.1,55.9,0,56,0,56.1v4.3c0,0.1,0.1,0.2,0.2,0.2h4.8h13.2
+		c0.1,0,0.2-0.1,0.2-0.2v-4.5V9.1c0-0.1,0.1-0.3,0.3-0.2L29,10.3c0.1,0,0.2,0.1,0.2,0.2v50.1h0.2h2.9h1.8h1.2h0.4h9.8
+		c0.1,0,0.2-0.1,0.2-0.2v-4.5V22.7c0-0.1,0.1-0.3,0.3-0.2l10.2,1.4c0.1,0,0.2,0.1,0.2,0.2v36.5h0.2h4.7h2.4c0.1,0,0.2-0.1,0.2-0.2
+		v-4.3C64,56,63.9,55.9,63.8,55.9z"/>
+	<path class="st0" d="M26.6,17.6l-5.5-0.9c-0.3,0-0.6,0.2-0.6,0.6v2.4c0,0.3,0.2,0.5,0.5,0.6l5.5,0.9c0.3,0,0.6-0.2,0.6-0.6v-2.4
+		C27.1,17.9,26.9,17.6,26.6,17.6z"/>
+	<path class="st0" d="M26.6,23.2l-5.5-0.9c-0.3,0-0.6,0.2-0.6,0.6v2.4c0,0.3,0.2,0.5,0.5,0.6l5.5,0.9c0.3,0,0.6-0.2,0.6-0.6v-2.4
+		C27.1,23.5,26.9,23.2,26.6,23.2z"/>
+	<path class="st0" d="M26.6,28.7l-5.5-0.9c-0.3,0-0.6,0.2-0.6,0.6v2.4c0,0.3,0.2,0.5,0.5,0.6l5.5,0.9c0.3,0,0.6-0.2,0.6-0.6v-2.4
+		C27.1,29,26.9,28.8,26.6,28.7z"/>
+	<path class="st0" d="M26.6,34.3l-5.5-0.9c-0.3,0-0.6,0.2-0.6,0.6v2.4c0,0.3,0.2,0.5,0.5,0.6l5.5,0.9c0.3,0,0.6-0.2,0.6-0.6v-2.4
+		C27.1,34.6,26.9,34.3,26.6,34.3z"/>
+	<path class="st0" d="M26.6,39.9L21.1,39c-0.3,0-0.6,0.2-0.6,0.6v2.4c0,0.3,0.2,0.5,0.5,0.6l5.5,0.9c0.3,0,0.6-0.2,0.6-0.6v-2.4
+		C27.1,40.1,26.9,39.9,26.6,39.9z"/>
+	<path class="st0" d="M26.6,45.4l-5.5-0.9c-0.3,0-0.6,0.2-0.6,0.6v2.4c0,0.3,0.2,0.5,0.5,0.6l5.5,0.9c0.3,0,0.6-0.2,0.6-0.6V46
+		C27.1,45.7,26.9,45.5,26.6,45.4z"/>
+	<path class="st0" d="M26.6,12.1l-5.5-0.9c-0.3,0-0.6,0.2-0.6,0.6v2.4c0,0.3,0.2,0.5,0.5,0.6l5.5,0.9c0.3,0,0.6-0.2,0.6-0.6v-2.4
+		C27.1,12.3,26.9,12.1,26.6,12.1z"/>
+	<path class="st0" d="M53.9,30.6l-5.6-0.9c-0.3,0-0.5,0.2-0.5,0.5v2.4c0,0.2,0.2,0.4,0.4,0.5l5.6,0.9c0.3,0,0.5-0.2,0.5-0.5V31
+		C54.4,30.8,54.2,30.6,53.9,30.6z"/>
+	<path class="st0" d="M53.9,35.9L48.4,35c-0.3,0-0.5,0.2-0.5,0.5v2.4c0,0.2,0.2,0.4,0.4,0.5l5.6,0.9c0.3,0,0.5-0.2,0.5-0.5v-2.4
+		C54.4,36.1,54.2,35.9,53.9,35.9z"/>
+	<path class="st0" d="M53.9,41.2l-5.6-0.9c-0.3,0-0.5,0.2-0.5,0.5v2.4c0,0.2,0.2,0.4,0.4,0.5l5.6,0.9c0.3,0,0.5-0.2,0.5-0.5v-2.4
+		C54.4,41.4,54.2,41.2,53.9,41.2z"/>
+	<path class="st0" d="M53.9,46.5l-5.6-0.9c-0.3,0-0.5,0.2-0.5,0.5v2.4c0,0.2,0.2,0.4,0.4,0.5l5.6,0.9c0.3,0,0.5-0.2,0.5-0.5V47
+		C54.4,46.7,54.2,46.5,53.9,46.5z"/>
+	<path class="st0" d="M53.9,25.3l-5.6-0.9c-0.3,0-0.5,0.2-0.5,0.5v2.4c0,0.2,0.2,0.4,0.4,0.5l5.6,0.9c0.3,0,0.5-0.2,0.5-0.5v-2.4
+		C54.4,25.5,54.2,25.3,53.9,25.3z"/>
+</g>
+</svg>
diff --git a/public/img/icons_dark_theme/icon_user.svg b/public/img/icons_dark_theme/icon_user.svg
new file mode 100644
index 00000000000..e488d9ffcf4
--- /dev/null
+++ b/public/img/icons_dark_theme/icon_user.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="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;}
+</style>
+<g>
+	<path class="st0" d="M42.8,36c-0.1-0.1-0.2-0.1-0.4-0.2c-1.4-0.8-1.1-3-0.8-4.3c1-1.1,2.1-2.9,2.5-5.9c0.1-0.8,0.4-1.5,0.9-2.2
+		c0.9-1.2,1.4-2.9,1.4-4.6c0-1.3-0.3-2.4-0.9-3.3c-0.1-0.2-0.3-0.4-0.4-0.6c0.7-1.8,1.5-4.6,0.8-7.5C44.6,2.3,37.8,0,32,0
+		c-5.3,0-9.2,1.8-10.8,4.9c-1.4,0.7-2.2,1.7-2.6,2.5c-1.3,2.5-0.4,5.5,0.4,7.6c-0.2,0.2-0.4,0.4-0.5,0.7c-0.6,0.9-0.9,2.1-0.9,3.4
+		c0,1.6,0.5,3.3,1.4,4.5c0.5,0.6,0.8,1.4,0.9,2.2c0.4,3,1.5,4.8,2.6,5.9c0.3,1.3,0.6,3.4-0.8,4.2c-0.1,0.1-0.2,0.1-0.3,0.2
+		C5.2,42.8,5.1,45.7,5.1,46.8v8.7c0,4.7,3.8,8.5,8.5,8.5h18.1h13h5.6c4.7,0,8.5-3.8,8.5-8.5v-8.7C58.9,45.7,58.8,42.8,42.8,36z"/>
+</g>
+</svg>
diff --git a/public/img/icons_dark_theme/icon_user_group.svg b/public/img/icons_dark_theme/icon_user_group.svg
new file mode 100644
index 00000000000..15dade3d289
--- /dev/null
+++ b/public/img/icons_dark_theme/icon_user_group.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="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;}
+</style>
+<g>
+	<path class="st0" d="M11.8,48.1v-6c0-1.5,0.6-3.3,6.4-6.4c0.1-0.2,0.2-0.5,0.3-0.7c0.4-0.6,0.6-1.3,0.6-2.1c0-0.6-0.1-1.1-0.4-1.6
+		c-0.1-0.1-0.1-0.2-0.2-0.3c0.3-0.8,0.7-2.1,0.3-3.5c-0.6-2.4-3.8-3.5-6.4-3.5c-2.4,0-4.3,0.9-5,2.3c-0.7,0.3-1,0.8-1.2,1.2
+		c-0.6,1.2-0.2,2.6,0.2,3.5c-0.1,0.1-0.2,0.2-0.2,0.3c-0.3,0.4-0.4,1-0.4,1.6c0,0.8,0.2,1.5,0.6,2.1c0.2,0.3,0.4,0.6,0.4,1
+		C7,37.5,7.5,38.4,8,38.9c0.1,0.6,0.3,1.6-0.4,2c-0.1,0-0.1,0.1-0.1,0.1C0,44.1,0,45.4,0,45.9V50c0,2.2,1.8,3.9,3.9,3.9h8.4h2.2
+		C12.8,52.5,11.8,50.5,11.8,48.1z"/>
+	<path class="st0" d="M56.6,40.9c0,0-0.1-0.1-0.2-0.1c-0.7-0.4-0.5-1.4-0.4-2c0.5-0.5,1-1.4,1.2-2.7c0.1-0.4,0.2-0.7,0.4-1
+		c0.4-0.6,0.6-1.3,0.6-2.1c0-0.6-0.1-1.1-0.4-1.6c-0.1-0.1-0.1-0.2-0.2-0.3c0.3-0.8,0.7-2.1,0.3-3.5c-0.6-2.4-3.8-3.5-6.4-3.5
+		c-2.4,0-4.3,0.9-5,2.3c-0.7,0.3-1,0.8-1.2,1.2c-0.6,1.2-0.2,2.6,0.2,3.5c-0.1,0.1-0.2,0.2-0.2,0.3c-0.3,0.4-0.4,1-0.4,1.6
+		c0,0.8,0.2,1.5,0.6,2.1c0.2,0.2,0.3,0.5,0.4,0.8c5.6,3,6.2,4.8,6.2,6.3v6c0,2.3-1.1,4.4-2.7,5.8h2.1h6.1h2.6c2.2,0,3.9-1.8,3.9-3.9
+		v-4.1C64,45.4,64,44.1,56.6,40.9z"/>
+	<path class="st0" d="M50.3,48.1v-6c0-0.8,0-2.8-11-7.4c-0.1,0-0.1-0.1-0.2-0.2c-1-0.6-0.8-2.1-0.6-2.9c0.7-0.8,1.4-2,1.7-4
+		c0.1-0.5,0.3-1.1,0.6-1.5c0.6-0.8,1-2,1-3.1c0-0.9-0.2-1.7-0.6-2.3c-0.1-0.1-0.2-0.3-0.3-0.4c0.5-1.2,1-3.1,0.5-5.2
+		c-0.9-3.5-5.5-5.1-9.5-5.1c-3.6,0-6.3,1.3-7.4,3.3c-1,0.5-1.5,1.2-1.8,1.7c-0.9,1.7-0.3,3.8,0.3,5.2c-0.1,0.1-0.2,0.3-0.4,0.5
+		c-0.4,0.6-0.6,1.4-0.6,2.3c0,1.1,0.3,2.3,0.9,3.1c0.3,0.4,0.5,1,0.6,1.5c0.3,2,1,3.3,1.8,4.1c0.2,0.9,0.4,2.3-0.6,2.9
+		c-0.1,0.1-0.2,0.1-0.2,0.1c-11,4.6-11,6.6-11,7.4v6c0,3.2,2.6,5.8,5.8,5.8h12.4h8.9h3.8C47.7,53.9,50.3,51.3,50.3,48.1z"/>
+</g>
+</svg>
diff --git "a/public/img/icons_light_theme/Icon\r" "b/public/img/icons_light_theme/Icon\r"
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/public/img/icons_light_theme/icon_add_folder.svg b/public/img/icons_light_theme/icon_add_folder.svg
new file mode 100644
index 00000000000..ad4638e7e32
--- /dev/null
+++ b/public/img/icons_light_theme/icon_add_folder.svg
@@ -0,0 +1,29 @@
+<?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="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:#555555;}
+	.st1{fill:#F2F2F3;}
+	.st2{fill:url(#SVGID_1_);}
+</style>
+<path class="st0" d="M14.8,19.2h46.3v-0.8c0-3.3-2.7-5.9-5.9-5.9H29.8l-1.3-3.2l0-0.1c-0.5-1-1.5-1.7-2.6-1.7H13
+	c-1.1,0-2.2,0.7-2.7,1.7l-1.2,3.2H5.9c-3.3,0-5.9,2.7-5.9,5.9V49c0,1.9,0.2,1.7,0.5,2.4l1-3l8-25.2C10.1,20.8,12.3,19.2,14.8,19.2z"
+	/>
+<polygon class="st1" points="0,52.9 1.6,47.9 0,47.9 "/>
+<path class="st0" d="M60.6,22.8H16.8c-1.8,0-3.4,1.2-4,2.9L4.2,53.3H11h31.3c-1-0.6-1.7-1.7-1.7-3v-4.8c0-1.9,1.6-3.5,3.5-3.5h2.2
+	v-2.2c0-1.9,1.6-3.5,3.5-3.5h4.8c1.9,0,3.5,1.6,3.5,3.5V42h0.2l5.5-14.7C64.6,25.1,63,22.8,60.6,22.8z"/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="52.1271" y1="62.3127" x2="52.1271" y2="34.3987">
+	<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="st2" d="M60.2,45.1h-3.1H55v-5.2c0-0.3-0.2-0.5-0.5-0.5h-4.8c-0.3,0-0.5,0.2-0.5,0.5v5.2H44c-0.3,0-0.5,0.2-0.5,0.5v4.8
+	c0,0.3,0.2,0.5,0.5,0.5h5.2v2.6V56c0,0.3,0.2,0.5,0.5,0.5h4.8c0.3,0,0.5-0.2,0.5-0.5v-5.2h5.2c0.3,0,0.5-0.2,0.5-0.5v-4.8
+	C60.7,45.3,60.5,45.1,60.2,45.1z"/>
+</svg>
diff --git a/public/img/icons_light_theme/icon_alert.svg b/public/img/icons_light_theme/icon_alert.svg
new file mode 100644
index 00000000000..a3109c23fa1
--- /dev/null
+++ b/public/img/icons_light_theme/icon_alert.svg
@@ -0,0 +1,16 @@
+<?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="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:#555555;}
+</style>
+<g>
+	<g>
+		<path class="st0" d="M32,64c4.6,0,8.2-3.7,8.2-8.2H23.8C23.8,60.3,27.4,64,32,64z"/>
+	</g>
+	<path class="st0" d="M53.5,42.7V32.3c0-12.8-6.7-23.5-15.9-26.7C37.6,2.5,35.1,0,32,0c-3.1,0-5.6,2.5-5.6,5.6
+		c-9.2,3.2-15.9,13.9-15.9,26.7v10.4C8,42.8,6,44.8,6,47.3s2,4.5,4.5,4.6v0h0.1h42.8h0.1v0c2.5,0,4.5-2.1,4.5-4.6
+		C58,44.8,56,42.8,53.5,42.7z"/>
+</g>
+</svg>
diff --git a/public/img/icons_light_theme/icon_alert_alt.svg b/public/img/icons_light_theme/icon_alert_alt.svg
new file mode 100644
index 00000000000..0d105481a7d
--- /dev/null
+++ b/public/img/icons_light_theme/icon_alert_alt.svg
@@ -0,0 +1,108 @@
+<?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="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:#555555;}
+	.st1{fill:url(#SVGID_1_);}
+	.st2{fill:url(#SVGID_2_);}
+	.st3{fill:url(#SVGID_3_);}
+	.st4{fill:url(#SVGID_4_);}
+	.st5{fill:url(#SVGID_5_);}
+	.st6{fill:url(#SVGID_6_);}
+</style>
+<g>
+	<g>
+		<path class="st0" d="M32,59.4c3.3,0,6-2.7,6-6H26C26,56.7,28.7,59.4,32,59.4z"/>
+	</g>
+</g>
+<g>
+	<path class="st0" d="M47.7,43.8v-7.6c0-9.4-4.9-17.2-11.6-19.6c0-2.3-1.8-4.1-4.1-4.1c-2.3,0-4.1,1.8-4.1,4.1
+		c-6.7,2.3-11.6,10.2-11.6,19.6v7.6c-1.8,0-3.3,1.5-3.3,3.3c0,1.8,1.5,3.3,3.3,3.3v0h0h31.4h0v0c1.8,0,3.3-1.5,3.3-3.3
+		C51,45.3,49.6,43.9,47.7,43.8z"/>
+</g>
+<g>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="52.0976" y1="33.7801" x2="52.0976" y2="-1.9525">
+		<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="M56.4,24.4c-0.7,0-1.3-0.4-1.5-1c-1.8-4.3-4.6-8.2-8.1-11.3c-0.7-0.6-0.8-1.7-0.2-2.4c0.6-0.7,1.7-0.8,2.4-0.2
+		c3.9,3.4,7.1,7.8,9,12.6c0.4,0.9-0.1,1.8-0.9,2.2C56.8,24.4,56.6,24.4,56.4,24.4z"/>
+</g>
+<g>
+	<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="46.9877" y1="33.7801" x2="46.9877" y2="-1.9525">
+		<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="st2" d="M50.3,26.9c-0.7,0-1.3-0.4-1.5-1c-1.4-3.3-3.5-6.3-6.2-8.6c-0.7-0.6-0.8-1.7-0.2-2.4c0.6-0.7,1.7-0.8,2.4-0.2
+		c3.1,2.7,5.5,6.1,7.1,9.9c0.4,0.9-0.1,1.8-0.9,2.2C50.7,26.8,50.5,26.9,50.3,26.9z"/>
+</g>
+<g>
+	<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="57.4685" y1="33.7801" x2="57.4685" y2="-1.9525">
+		<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="st3" d="M62.3,21.4c-0.7,0-1.3-0.4-1.5-1c-2-4.9-5.2-9.4-9.3-12.9c-0.7-0.6-0.8-1.7-0.2-2.4C52,4.5,53,4.4,53.7,5
+		c4.4,3.8,7.9,8.7,10.2,14.1c0.4,0.9-0.1,1.8-0.9,2.2C62.8,21.4,62.5,21.4,62.3,21.4z"/>
+</g>
+<g>
+	<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="11.902" y1="33.7801" x2="11.902" y2="-1.9525">
+		<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="st4" d="M7.6,24.4c-0.2,0-0.4,0-0.6-0.1c-0.9-0.4-1.3-1.3-0.9-2.2c2-4.8,5.1-9.2,9-12.6c0.7-0.6,1.8-0.5,2.4,0.2
+		c0.6,0.7,0.5,1.8-0.2,2.4c-3.5,3.1-6.4,7-8.1,11.3C8.9,24,8.3,24.4,7.6,24.4z"/>
+</g>
+<g>
+	<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="17.0123" y1="33.7801" x2="17.0123" y2="-1.9525">
+		<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="st5" d="M13.7,26.9c-0.2,0-0.4,0-0.6-0.1c-0.9-0.4-1.3-1.3-0.9-2.2c1.5-3.8,4-7.2,7.1-9.9c0.7-0.6,1.8-0.5,2.4,0.2
+		c0.6,0.7,0.5,1.8-0.2,2.4c-2.7,2.3-4.8,5.3-6.2,8.6C15,26.5,14.4,26.9,13.7,26.9z"/>
+</g>
+<g>
+	<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="6.5315" y1="33.7801" x2="6.5315" y2="-1.9525">
+		<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="st6" d="M1.7,21.4c-0.2,0-0.4,0-0.6-0.1C0.2,21-0.2,20,0.1,19.1C2.3,13.7,5.9,8.8,10.3,5C11,4.4,12,4.5,12.7,5.2
+		c0.6,0.7,0.5,1.8-0.2,2.4c-4,3.5-7.2,8-9.3,12.9C3,21,2.3,21.4,1.7,21.4z"/>
+</g>
+</svg>
diff --git a/public/img/icons_light_theme/icon_alert_off.svg b/public/img/icons_light_theme/icon_alert_off.svg
new file mode 100644
index 00000000000..b8fd5b000a3
--- /dev/null
+++ b/public/img/icons_light_theme/icon_alert_off.svg
@@ -0,0 +1,17 @@
+<?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="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:#555555;}
+</style>
+<g>
+	<path class="st0" d="M34.5,64c4.5,0,8.1-3.6,8.1-8.1H26.4C26.4,60.4,30,64,34.5,64z"/>
+	<path class="st0" d="M40,6.6c0-3-2.5-5.5-5.5-5.5c-3,0-5.5,2.5-5.5,5.5c-9,3.1-15.6,13.7-15.6,26.2v5L43.2,8.1
+		C42.1,7.5,41.1,7,40,6.6z"/>
+	<path class="st0" d="M55.5,52.1L55.5,52.1L55.5,52.1c2.5,0,4.5-2,4.5-4.5s-2-4.5-4.4-4.5V32.8c0-4.5-0.9-8.8-2.4-12.5L21.4,52.1
+		H55.5z"/>
+	<path class="st0" d="M59,0c-0.9,0-1.7,0.3-2.4,1l-54,54c-1.3,1.3-1.3,3.4,0,4.8c0.7,0.7,1.5,1,2.4,1s1.7-0.3,2.4-1l54-54
+		c1.3-1.3,1.3-3.4,0-4.8C60.7,0.3,59.9,0,59,0z"/>
+</g>
+</svg>
diff --git a/public/img/icons_light_theme/icon_dashboard.svg b/public/img/icons_light_theme/icon_dashboard.svg
new file mode 100644
index 00000000000..2e275b87568
--- /dev/null
+++ b/public/img/icons_light_theme/icon_dashboard.svg
@@ -0,0 +1,18 @@
+<?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="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:#555555;}
+</style>
+<g>
+	<path class="st0" d="M24.5,31H6.1C2.7,31,0,28.3,0,24.9V6.5c0-3.4,2.7-6.1,6.1-6.1h18.4c3.4,0,6.1,2.7,6.1,6.1v18.4
+		C30.6,28.3,27.9,31,24.5,31z"/>
+	<path class="st0" d="M57.9,31H39.5c-3.4,0-6.1-2.7-6.1-6.1V6.5c0-3.4,2.7-6.1,6.1-6.1h18.4c3.4,0,6.1,2.7,6.1,6.1v18.4
+		C64,28.3,61.3,31,57.9,31z"/>
+	<path class="st0" d="M24.5,63.6H6.1c-3.4,0-6.1-2.7-6.1-6.1V39.1C0,35.7,2.7,33,6.1,33h18.4c3.4,0,6.1,2.7,6.1,6.1v18.4
+		C30.6,60.9,27.9,63.6,24.5,63.6z"/>
+	<path class="st0" d="M57.9,63.6H39.5c-3.4,0-6.1-2.7-6.1-6.1V39.1c0-3.4,2.7-6.1,6.1-6.1h18.4c3.4,0,6.1,2.7,6.1,6.1v18.4
+		C64,60.9,61.3,63.6,57.9,63.6z"/>
+</g>
+</svg>
diff --git a/public/img/icons_light_theme/icon_dashboard_fav.svg b/public/img/icons_light_theme/icon_dashboard_fav.svg
new file mode 100644
index 00000000000..6ec8730e3ad
--- /dev/null
+++ b/public/img/icons_light_theme/icon_dashboard_fav.svg
@@ -0,0 +1,28 @@
+<?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="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:#555555;}
+	.st1{fill:url(#SVGID_1_);}
+</style>
+<path class="st0" d="M23.5,22.7l7-17.3c-0.5-2.8-3-5-6-5H6.1C2.7,0.4,0,3.1,0,6.5v18.4C0,28.3,2.7,31,6.1,31H9l-7.4-6.5L23.5,22.7z"
+	/>
+<path class="st0" d="M62.5,24.5L55,31h2.9c3.4,0,6.1-2.7,6.1-6.1V6.5c0-3.4-2.7-6.1-6.1-6.1H39.5c-3,0-5.5,2.2-6,5l7,17.3L62.5,24.5
+	z"/>
+<path class="st0" d="M18.3,39.1l-7-6.1H6.1C2.7,33,0,35.7,0,39.1v18.4c0,3.4,2.7,6.1,6.1,6.1h18.4c3.4,0,6.1-2.7,6.1-6.1v-7.3
+	L13.1,61.2L18.3,39.1z"/>
+<path class="st0" d="M50.9,61.2L33.4,50.2v7.3c0,3.4,2.7,6.1,6.1,6.1h18.4c3.4,0,6.1-2.7,6.1-6.1V39.1c0-3.4-2.7-6.1-6.1-6.1h-5.1
+	l-7,6.1L50.9,61.2z"/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="32.0001" y1="63.3894" x2="32.0001" y2="7.0572">
+	<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>
+<polygon class="st1" points="52.1,27.9 37.6,26.7 32,13 26.4,26.7 11.9,27.9 23,37.6 19.6,52.1 32,44.3 44.4,52.1 41,37.6 "/>
+</svg>
diff --git a/public/img/icons_light_theme/icon_import_dashboard.svg b/public/img/icons_light_theme/icon_import_dashboard.svg
new file mode 100644
index 00000000000..3a83c0fe829
--- /dev/null
+++ b/public/img/icons_light_theme/icon_import_dashboard.svg
@@ -0,0 +1,32 @@
+<?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="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:#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>
+</svg>
diff --git a/public/img/icons_light_theme/icon_new_dashboard.svg b/public/img/icons_light_theme/icon_new_dashboard.svg
new file mode 100644
index 00000000000..a4ea6c4f4b0
--- /dev/null
+++ b/public/img/icons_light_theme/icon_new_dashboard.svg
@@ -0,0 +1,32 @@
+<?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="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:#555555;}
+	.st1{fill:url(#SVGID_1_);}
+</style>
+<g>
+	<path class="st0" d="M23,0.4H5.7C2.6,0.4,0,2.9,0,6.1v17.2c0,3.2,2.6,5.7,5.7,5.7H23c3.2,0,5.7-2.6,5.7-5.7V6.1
+		C28.7,2.9,26.1,0.4,23,0.4z"/>
+	<path class="st0" d="M37,29.1h17.2c3.2,0,5.7-2.6,5.7-5.7V6.1c0-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.5,33.9,29.1,37,29.1z"/>
+	<path class="st0" d="M23,30.9H5.7c-3.2,0-5.7,2.6-5.7,5.7v17.2c0,3.2,2.6,5.7,5.7,5.7H23c3.2,0,5.7-2.6,5.7-5.7V36.6
+		C28.7,33.5,26.1,30.9,23,30.9z"/>
+	<path class="st0" d="M37.7,55.6v-6.2c0-2.5,2.1-4.6,4.6-4.6h2.9v-2.9c0-2.5,2.1-4.6,4.6-4.6H56c1.7,0,3.2,1,4,2.4v-3.1
+		c0-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.7h3.1C38.7,58.8,37.7,57.3,37.7,55.6z"/>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="52.8592" y1="87.6694" x2="52.8592" y2="27.0106">
+		<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="M63.4,48.8H60h-3.4v-1v-5.8c0-0.3-0.3-0.6-0.6-0.6h-6.2c-0.3,0-0.6,0.3-0.6,0.6v6.8h-6.8
+		c-0.3,0-0.6,0.3-0.6,0.6v6.2c0,0.3,0.3,0.6,0.6,0.6h5.8h1v3.4V63c0,0.3,0.3,0.6,0.6,0.6H56c0.3,0,0.6-0.3,0.6-0.6v-3.9v0v-2.9h2.9
+		h0.2h3.7c0.3,0,0.6-0.3,0.6-0.6v-6.2C64,49.1,63.7,48.8,63.4,48.8z"/>
+</g>
+</svg>
diff --git a/public/img/icons_light_theme/icon_notification_channels.svg b/public/img/icons_light_theme/icon_notification_channels.svg
new file mode 100644
index 00000000000..aa6ada13c8a
--- /dev/null
+++ b/public/img/icons_light_theme/icon_notification_channels.svg
@@ -0,0 +1,14 @@
+<?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="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:#555555;}
+</style>
+<path class="st0" d="M56.3,44.5c-1.6,0-3.2,0.5-4.4,1.4l-8.1-4.7c0.3-1,0.4-2,0.4-3.1c0-5.6-3.8-10.4-9-11.8v-7.5
+	c2.6-1.2,4.5-3.9,4.5-7c0-4.2-3.4-7.7-7.7-7.7s-7.7,3.4-7.7,7.7c0,3.1,1.8,5.7,4.5,7v7.5c-5.2,1.4-9,6.1-9,11.8
+	c0,1.1,0.2,2.1,0.4,3.1l-8.1,4.7c-1.2-0.9-2.8-1.4-4.4-1.4c-4.2,0-7.7,3.4-7.7,7.7s3.4,7.7,7.7,7.7s7.7-3.4,7.7-7.7
+	c0-0.2,0-0.5,0-0.7l8.1-4.7c2.2,2.2,5.3,3.6,8.6,3.6c3.4,0,6.4-1.4,8.6-3.6l8.1,4.7c0,0.2,0,0.5,0,0.7c0,4.2,3.4,7.7,7.7,7.7
+	s7.7-3.4,7.7-7.7S60.6,44.5,56.3,44.5z M32,43.9c-3.2,0-5.8-2.6-5.8-5.8c0-3.2,2.6-5.8,5.8-5.8s5.8,2.6,5.8,5.8
+	C37.8,41.3,35.2,43.9,32,43.9z"/>
+</svg>
diff --git a/public/img/icons_light_theme/icon_org.svg b/public/img/icons_light_theme/icon_org.svg
new file mode 100644
index 00000000000..2c4b738bda2
--- /dev/null
+++ b/public/img/icons_light_theme/icon_org.svg
@@ -0,0 +1,40 @@
+<?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="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:#555555;}
+</style>
+<g>
+	<path class="st0" d="M63.8,55.9h-2.1c-0.1,0-0.2-0.1-0.2-0.2V20.3c0-0.1-0.1-0.2-0.2-0.2l-20.5-3.1c0,0-0.1,0-0.1,0l-4.7,1.3
+		c-0.1,0-0.2,0.1-0.2,0.2l-1.3,16.4c0,0.2-0.3,0.2-0.3,0V6.7c0-0.1-0.1-0.2-0.2-0.2L13.4,3.4c0,0-0.1,0-0.1,0L5.2,6
+		C5.1,6,5.1,6.1,5.1,6.2L3.2,55.7c0,0.1-0.1,0.2-0.2,0.2H0.2C0.1,55.9,0,56,0,56.1v4.3c0,0.1,0.1,0.2,0.2,0.2h4.8h13.2
+		c0.1,0,0.2-0.1,0.2-0.2v-4.5V9.1c0-0.1,0.1-0.3,0.3-0.2L29,10.3c0.1,0,0.2,0.1,0.2,0.2v50.1h0.2h2.9h1.8h1.2h0.4h9.8
+		c0.1,0,0.2-0.1,0.2-0.2v-4.5V22.7c0-0.1,0.1-0.3,0.3-0.2l10.2,1.4c0.1,0,0.2,0.1,0.2,0.2v36.5h0.2h4.7h2.4c0.1,0,0.2-0.1,0.2-0.2
+		v-4.3C64,56,63.9,55.9,63.8,55.9z"/>
+	<path class="st0" d="M26.6,17.6l-5.5-0.9c-0.3,0-0.6,0.2-0.6,0.6v2.4c0,0.3,0.2,0.5,0.5,0.6l5.5,0.9c0.3,0,0.6-0.2,0.6-0.6v-2.4
+		C27.1,17.9,26.9,17.6,26.6,17.6z"/>
+	<path class="st0" d="M26.6,23.2l-5.5-0.9c-0.3,0-0.6,0.2-0.6,0.6v2.4c0,0.3,0.2,0.5,0.5,0.6l5.5,0.9c0.3,0,0.6-0.2,0.6-0.6v-2.4
+		C27.1,23.5,26.9,23.2,26.6,23.2z"/>
+	<path class="st0" d="M26.6,28.7l-5.5-0.9c-0.3,0-0.6,0.2-0.6,0.6v2.4c0,0.3,0.2,0.5,0.5,0.6l5.5,0.9c0.3,0,0.6-0.2,0.6-0.6v-2.4
+		C27.1,29,26.9,28.8,26.6,28.7z"/>
+	<path class="st0" d="M26.6,34.3l-5.5-0.9c-0.3,0-0.6,0.2-0.6,0.6v2.4c0,0.3,0.2,0.5,0.5,0.6l5.5,0.9c0.3,0,0.6-0.2,0.6-0.6v-2.4
+		C27.1,34.6,26.9,34.3,26.6,34.3z"/>
+	<path class="st0" d="M26.6,39.9L21.1,39c-0.3,0-0.6,0.2-0.6,0.6v2.4c0,0.3,0.2,0.5,0.5,0.6l5.5,0.9c0.3,0,0.6-0.2,0.6-0.6v-2.4
+		C27.1,40.1,26.9,39.9,26.6,39.9z"/>
+	<path class="st0" d="M26.6,45.4l-5.5-0.9c-0.3,0-0.6,0.2-0.6,0.6v2.4c0,0.3,0.2,0.5,0.5,0.6l5.5,0.9c0.3,0,0.6-0.2,0.6-0.6V46
+		C27.1,45.7,26.9,45.5,26.6,45.4z"/>
+	<path class="st0" d="M26.6,12.1l-5.5-0.9c-0.3,0-0.6,0.2-0.6,0.6v2.4c0,0.3,0.2,0.5,0.5,0.6l5.5,0.9c0.3,0,0.6-0.2,0.6-0.6v-2.4
+		C27.1,12.3,26.9,12.1,26.6,12.1z"/>
+	<path class="st0" d="M53.9,30.6l-5.6-0.9c-0.3,0-0.5,0.2-0.5,0.5v2.4c0,0.2,0.2,0.4,0.4,0.5l5.6,0.9c0.3,0,0.5-0.2,0.5-0.5V31
+		C54.4,30.8,54.2,30.6,53.9,30.6z"/>
+	<path class="st0" d="M53.9,35.9L48.4,35c-0.3,0-0.5,0.2-0.5,0.5v2.4c0,0.2,0.2,0.4,0.4,0.5l5.6,0.9c0.3,0,0.5-0.2,0.5-0.5v-2.4
+		C54.4,36.1,54.2,35.9,53.9,35.9z"/>
+	<path class="st0" d="M53.9,41.2l-5.6-0.9c-0.3,0-0.5,0.2-0.5,0.5v2.4c0,0.2,0.2,0.4,0.4,0.5l5.6,0.9c0.3,0,0.5-0.2,0.5-0.5v-2.4
+		C54.4,41.4,54.2,41.2,53.9,41.2z"/>
+	<path class="st0" d="M53.9,46.5l-5.6-0.9c-0.3,0-0.5,0.2-0.5,0.5v2.4c0,0.2,0.2,0.4,0.4,0.5l5.6,0.9c0.3,0,0.5-0.2,0.5-0.5V47
+		C54.4,46.7,54.2,46.5,53.9,46.5z"/>
+	<path class="st0" d="M53.9,25.3l-5.6-0.9c-0.3,0-0.5,0.2-0.5,0.5v2.4c0,0.2,0.2,0.4,0.4,0.5l5.6,0.9c0.3,0,0.5-0.2,0.5-0.5v-2.4
+		C54.4,25.5,54.2,25.3,53.9,25.3z"/>
+</g>
+</svg>
diff --git a/public/img/icons_light_theme/icon_user.svg b/public/img/icons_light_theme/icon_user.svg
new file mode 100644
index 00000000000..2a68115129d
--- /dev/null
+++ b/public/img/icons_light_theme/icon_user.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="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:#555555;}
+</style>
+<g>
+	<path class="st0" d="M42.8,36c-0.1-0.1-0.2-0.1-0.4-0.2c-1.4-0.8-1.1-3-0.8-4.3c1-1.1,2.1-2.9,2.5-5.9c0.1-0.8,0.4-1.5,0.9-2.2
+		c0.9-1.2,1.4-2.9,1.4-4.6c0-1.3-0.3-2.4-0.9-3.3c-0.1-0.2-0.3-0.4-0.4-0.6c0.7-1.8,1.5-4.6,0.8-7.5C44.6,2.3,37.8,0,32,0
+		c-5.3,0-9.2,1.8-10.8,4.9c-1.4,0.7-2.2,1.7-2.6,2.5c-1.3,2.5-0.4,5.5,0.4,7.6c-0.2,0.2-0.4,0.4-0.5,0.7c-0.6,0.9-0.9,2.1-0.9,3.4
+		c0,1.6,0.5,3.3,1.4,4.5c0.5,0.6,0.8,1.4,0.9,2.2c0.4,3,1.5,4.8,2.6,5.9c0.3,1.3,0.6,3.4-0.8,4.2c-0.1,0.1-0.2,0.1-0.3,0.2
+		C5.2,42.8,5.1,45.7,5.1,46.8v8.7c0,4.7,3.8,8.5,8.5,8.5h18.1h13h5.6c4.7,0,8.5-3.8,8.5-8.5v-8.7C58.9,45.7,58.8,42.8,42.8,36z"/>
+</g>
+</svg>
diff --git a/public/img/icons_light_theme/icon_user_group.svg b/public/img/icons_light_theme/icon_user_group.svg
new file mode 100644
index 00000000000..2ec7caf796e
--- /dev/null
+++ b/public/img/icons_light_theme/icon_user_group.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="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:#555555;}
+</style>
+<g>
+	<path class="st0" d="M11.8,48.1v-6c0-1.5,0.6-3.3,6.4-6.4c0.1-0.2,0.2-0.5,0.3-0.7c0.4-0.6,0.6-1.3,0.6-2.1c0-0.6-0.1-1.1-0.4-1.6
+		c-0.1-0.1-0.1-0.2-0.2-0.3c0.3-0.8,0.7-2.1,0.3-3.5c-0.6-2.4-3.8-3.5-6.4-3.5c-2.4,0-4.3,0.9-5,2.3c-0.7,0.3-1,0.8-1.2,1.2
+		c-0.6,1.2-0.2,2.6,0.2,3.5c-0.1,0.1-0.2,0.2-0.2,0.3c-0.3,0.4-0.4,1-0.4,1.6c0,0.8,0.2,1.5,0.6,2.1c0.2,0.3,0.4,0.6,0.4,1
+		C7,37.5,7.5,38.4,8,38.9c0.1,0.6,0.3,1.6-0.4,2c-0.1,0-0.1,0.1-0.1,0.1C0,44.1,0,45.4,0,45.9V50c0,2.2,1.8,3.9,3.9,3.9h8.4h2.2
+		C12.8,52.5,11.8,50.5,11.8,48.1z"/>
+	<path class="st0" d="M56.6,40.9c0,0-0.1-0.1-0.2-0.1c-0.7-0.4-0.5-1.4-0.4-2c0.5-0.5,1-1.4,1.2-2.7c0.1-0.4,0.2-0.7,0.4-1
+		c0.4-0.6,0.6-1.3,0.6-2.1c0-0.6-0.1-1.1-0.4-1.6c-0.1-0.1-0.1-0.2-0.2-0.3c0.3-0.8,0.7-2.1,0.3-3.5c-0.6-2.4-3.8-3.5-6.4-3.5
+		c-2.4,0-4.3,0.9-5,2.3c-0.7,0.3-1,0.8-1.2,1.2c-0.6,1.2-0.2,2.6,0.2,3.5c-0.1,0.1-0.2,0.2-0.2,0.3c-0.3,0.4-0.4,1-0.4,1.6
+		c0,0.8,0.2,1.5,0.6,2.1c0.2,0.2,0.3,0.5,0.4,0.8c5.6,3,6.2,4.8,6.2,6.3v6c0,2.3-1.1,4.4-2.7,5.8h2.1h6.1h2.6c2.2,0,3.9-1.8,3.9-3.9
+		v-4.1C64,45.4,64,44.1,56.6,40.9z"/>
+	<path class="st0" d="M50.3,48.1v-6c0-0.8,0-2.8-11-7.4c-0.1,0-0.1-0.1-0.2-0.2c-1-0.6-0.8-2.1-0.6-2.9c0.7-0.8,1.4-2,1.7-4
+		c0.1-0.5,0.3-1.1,0.6-1.5c0.6-0.8,1-2,1-3.1c0-0.9-0.2-1.7-0.6-2.3c-0.1-0.1-0.2-0.3-0.3-0.4c0.5-1.2,1-3.1,0.5-5.2
+		c-0.9-3.5-5.5-5.1-9.5-5.1c-3.6,0-6.3,1.3-7.4,3.3c-1,0.5-1.5,1.2-1.8,1.7c-0.9,1.7-0.3,3.8,0.3,5.2c-0.1,0.1-0.2,0.3-0.4,0.5
+		c-0.4,0.6-0.6,1.4-0.6,2.3c0,1.1,0.3,2.3,0.9,3.1c0.3,0.4,0.5,1,0.6,1.5c0.3,2,1,3.3,1.8,4.1c0.2,0.9,0.4,2.3-0.6,2.9
+		c-0.1,0.1-0.2,0.1-0.2,0.1c-11,4.6-11,6.6-11,7.4v6c0,3.2,2.6,5.8,5.8,5.8h12.4h8.9h3.8C47.7,53.9,50.3,51.3,50.3,48.1z"/>
+</g>
+</svg>
diff --git a/public/sass/_grafana.scss b/public/sass/_grafana.scss
index a4e99987576..739b9848338 100644
--- a/public/sass/_grafana.scss
+++ b/public/sass/_grafana.scss
@@ -21,6 +21,7 @@
 @import "base/grid";
 @import "base/fonts";
 @import "base/code";
+@import "base/icons";
 
 // UTILS
 @import "utils/utils";
diff --git a/public/sass/_variables.dark.scss b/public/sass/_variables.dark.scss
index 3c015383103..2f45ecca5e6 100644
--- a/public/sass/_variables.dark.scss
+++ b/public/sass/_variables.dark.scss
@@ -27,8 +27,8 @@ $white:            #fff;
 // -------------------------
 $blue:                  #33B5E5;
 $blue-dark:             #005f81;
-$green:                 #609000;
-$red:                   #CC3900;
+$green:                 #3aa655;
+$red:                   #d44939;
 $yellow:                #ECBB13;
 $pink:                  #FF4444;
 $purple:                #9933CC;
@@ -139,7 +139,7 @@ $btn-primary-bg-hl:           #bc3e06;
 $btn-secondary-bg:            $blue-dark;
 $btn-secondary-bg-hl:     		lighten($blue-dark, 5%);
 
-$btn-success-bg:              lighten($green, 3%);
+$btn-success-bg:              $green;
 $btn-success-bg-hl:     	    darken($green, 3%);
 
 $btn-warning-bg:              $brand-warning;
diff --git a/public/sass/base/_icons.scss b/public/sass/base/_icons.scss
new file mode 100644
index 00000000000..b35f39eb24f
--- /dev/null
+++ b/public/sass/base/_icons.scss
@@ -0,0 +1,38 @@
+.gicon {
+  line-height: 1;
+  display: inline-block;
+  width: 1.2057142857em;
+  height: 1.2057142857em;
+  text-align: center;
+  background-repeat: no-repeat;
+  background-position: center;
+  background-size: 100% 100%;
+  display: inline-block;
+  vertical-align: middle;
+}
+
+.gicon-alert {
+  background-image: url('../img/icons_dark_theme/icon_alert.svg');
+}
+
+.gicon-dashboard {
+  background-image: url('../img/icons_dark_theme/icon_dashboard.svg');
+}
+
+.gicon-dashboard-starred {
+  background-image: url('../img/icons_dark_theme/icon_dashboard_fav.svg');
+}
+
+.gicon-dashboard-new {
+  background-image: url('../img/icons_dark_theme/icon_new_dashboard.svg');
+}
+
+.gicon-folder-new {
+  background-image: url('../img/icons_dark_theme/icon_add_folder.svg');
+}
+
+.gicon-dashboard-import {
+  background-image: url('../img/icons_dark_theme/icon_import_dashboard.svg');
+}
+
+
diff --git a/public/sass/components/_dropdown.scss b/public/sass/components/_dropdown.scss
index 0be45ea0e37..c10c1ecd0ab 100644
--- a/public/sass/components/_dropdown.scss
+++ b/public/sass/components/_dropdown.scss
@@ -91,6 +91,11 @@
         color: $link-color-disabled;
         position: relative;
         top: 3px;
+        padding-left: 5px;
+      }
+
+      .gicon {
+        opacity: 0.9;
       }
     }
   }
diff --git a/public/sass/components/_icon-picker.scss b/public/sass/components/_icon-picker.scss
deleted file mode 100644
index 796f3f95db5..00000000000
--- a/public/sass/components/_icon-picker.scss
+++ /dev/null
@@ -1,26 +0,0 @@
-.gf-icon-picker {
-  width: 400px;
-  height: 450px;
-
-  .icon-filter {
-    padding-bottom: 10px;
-    margin: auto;
-    width: 50%;
-  }
-
-  .icon-container {
-    max-height: 350px;
-    overflow: auto;
-
-    .gf-event-icon {
-      margin: 0.4rem;
-      height: 1.5rem;
-    }
-  }
-}
-
-.gf-icon-picker-button {
-  .gf-event-icon {
-    height: 1.2rem;
-  }
-}
diff --git a/public/sass/components/_navbar.scss b/public/sass/components/_navbar.scss
index ab1cba4fd23..b4692e49dcc 100644
--- a/public/sass/components/_navbar.scss
+++ b/public/sass/components/_navbar.scss
@@ -12,6 +12,7 @@
   min-height: $navbarHeight;
   padding-right: $spacer;
   background-color: $navbarBackground;
+  display: flex;
   @include clearfix();
 }
 
@@ -25,12 +26,12 @@
   position: relative;
   left: 0;
   float: left;
+
+  &--grow {
+    flex-grow: 1;
+  }
 }
 
-.navbar .nav.pull-right {
-  float: right; // redeclare due to specificity
-  margin-right: 0; // remove margin on float right nav
-}
 
 .navbar .nav > li {
   float: left;
@@ -62,6 +63,19 @@
   background-color: $navbarLinkBackgroundActive;
 }
 
+.navbar-page-icon {
+  font-size: $font-size-lg;
+  padding: 1rem 0rem 0.75rem 1rem;
+  min-height: $navbarHeight;
+
+  .gicon {
+    position: relative;
+    top: -1px;
+    font-size: 20px;
+    line-height: 8px;
+  }
+}
+
 .navbar-page-btn {
   text-overflow: ellipsis;
   overflow: hidden;
@@ -78,19 +92,6 @@
     padding-left: 0.2rem;
   }
 
-  .icon-gf {
-    position: relative;
-    top: 2px;
-    font-size: 20px;
-    line-height: 8px;
-    margin-right: 0.5rem;
-  }
-
-  > img {
-    max-width: 27px;
-    max-height: 27px;
-  }
-
   &--search {
     padding: 1rem 1.5rem 0.75rem 1.5rem;
   }
diff --git a/public/sass/components/_sidemenu.scss b/public/sass/components/_sidemenu.scss
index 86011f41c28..aea9cc4e69d 100644
--- a/public/sass/components/_sidemenu.scss
+++ b/public/sass/components/_sidemenu.scss
@@ -73,6 +73,7 @@
   position: relative;
   font-size: 16px;
   border: 1px solid transparent;
+  text-align: center;
 
   img {
     border-radius: 50%;
@@ -97,16 +98,17 @@
   width: 35px;
   height: 35px;
   display: inline-block;
-  i {
+
+  .fa, .icon-gf, .gicon {
     color: $link-color;
-    opacity: .7;
     position: relative;
-    left: 3px;
+    opacity: .7;
     font-size: 130%;
   }
 
   .fa {
     top: 2px;
+    position: relative;
   }
 
   .icon-gf {
@@ -114,7 +116,6 @@
   }
 
   img {
-    left: 3px;
     position: relative;
   }
 }