diff --git a/application/views/widgets/navigationHeader.php b/application/views/widgets/navigationHeader.php
index 8e2a936a4..25b557773 100644
--- a/application/views/widgets/navigationHeader.php
+++ b/application/views/widgets/navigationHeader.php
@@ -1,11 +1,3 @@
 <div class="navbar-header">
-	<span>
-		<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
-			<span class="sr-only">Men&uuml; umschalten </span>
-			<span class="icon-bar"></span>
-			<span class="icon-bar"></span>
-			<span class="icon-bar"></span>
-		</button>
-	</span>
-	<span class="menu-header-items"></span>
+	<span id="header-menu" class="menu-header-items"></span>
 </div>
diff --git a/public/css/NavigationWidget.css b/public/css/NavigationWidget.css
index 0baaa684a..0f3f30666 100644
--- a/public/css/NavigationWidget.css
+++ b/public/css/NavigationWidget.css
@@ -34,20 +34,23 @@
 	text-decoration: underline;
 }
 
-.navbar-brand {
-	float: left;
-	height: 50px;
+.navbar-header {
 	padding-top: 15px;
-	padding-right: 20px;
-	padding-left: 7px;
-	font-size: 18px;
+	height: 50px;
 }
 
 .navbar-brand-icon {
-	float: left;
 	height: 50px;
-	padding-top: 15px;
-	padding-left: 7px;
+	top: 0px;
 	font-size: 16px;
 	margin-right: 3px;
 }
+
+.header-menu-link-entry {
+	padding-right: 23px;
+	padding-top: 15px;
+	font-size: 18px;
+	color: #5e5e5e !important;
+	background-color: transparent;
+	text-decoration: none !important;
+}
diff --git a/public/js/NavigationWidget.js b/public/js/NavigationWidget.js
index 4e388db23..232bff455 100644
--- a/public/js/NavigationWidget.js
+++ b/public/js/NavigationWidget.js
@@ -38,7 +38,7 @@ var FHC_NavigationWidget = {
 							if (e != null) strHeaderMenu += FHC_NavigationWidget._buildHeaderMenuStructure(e);
 						});
 
-						$(".menu-header-items").html(strHeaderMenu);
+						$("#header-menu").html(strHeaderMenu);
 					}
 				}
 			}
@@ -142,24 +142,26 @@ var FHC_NavigationWidget = {
 
 		var strHeaderMenu = "";
 
-		if (item["icon"] != "undefined" && item["icon"] != "")
+		var icon = "";
+		if (item["icon"] != null && item["icon"] != "")
 		{
-			strHeaderMenu += '<i class="navbar-brand-icon fa fa-' + item["icon"] + ' fa-fw"></i>';
-		}
-
-		if (item["children"] != null && Object.keys(item["children"]).length > 0)
-		{
-			strHeaderMenu += '<span><a class="navbar-brand" data-toggle="dropdown" href="#" aria-expanded="false">';
+			icon = '<i class="navbar-brand-icon fa fa-' + item["icon"] + ' fa-fw"></i>';
 		}
 
 		var target = "";
 		if (item["target"] != null) target = item["target"];
 
+		strHeaderMenu += '<span class="dropdown">';
+
 		if (item["children"] != null && Object.keys(item["children"]).length > 0)
 		{
+			strHeaderMenu += '<a class="dropdown-toggle header-menu-link-entry" data-toggle="dropdown" href="#">';
+			strHeaderMenu += icon;
 			strHeaderMenu += item["description"] + " ";
-			strHeaderMenu += '<i class="fa fa-caret-down"></i></a>';
-			strHeaderMenu += '<ul class="dropdown-menu dropdown-user">';
+			strHeaderMenu += '<i class="fa fa-caret-down"></i>';
+			strHeaderMenu += '</a>';
+
+			strHeaderMenu += '<ul class="dropdown-menu">';
 
 			jQuery.each(item["children"], function(i, e) {
 				if (e != null)
@@ -167,23 +169,30 @@ var FHC_NavigationWidget = {
 					var eTarget = "";
 					if (e["target"] != null) eTarget = e["target"];
 
-					strHeaderMenu += '<li><a href="' + e["link"] + '" target="' + eTarget + '">';
+					var eIcon = "";
+					if (e["icon"] != null && e["icon"] != "") eIcon += '<i class="fa fa-' + e["icon"] + ' fa-fw"></i>';
 
-					if (e["icon"] != "undefined" && e["icon"] != "")
-					{
-						strHeaderMenu += '<i class="fa fa-' + e["icon"] + ' fa-fw"></i>';
-					}
-
-					strHeaderMenu += e["description"] + '</a></li>';
+					strHeaderMenu += '<li>';
+					strHeaderMenu += '<a href="' + e["link"] + '" target="' + eTarget + '">';
+					strHeaderMenu += eIcon;
+					strHeaderMenu += e["description"];
+					strHeaderMenu += '</a>';
+					strHeaderMenu += '</li>';
 				}
 			});
-			strHeaderMenu += '</ul></span>';
+
+			strHeaderMenu += '</ul>';
 		}
 		else
 		{
-			strHeaderMenu += '<a class="navbar-brand" href="' + item["link"] + '" target="' + target + '">' + item["description"] + '</a>';
+			strHeaderMenu += '<a class="header-menu-link-entry" href="' + item["link"] + '" target="' + target + '">' +
+				icon +
+				item["description"] +
+			'</a>';
 		}
 
+		strHeaderMenu += '</span>';
+
 		return strHeaderMenu;
 	},