diff --git a/pixelegg/css/mobile.css b/pixelegg/css/mobile.css
index 8c8a19e2a6..4383b89ba8 100644
--- a/pixelegg/css/mobile.css
+++ b/pixelegg/css/mobile.css
@@ -4324,7 +4324,7 @@ td.message span.message {
   width: 12px;
   height: 12px;
 }
-#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_preferences:before {
+#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_password:before {
   background-image: url(../images/topmenu_items/password.png);
   padding-right: 20px;
   content: "";
@@ -6309,13 +6309,13 @@ a.textSidebox {
   }
   #egw_fw_basecontainer #egw_fw_top_toolbar div.egw_fw_ui_tabs_header {
     max-height: 60px;
-    width: 69%;
+    width: 60%;
     margin-left: 0;
     overflow-x: scroll;
     position: initial;
     white-space: nowrap;
     position: fixed;
-    left: 30%;
+    left: 40%;
     top: 15px;
     height: 50px;
   }
@@ -6336,7 +6336,7 @@ a.textSidebox {
     display: none;
   }
   #egw_fw_basecontainer div#egw_fw_logout {
-    left: 235px;
+    left: 310px;
     top: 20px;
     width: 24px;
     height: 24px;
@@ -6344,12 +6344,12 @@ a.textSidebox {
     z-index: 1;
   }
   #egw_fw_basecontainer div#egw_fw_print {
-    display: none;
-    left: 180px;
+    left: 268px;
     top: 20px;
     width: 24px;
     height: 24px;
     background-size: 24px 24px;
+    z-index: 1;
   }
   #egw_fw_basecontainer .egw_fw_top_toolbar > div:hover {
     -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
@@ -6370,6 +6370,11 @@ a.textSidebox {
     background-repeat: no-repeat;
     z-index: 999;
   }
+  #egw_fw_basecontainer div#egw_fw_menu:hover {
+    -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5);
+    -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5);
+    box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5);
+  }
   #egw_fw_basecontainer div#egw_fw_menu:active {
     -webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
     -moz-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
@@ -6390,8 +6395,14 @@ a.textSidebox {
     list-style-type: none;
   }
   #egw_fw_basecontainer div#egw_fw_topmenu_items ul li {
-    display: inline;
-    padding-right: 6px;
+    display: -webkit-inline-box;
+    display: -moz-inline-box;
+    padding-right: 0.5em;
+  }
+  #egw_fw_basecontainer div#egw_fw_topmenu_items ul li:hover {
+    -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5);
+    -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5);
+    box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5);
   }
   #egw_fw_basecontainer div#egw_fw_topmenu_items ul a#topmenu_home:before {
     content: " ";
@@ -6400,6 +6411,7 @@ a.textSidebox {
     width: 32px;
     height: 32px;
     background-size: 32px 32px;
+    /*display:inline-block;*/
     display: none;
   }
   #egw_fw_basecontainer div#egw_fw_topmenu_items ul a#topmenu_prefs:before {
@@ -6433,7 +6445,7 @@ a.textSidebox {
     background-size: 32px 32px;
     display: inline-block;
   }
-  #egw_fw_basecontainer div#egw_fw_topmenu_items ul a#topmenu_preferences:before {
+  #egw_fw_basecontainer div#egw_fw_topmenu_items ul a#topmenu_password:before {
     background-image: url(../images/topmenu_items/mobile/password.png);
     content: "";
     background-repeat: no-repeat;
@@ -6952,7 +6964,8 @@ a.textSidebox {
     display: none;
   }
   .sidebar-toggle #egw_fw_logout,
-  .sidebar-toggle #egw_fw_topmenu_items {
+  .sidebar-toggle #egw_fw_topmenu_items,
+  .sidebar-toggle #egw_fw_print {
     display: none !important;
   }
   .tabs-header-portrait-collapsed {
diff --git a/pixelegg/css/mobile.less b/pixelegg/css/mobile.less
index 161ebe80e0..c59de378cc 100644
--- a/pixelegg/css/mobile.less
+++ b/pixelegg/css/mobile.less
@@ -104,13 +104,13 @@
 		#egw_fw_top_toolbar{
 			div.egw_fw_ui_tabs_header{
 				max-height: 60px;
-				width: 69%;
+				width: 60%;
 				margin-left: 0;
 				overflow-x: scroll;
 				position: initial;
 				white-space: nowrap;
 				position: fixed;
-				left: 30%;
+				left: 40%;
 				top: 15px;
 				height: 50px;
 				span{
@@ -134,7 +134,7 @@
 		}
 		//FW Logout
 		div#egw_fw_logout{
-			left: 235px;
+			left: 310px;
 			top: 20px;
 			width: 24px;
 			height: 24px;
@@ -144,12 +144,12 @@
 
 		//FW Print
 		div#egw_fw_print{
-			display:none; //ATM set it to not displayed
-			left: 180px;
+			left: 268px;
 			top: 20px;
 			width: 24px;
 			height: 24px;
 			background-size: 24px 24px;
+			z-index: 1;
 		}
 		.egw_fw_top_toolbar>div:hover{
 			-webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
@@ -172,6 +172,11 @@
 			background-size: 32px 32px;
 			background-repeat: no-repeat;
 			z-index: 999;
+			&:hover {
+				-webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5);
+				-moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5);
+				box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5);
+			}
 		}
 		div#egw_fw_menu:active {
 			-webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
