diff --git a/app/assets/images/icon-config.svg b/app/assets/images/icon-config.svg
new file mode 100644
index 0000000..f8095aa
--- /dev/null
+++ b/app/assets/images/icon-config.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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"
+	 viewBox="0 0 40 40" style="enable-background:new 0 0 40 40;" xml:space="preserve">
+<path d="M31.5,20c0-0.6-0.1-1.2-0.2-1.8L35,15l-3.1-5.1l-4.4,1.4c-1.1-0.9-2.3-1.6-3.6-2.1L23,5h-6l-1,4.2c-1.3,0.5-2.5,1.2-3.6,2.1
+	L8.1,9.9L5,15l3.7,3.2c-0.1,0.6-0.2,1.2-0.2,1.8c0,0.6,0.1,1.2,0.2,1.8L5,25l3.1,5.1l4.4-1.4c1.1,0.9,2.3,1.6,3.6,2.1l1,4.2h6l1-4.2
+	c1.3-0.5,2.5-1.2,3.6-2.1l4.4,1.4L35,25l-3.7-3.2C31.4,21.2,31.5,20.6,31.5,20z M32.4,25.4L31,27.7l-2.9-0.9l-1.1-0.4l-0.9,0.7
+	c-0.9,0.8-1.9,1.3-2.9,1.7l-1,0.4L22,30.3L21.4,33h-2.8L18,30.3l-0.2-1.1l-1-0.4c-1.1-0.4-2.1-1-2.9-1.7l-0.9-0.7l-1.1,0.4L9,27.7
+	l-1.4-2.3l2.4-2.1l0.8-0.7l-0.2-1.1c-0.1-0.5-0.1-1-0.1-1.5c0-0.4,0-0.9,0.1-1.5l0.2-1.1L10,16.7l-2.4-2.1L9,12.3l2.9,0.9l1.1,0.4
+	l0.9-0.7c0.9-0.8,1.9-1.3,2.9-1.7l1-0.4L18,9.7L18.6,7h2.8L22,9.7l0.2,1.1l1,0.4c1.1,0.4,2.1,1,2.9,1.7l0.9,0.7l1.1-0.4l2.9-0.9
+	l1.4,2.3L30,16.7l-0.8,0.7l0.2,1.1c0.1,0.6,0.1,1,0.1,1.5s0,0.9-0.1,1.5l-0.2,1.1l0.8,0.7L32.4,25.4z"/>
+<path d="M20,15c-2.8,0-5,2.2-5,5s2.2,5,5,5s5-2.2,5-5S22.8,15,20,15z M20,23c-1.7,0-3-1.3-3-3c0-1.7,1.3-3,3-3c1.7,0,3,1.3,3,3
+	C23,21.7,21.7,23,20,23z"/>
+</svg>
diff --git a/app/assets/images/icon-control.svg b/app/assets/images/icon-control.svg
new file mode 100644
index 0000000..de776e1
--- /dev/null
+++ b/app/assets/images/icon-control.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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"
+	 viewBox="0 0 40 40" style="enable-background:new 0 0 40 40;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:10;}
+	.st1{fill:none;stroke:#000000;stroke-width:4;stroke-miterlimit:10;}
+</style>
+<line class="st0" x1="8" y1="12" x2="32" y2="12"/>
+<line class="st0" x1="8" y1="20" x2="32" y2="20"/>
+<line class="st0" x1="8" y1="28" x2="32" y2="28"/>
+<line class="st1" x1="24" y1="28" x2="28" y2="28"/>
+<line class="st1" x1="18" y1="20" x2="22" y2="20"/>
+<line class="st1" x1="12" y1="12" x2="16" y2="12"/>
+</svg>
diff --git a/app/assets/images/icon-health.svg b/app/assets/images/icon-health.svg
new file mode 100644
index 0000000..8007fee
--- /dev/null
+++ b/app/assets/images/icon-health.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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"
+	 viewBox="0 0 40 40" style="enable-background:new 0 0 40 40;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:10;}
+</style>
+<polyline class="st0" points="32,12.9 32,16 8,16 8,8 27,8 "/>
+<rect x="8" y="16" class="st0" width="24" height="8"/>
+<rect x="8" y="24" class="st0" width="24" height="8"/>
+<line class="st0" x1="19" y1="12" x2="27" y2="12"/>
+<line class="st0" x1="11" y1="12" x2="13" y2="12"/>
+<line class="st0" x1="19" y1="20" x2="27" y2="20"/>
+<line class="st0" x1="11" y1="20" x2="13" y2="20"/>
+<line class="st0" x1="19" y1="28" x2="27" y2="28"/>
+<line class="st0" x1="11" y1="28" x2="13" y2="28"/>
+<polygon points="36.4,4 37.5,5.1 32.4,10.2 29.5,7.4 30.7,6.2 32.4,8 "/>
+</svg>
diff --git a/app/assets/images/icon-info.svg b/app/assets/images/icon-info.svg
new file mode 100644
index 0000000..b06bd0b
--- /dev/null
+++ b/app/assets/images/icon-info.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><path d="M18 14h-6v2h2v6h-2v2h8v-2h-2z"/><circle cx="16" cy="10" r="2"/><path d="M16 2C8.269 2 2 8.269 2 16s6.269 14 14 14 14-6.269 14-14S23.731 2 16 2zm0 26C9.383 28 4 22.617 4 16S9.383 4 16 4s12 5.383 12 12-5.383 12-12 12z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icon-more.svg b/app/assets/images/icon-more.svg
new file mode 100644
index 0000000..aaabe10
--- /dev/null
+++ b/app/assets/images/icon-more.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.2.1, 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"
+	 viewBox="0 0 24.3 24.6" style="enable-background:new 0 0 24.3 24.6;" xml:space="preserve">
+<path d="M12.1,23C6.1,23,1.3,18.2,1.3,12.3S6.1,1.6,12.1,1.6s10.7,4.8,10.7,10.7S18,23,12.1,23z M12.1,2.6c-5.4,0-9.7,4.4-9.7,9.7
+	S6.7,22,12.1,22s9.7-4.4,9.7-9.7S17.4,2.6,12.1,2.6z"/>
+<g>
+	<circle cx="6.7" cy="12.5" r="1.5"/>
+	<circle cx="12.1" cy="12.5" r="1.5"/>
+	<circle cx="17.4" cy="12.5" r="1.5"/>
+</g>
+</svg>
diff --git a/app/assets/images/icon-overview.svg b/app/assets/images/icon-overview.svg
new file mode 100644
index 0000000..d1103de
--- /dev/null
+++ b/app/assets/images/icon-overview.svg
@@ -0,0 +1,5 @@
+<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"
+	 viewBox="0 0 40 40" style="enable-background:new 0 0 40 40;" xml:space="preserve">
+<path d="M23.9,18.2l3.3,3.3l1.1-1.1L23.9,16l-7.8,7.8l-3.3-3.3l-1.1,1.1l4.4,4.4L23.9,18.2z"/>
+<path d="M5,8v24h30V8H5z M33,30H7V12h26V30z"/>
+</svg>
diff --git a/app/assets/images/icon-upload.svg b/app/assets/images/icon-upload.svg
new file mode 100644
index 0000000..0d5e3f1
--- /dev/null
+++ b/app/assets/images/icon-upload.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" baseProfile="tiny" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 24 24" xml:space="preserve">
+<path d="M21,14v6H3v-6H1v9h22v-9H21z"/>
+<path d="M11,5v13h2V5l4.5,4.5L19,8l-7-7L5,8l1.5,1.5L11,5z"/>
+</svg>
diff --git a/app/assets/images/icon-user.svg b/app/assets/images/icon-user.svg
new file mode 100644
index 0000000..24740f6
--- /dev/null
+++ b/app/assets/images/icon-user.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><path d="M16 21c5.523 0 10-4.477 10-10S21.523 1 16 1 6 5.477 6 11s4.477 10 10 10zm0-18c4.411 0 8 3.589 8 8s-3.589 8-8 8-8-3.589-8-8 3.589-8 8-8zM24 23H8a4 4 0 0 0-4 4v4h24v-4a4 4 0 0 0-4-4z"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/icon-warning.svg b/app/assets/images/icon-warning.svg
new file mode 100644
index 0000000..760cca5
--- /dev/null
+++ b/app/assets/images/icon-warning.svg
@@ -0,0 +1,18 @@
+<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"
+	 viewBox="0 0 40 40" style="enable-background:new 0 0 40 40;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFCE00;}
+</style>
+<path d="M20,15c-2.8,0-5,2.2-5,5s2.2,5,5,5s5-2.2,5-5S22.8,15,20,15z M20,23c-1.7,0-3-1.3-3-3s1.3-3,3-3s3,1.3,3,3S21.7,23,20,23z"
+	/>
+<g>
+	<polygon class="st0" points="21.1,5.2 6,35.2 36,35.2 	"/>
+	<g>
+		<path d="M21,32.5c-0.3,0-0.5-0.1-0.8-0.2c-0.2-0.1-0.4-0.3-0.5-0.5c-0.1-0.2-0.2-0.5-0.2-0.8c0-0.3,0.1-0.6,0.2-0.8
+			c0.1-0.2,0.3-0.4,0.5-0.5c0.2-0.1,0.5-0.2,0.8-0.2c0.3,0,0.5,0.1,0.8,0.2c0.2,0.1,0.4,0.3,0.5,0.5c0.1,0.2,0.2,0.5,0.2,0.8
+			c0,0.3-0.1,0.6-0.2,0.8c-0.1,0.2-0.3,0.4-0.5,0.5C21.5,32.4,21.3,32.5,21,32.5z"/>
+		<path d="M20.5,28.1c-0.9-3-1.4-5.6-1.4-7.8V18c0.1-1.6,0.8-2.6,1.9-2.9c1.1,0.3,1.8,1.3,1.9,2.9v2.3c0,2.2-0.5,4.8-1.4,7.8H20.5z"
+			/>
+	</g>
+</g>
+</svg>
diff --git a/app/common/directives/app-navigation.html b/app/common/directives/app-navigation.html
index 41f6519..0bf5579 100644
--- a/app/common/directives/app-navigation.html
+++ b/app/common/directives/app-navigation.html
@@ -1,28 +1,68 @@
 <nav>
 	<ul id="nav__top-level" ng-style="navStyle">
 		<li>
-			<a class="btn-overview"  ng-class="{opened: firstLevel == 'overview'}" href="#/overview/system" ng-click="change('overview')" tabindex="1">
-			<span class="">Server overview</span></a>
+			<a class="btn-overview" ng-class="{opened: firstLevel == 'overview'}" href="#/overview/system" ng-click="change('overview')" tabindex="1">
+				<span class="">
+					<svg version="1.1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" viewBox="0 0 40 40" class="nav-icon">
+						<path d="M23.9,18.2l3.3,3.3l1.1-1.1L23.9,16l-7.8,7.8l-3.3-3.3l-1.1,1.1l4.4,4.4L23.9,18.2z"/>
+						<path d="M5,8v24h30V8H5z M33,30H7V12h26V30z"/>
+					</svg>
+					Server overview</span></a>
 		</li>
 		<li>
 			<button class="btn-health" ng-class="{opened: firstLevel == 'server-health'}" ng-click="change('server-health')" tabindex="9">
-			<span>Server health</span></button>
+				<span>
+					<svg version="1.1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" viewBox="0 0 40 40" class="nav-icon">
+						<polyline class="st0" points="32,12.9 32,16 8,16 8,8 27,8 "/>
+						<rect x="8" y="16" class="st0" width="24" height="8"/>
+						<rect x="8" y="24" class="st0" width="24" height="8"/>
+						<line class="st0" x1="19" y1="12" x2="27" y2="12"/>
+						<line class="st0" x1="11" y1="12" x2="13" y2="12"/>
+						<line class="st0" x1="19" y1="20" x2="27" y2="20"/>
+						<line class="st0" x1="11" y1="20" x2="13" y2="20"/>
+						<line class="st0" x1="19" y1="28" x2="27" y2="28"/>
+						<line class="st0" x1="11" y1="28" x2="13" y2="28"/>
+						<polygon points="36.4,4 37.5,5.1 32.4,10.2 29.5,7.4 30.7,6.2 32.4,8 "/>
+					</svg>
+					Server health
+				</span>
+			</button>
 		</li>
 		<li>
 			<button class="btn-control" ng-class="{opened: firstLevel == 'server-control'}" ng-click="change('server-control')">
-			<span>Server control</span></button>
+				<span>
+					<svg version="1.1" xmlns="http://www.w3.org/2000/svg"  x="0px" y="0px" viewBox="0 0 40 40" class="nav-icon">
+						<line class="st0" x1="8" y1="12" x2="32" y2="12"/>
+						<line class="st0" x1="8" y1="20" x2="32" y2="20"/>
+						<line class="st0" x1="8" y1="28" x2="32" y2="28"/>
+						<line class="st1" x1="24" y1="28" x2="28" y2="28"/>
+						<line class="st1" x1="18" y1="20" x2="22" y2="20"/>
+						<line class="st1" x1="12" y1="12" x2="16" y2="12"/>
+					</svg>
+					Server control
+				</span>
+			</button>
 		</li>
 		<li>
 			<button class="btn-config" ng-class="{opened: firstLevel == 'configuration'}" ng-click="change('configuration')">
-			<span>Configuration</span></button>
-		</li>
-		<li>
-			<button class="btn-firmware" ng-class="{opened: firstLevel == 'firmware'}" ng-click="change('firmware')">
-			<span>Firmware</span></button>
+			<span>
+				<svg version="1.1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" viewBox="0 0 40 40" class="nav-icon">
+					<path d="M31.5,20c0-0.6-0.1-1.2-0.2-1.8L35,15l-3.1-5.1l-4.4,1.4c-1.1-0.9-2.3-1.6-3.6-2.1L23,5h-6l-1,4.2c-1.3,0.5-2.5,1.2-3.6,2.1
+						L8.1,9.9L5,15l3.7,3.2c-0.1,0.6-0.2,1.2-0.2,1.8c0,0.6,0.1,1.2,0.2,1.8L5,25l3.1,5.1l4.4-1.4c1.1,0.9,2.3,1.6,3.6,2.1l1,4.2h6l1-4.2
+						c1.3-0.5,2.5-1.2,3.6-2.1l4.4,1.4L35,25l-3.7-3.2C31.4,21.2,31.5,20.6,31.5,20z M32.4,25.4L31,27.7l-2.9-0.9l-1.1-0.4l-0.9,0.7
+						c-0.9,0.8-1.9,1.3-2.9,1.7l-1,0.4L22,30.3L21.4,33h-2.8L18,30.3l-0.2-1.1l-1-0.4c-1.1-0.4-2.1-1-2.9-1.7l-0.9-0.7l-1.1,0.4L9,27.7
+						l-1.4-2.3l2.4-2.1l0.8-0.7l-0.2-1.1c-0.1-0.5-0.1-1-0.1-1.5c0-0.4,0-0.9,0.1-1.5l0.2-1.1L10,16.7l-2.4-2.1L9,12.3l2.9,0.9l1.1,0.4
+						l0.9-0.7c0.9-0.8,1.9-1.3,2.9-1.7l1-0.4L18,9.7L18.6,7h2.8L22,9.7l0.2,1.1l1,0.4c1.1,0.4,2.1,1,2.9,1.7l0.9,0.7l1.1-0.4l2.9-0.9
+						l1.4,2.3L30,16.7l-0.8,0.7l0.2,1.1c0.1,0.6,0.1,1,0.1,1.5s0,0.9-0.1,1.5l-0.2,1.1l0.8,0.7L32.4,25.4z"/>
+					<path d="M20,15c-2.8,0-5,2.2-5,5s2.2,5,5,5s5-2.2,5-5S22.8,15,20,15z M20,23c-1.7,0-3-1.3-3-3c0-1.7,1.3-3,3-3c1.7,0,3,1.3,3,3C23,21.7,21.7,23,20,23z"/>
+				</svg>
+				Configuration</span></button>
 		</li>
 		<li>
 			<button class="btn-users" ng-class="{opened: firstLevel == 'users'}" ng-click="change('users')">
-			<span>Users</span></button>
+				<span><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32" class="nav-icon"><path d="M16 21c5.523 0 10-4.477 10-10S21.523 1 16 1 6 5.477 6 11s4.477 10 10 10zm0-18c4.411 0 8 3.589 8 8s-3.589 8-8 8-8-3.589-8-8 3.589-8 8-8zM24 23H8a4 4 0 0 0-4 4v4h24v-4a4 4 0 0 0-4-4z"/></svg></span>
+				<span>Users</span>
+			</button>
 		</li>
 	</ul>
 	<!--<ul class="nav__second-level btn-overview" ng-style="navStyle" ng-class="{opened: (showSubMenu && firstLevel == 'overview')}">-->