@@ -191,8 +196,14 @@
 				margin:0;
 				list-style-type: none;
 				li{
-					display:inline;
-					padding-right: 6px;
+					display: -webkit-inline-box;
+					display: -moz-inline-box;
+					padding-right: 0.5em;
+					&:hover {
+						-webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5);
+						-moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5);
+						box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5);
+					}
 				}
 				a#topmenu_home:before {
 					content: " ";
@@ -201,6 +212,7 @@
 					width: 32px;
 					height: 32px;
 					background-size: 32px 32px;
+					/*display:inline-block;*/
 					display:none;
 				}
 				a#topmenu_prefs {
@@ -238,7 +250,7 @@
 					background-size: 32px 32px;
 					display: inline-block;
 				}
-				a#topmenu_preferences:before {
+				a#topmenu_password:before {
 					background-image: url(../images/topmenu_items/mobile/password.png);
 					content: "";
 					background-repeat: no-repeat;
@@ -258,19 +270,21 @@
 					display: inline-block;
 				}
 
-				a#topmenu_search:before {
-					background-image: url(../images/topmenu_items/mobile/search.png);
-					content: "";
-					background-repeat: no-repeat;
-					width: 32px;
-					height: 32px;
-					background-size: 32px 32px;
-					display: inline-block;
-				}
-				a#topmenu_search:active {
-					transform: scale(-2);
-					-webkit-transform:scale(-2);
-					-webkit-transition: 1s ease;
+				a#topmenu_search{
+					&:before {
+						background-image: url(../images/topmenu_items/mobile/search.png);
+						content: "";
+						background-repeat: no-repeat;
+						width: 32px;
+						height: 32px;
+						background-size: 32px 32px;
+						display: inline-block;
+					}
+					&:active {
+						transform: scale(-2);
+						-webkit-transform:scale(-2);
+						-webkit-transition: 1s ease;
+					}
 				}
 			}
 		}
@@ -703,7 +717,7 @@
 				}
 			}
 		}
-		#egw_fw_logout, #egw_fw_topmenu_items{
+		#egw_fw_logout, #egw_fw_topmenu_items, #egw_fw_print{
 			display:none !important;
 		}
 	}
diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css
index 5c53d53914..e8d248bc56 100644
--- a/pixelegg/css/pixelegg.css
+++ b/pixelegg/css/pixelegg.css
@@ -4313,7 +4313,7 @@ td.message span.message {
   width: 12px;
   height: 12px;
 }
-#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_preferences:before {
+#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_password:before {
   background-image: url(../images/topmenu_items/password.png);
   padding-right: 20px;
   content: "";
diff --git a/pixelegg/images/category.png b/pixelegg/images/category.png
new file mode 100755
index 0000000000..e90270a6a2
Binary files /dev/null and b/pixelegg/images/category.png differ
diff --git a/pixelegg/images/topmenu_items/access.png b/pixelegg/images/topmenu_items/access.png
index b08df8326c..6e17974cef 100644
Binary files a/pixelegg/images/topmenu_items/access.png and b/pixelegg/images/topmenu_items/access.png differ
diff --git a/pixelegg/images/topmenu_items/category.png b/pixelegg/images/topmenu_items/category.png
index 96417a4971..9ddc01f2d5 100644
Binary files a/pixelegg/images/topmenu_items/category.png and b/pixelegg/images/topmenu_items/category.png differ
diff --git a/pixelegg/images/topmenu_items/mobile/access.png b/pixelegg/images/topmenu_items/mobile/access.png
old mode 100644
new mode 100755
index 3d2ecbe825..ea16b1e8fe
Binary files a/pixelegg/images/topmenu_items/mobile/access.png and b/pixelegg/images/topmenu_items/mobile/access.png differ
diff --git a/pixelegg/images/topmenu_items/mobile/category.png b/pixelegg/images/topmenu_items/mobile/category.png
index 830d6237ea..e90270a6a2 100755
Binary files a/pixelegg/images/topmenu_items/mobile/category.png and b/pixelegg/images/topmenu_items/mobile/category.png differ
diff --git a/pixelegg/images/topmenu_items/mobile/password.png b/pixelegg/images/topmenu_items/mobile/password.png
old mode 100755
new mode 100644
index fcc514a6d5..3d2ecbe825
Binary files a/pixelegg/images/topmenu_items/mobile/password.png and b/pixelegg/images/topmenu_items/mobile/password.png differ
diff --git a/pixelegg/images/topmenu_items/password.png b/pixelegg/images/topmenu_items/password.png
index 6e17974cef..b08df8326c 100644
Binary files a/pixelegg/images/topmenu_items/password.png and b/pixelegg/images/topmenu_items/password.png differ
diff --git a/pixelegg/less/layout_raster_header.less b/pixelegg/less/layout_raster_header.less
index 653e459168..bd4b62fa97 100644
--- a/pixelegg/less/layout_raster_header.less
+++ b/pixelegg/less/layout_raster_header.less
@@ -166,7 +166,7 @@
                     }
                 }
                 /*password*/
-                a#topmenu_preferences{
+                a#topmenu_password{
                     &:before {
                         background-image: url(../images/topmenu_items/password.png);
                         padding-right: 20px;