diff --git a/addressbook/templates/pixelegg/images/navbar.svg b/addressbook/templates/pixelegg/images/navbar.svg
index 42c3fd7ae3..d84573e550 100755
--- a/addressbook/templates/pixelegg/images/navbar.svg
+++ b/addressbook/templates/pixelegg/images/navbar.svg
@@ -4,6 +4,7 @@
 <?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
 <?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
 <?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
+<?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
 <svg version="1.1" id="addressbook_navbar" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="28.347px" height="28.347px" viewBox="0 0 28.347 28.347" enable-background="new 0 0 28.347 28.347" xml:space="preserve">
 <g>
diff --git a/calendar/templates/pixelegg/app.css b/calendar/templates/pixelegg/app.css
index 33b87436f1..d85d90bda6 100755
--- a/calendar/templates/pixelegg/app.css
+++ b/calendar/templates/pixelegg/app.css
@@ -546,6 +546,9 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
 .egw_fw_ui_category_content {
   padding-left: 0px !important;
 }
+.egw_fw_ui_category_content img.egw_fw_ui_sidemenu_listitem_icon {
+  display: none;
+}
 img.sideboxstar {
   width: 12px;
   height: 12px;
@@ -712,10 +715,13 @@ div.calendar {
 .calendar tbody td.selected {
   /* Cell showing today date */
   font-weight: bold;
-  border: 1px solid #000;
+  border: 0px solid #000;
   padding: 1px 3px 1px 1px;
   background: #fff;
   color: #000;
+  -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);
+  box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
 }
 .calendar tbody td.weekend {
   /* Cells showing weekend days */
@@ -1701,7 +1707,7 @@ tr.prefRow > td {
   right: 55%;
   display: none;
   width: 33%;
-  background-color: #679fd2;
+  background-color: rgba(103, 159, 210, 0.1);
 }
 tr.prefRow:hover .prefHelp {
   display: block;
diff --git a/calendar/templates/pixelegg/app.less b/calendar/templates/pixelegg/app.less
index 3afe4a9d13..51ede406d7 100755
--- a/calendar/templates/pixelegg/app.less
+++ b/calendar/templates/pixelegg/app.less
@@ -23,8 +23,14 @@
 
 .egw_fw_ui_category_content{
     padding-left: 0px !important;
-}
+    
+    // Icon before genrell hidden
+    img.egw_fw_ui_sidemenu_listitem_icon {
+                                                display: none;
+                                            }
+    
 
+}
 
 img.sideboxstar {
     .dimension_width_height_xs;
@@ -39,6 +45,8 @@ img.sideboxstar {
         background-color: @color_positive_action_active !important;}
 }
 
+   
+
 .chzn-container {
     max-width: 85% !important;
     margin-top: 0em
@@ -199,10 +207,11 @@ div.calendar { position: relative; }
 
         td.selected { /* Cell showing today date */
             font-weight: bold;
-            border: 1px solid #000;
+            border: 0px solid #000;
             padding: 1px 3px 1px 1px;
             background: #fff;
             color: #000;
+            .box_shadow_standard_light_inset;
         }
 
         td.weekend { /* Cells showing weekend days */
diff --git a/calendar/templates/pixelegg/images/navbar.svg b/calendar/templates/pixelegg/images/navbar.svg
index 04d49d7f0a..c1b6a12434 100755
--- a/calendar/templates/pixelegg/images/navbar.svg
+++ b/calendar/templates/pixelegg/images/navbar.svg
@@ -4,6 +4,7 @@
 <?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
 <?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
 <?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
+<?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
 <svg version="1.1" id="calendar_navbar" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="28.347px" height="28.347px" viewBox="0 0 28.347 28.347" enable-background="new 0 0 28.347 28.347" xml:space="preserve">
 <path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M24.25,4.068h-0.826v2.479c0,0.913-0.74,1.653-1.653,1.653h-1.653
diff --git a/etemplate/templates/pixelegg/images/navbar.svg b/etemplate/templates/pixelegg/images/navbar.svg
index af057983f2..d218d2ddcd 100755
--- a/etemplate/templates/pixelegg/images/navbar.svg
+++ b/etemplate/templates/pixelegg/images/navbar.svg
@@ -3,6 +3,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
 <?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
+<?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
 <svg version="1.1" id="etemplate_navbar" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="28.347px" height="28.347px" viewBox="0 0 28.347 28.347" enable-background="new 0 0 28.347 28.347" xml:space="preserve">
 <g>
diff --git a/filemanager/templates/pixelegg/app.css b/filemanager/templates/pixelegg/app.css
index 7a23c6a1bf..504a9f0d73 100755
--- a/filemanager/templates/pixelegg/app.css
+++ b/filemanager/templates/pixelegg/app.css
@@ -74,9 +74,10 @@ div.filemanager_navigation > * {
 div.filemanager_navigation > label {
   position: absolute;
   left: 50px;
-  right: 560px;
+  right: 565px;
   padding-top: 3px;
   font-size: 140%;
+  white-space: nowrap;
 }
 div.filemanager_navigation > label > input {
   width: 100%;
@@ -200,7 +201,7 @@ div.filemanager_navigation > label {
   margin-right: 0.2em;
 }
 div.filemanager_navigation > label > input {
-  width: 90%;
+  width: 85%;
 }
 #filemanager-index .et2_file {
   /*background-color: @egw_color_blue_lighter !important;*/
diff --git a/filemanager/templates/pixelegg/app.less b/filemanager/templates/pixelegg/app.less
index 2860291818..2942f010b1 100644
--- a/filemanager/templates/pixelegg/app.less
+++ b/filemanager/templates/pixelegg/app.less
@@ -103,7 +103,7 @@ div.filemanager_navigation > label {
 
 
 div.filemanager_navigation > label > input {
-    width: 90%;
+    width: 85%;
 }
 
 
diff --git a/filemanager/templates/pixelegg/images/navbar.svg b/filemanager/templates/pixelegg/images/navbar.svg
index c1ddf59353..f2e5b34217 100755
--- a/filemanager/templates/pixelegg/images/navbar.svg
+++ b/filemanager/templates/pixelegg/images/navbar.svg
@@ -4,6 +4,7 @@
 <?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
 <?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
 <?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
+<?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
 <svg version="1.1" id="filemanager_navbar" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="28.347px" height="28.347px" viewBox="0 0 28.347 28.347" enable-background="new 0 0 28.347 28.347" xml:space="preserve">
 <g>
diff --git a/infolog/templates/pixelegg/images/done.svg b/infolog/templates/pixelegg/images/done.svg
index da9db169fd..4252c2a87c 100755
--- a/infolog/templates/pixelegg/images/done.svg
+++ b/infolog/templates/pixelegg/images/done.svg
@@ -3,6 +3,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
 <?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
+<?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
 <svg version="1.1" id="infolog_done" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="28.347px" height="28.347px" viewBox="0 0 28.347 28.347" enable-background="new 0 0 28.347 28.347" xml:space="preserve">
 <path fill-rule="evenodd" clip-rule="evenodd" fill="#ECEDED" d="M24.437,0H3.909C1.751,0,0,1.75,0,3.91v20.528
diff --git a/infolog/templates/pixelegg/images/email.svg b/infolog/templates/pixelegg/images/email.svg
index 0e877506dd..09141ecd1f 100755
--- a/infolog/templates/pixelegg/images/email.svg
+++ b/infolog/templates/pixelegg/images/email.svg
@@ -3,6 +3,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
 <?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
+<?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
 <svg version="1.1" id="infolog_email" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="28.347px" height="28.347px" viewBox="0 0 28.347 28.347" enable-background="new 0 0 28.347 28.347" xml:space="preserve">
 <path fill-rule="evenodd" clip-rule="evenodd" fill="#ECEDED" d="M24.803,0.001H3.543C1.586,0.001,0,1.587,0,3.544v21.259
diff --git a/infolog/templates/pixelegg/images/navbar.svg b/infolog/templates/pixelegg/images/navbar.svg
index a160c88841..79a4c5529d 100755
--- a/infolog/templates/pixelegg/images/navbar.svg
+++ b/infolog/templates/pixelegg/images/navbar.svg
@@ -4,6 +4,7 @@
 <?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
 <?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
 <?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
+<?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
 <svg version="1.1" id="infolog_navbar" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="28.347px" height="28.347px" viewBox="0 0 28.347 28.347" enable-background="new 0 0 28.347 28.347" xml:space="preserve">
 <g>
diff --git a/infolog/templates/pixelegg/images/not-started.svg b/infolog/templates/pixelegg/images/not-started.svg
index d3efcf22f7..4630046c73 100755
--- a/infolog/templates/pixelegg/images/not-started.svg
+++ b/infolog/templates/pixelegg/images/not-started.svg
@@ -3,6 +3,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
 <?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
+<?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
 <svg version="1.1" id="infolog_not-started" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="28.347px" height="28.347px" viewBox="0 0 28.347 28.347" enable-background="new 0 0 28.347 28.347" xml:space="preserve">
 <path fill-rule="evenodd" clip-rule="evenodd" fill="#ECEDED" d="M24.803,0H3.543C1.586,0,0,1.586,0,3.543v21.26
diff --git a/infolog/templates/pixelegg/images/note.svg b/infolog/templates/pixelegg/images/note.svg
index 2576c2962c..5b5b8e77f6 100755
--- a/infolog/templates/pixelegg/images/note.svg
+++ b/infolog/templates/pixelegg/images/note.svg
@@ -3,6 +3,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
 <?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
+<?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
 <svg version="1.1" id="infolog_note" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="28.347px" height="28.347px" viewBox="0 0 28.347 28.347" enable-background="new 0 0 28.347 28.347" xml:space="preserve">
 <path fill-rule="evenodd" clip-rule="evenodd" fill="#ECEDED" d="M24.437,0H3.91C1.75,0,0,1.751,0,3.91v20.527
diff --git a/infolog/templates/pixelegg/images/phone.svg b/infolog/templates/pixelegg/images/phone.svg
index abd5f3285b..010de12399 100755
--- a/infolog/templates/pixelegg/images/phone.svg
+++ b/infolog/templates/pixelegg/images/phone.svg
@@ -3,6 +3,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
 <?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
+<?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
 <svg version="1.1" id="infolog_phone" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="28.347px" height="28.347px" viewBox="0 0 28.347 28.347" enable-background="new 0 0 28.347 28.347" xml:space="preserve">
 <g>
diff --git a/infolog/templates/pixelegg/images/task.svg b/infolog/templates/pixelegg/images/task.svg
index 7e44681794..2e6e8fa6d7 100755
--- a/infolog/templates/pixelegg/images/task.svg
+++ b/infolog/templates/pixelegg/images/task.svg
@@ -3,6 +3,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
 <?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
+<?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
 <svg version="1.1" id="infolog_task" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="28.347px" height="28.347px" viewBox="0 0 28.347 28.347" enable-background="new 0 0 28.347 28.347" xml:space="preserve">
 <path fill-rule="evenodd" clip-rule="evenodd" fill="#ECEDED" d="M24.437,0H3.91C1.75,0,0,1.75,0,3.91v20.528
diff --git a/mail/templates/pixelegg/images/navbar.svg b/mail/templates/pixelegg/images/navbar.svg
index 896c3d9c9c..3c37ddb3f6 100755
--- a/mail/templates/pixelegg/images/navbar.svg
+++ b/mail/templates/pixelegg/images/navbar.svg
@@ -4,6 +4,7 @@
 <?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
 <?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
 <?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
+<?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
 <svg version="1.1" id="mail_navbar" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="28.347px" height="28.347px" viewBox="0 0 28.347 28.347" enable-background="new 0 0 28.347 28.347" xml:space="preserve">
 <g>
diff --git a/notifications/templates/pixelegg/images/navbar.svg b/notifications/templates/pixelegg/images/navbar.svg
index 342551b25e..6efa1aec08 100755
--- a/notifications/templates/pixelegg/images/navbar.svg
+++ b/notifications/templates/pixelegg/images/navbar.svg
@@ -4,6 +4,7 @@
 <?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
 <?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
 <?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
+<?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
 <svg version="1.1" id="notifications_navbar" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="28.347px" height="28.347px" viewBox="0 0 28.347 28.347" enable-background="new 0 0 28.347 28.347" xml:space="preserve">
 <g>
diff --git a/preferences/templates/pixelegg/images/navbar.svg b/preferences/templates/pixelegg/images/navbar.svg
index 524b9957bf..8684c776d3 100755
--- a/preferences/templates/pixelegg/images/navbar.svg
+++ b/preferences/templates/pixelegg/images/navbar.svg
@@ -4,6 +4,7 @@
 <?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
 <?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
 <?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
+<?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
 <svg version="1.1" id="preferences_navbar" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="28.347px" height="28.347px" viewBox="0 0 28.347 28.347" enable-background="new 0 0 28.347 28.347" xml:space="preserve">
 <g>
diff --git a/resources/templates/pixelegg/images/navbar.svg b/resources/templates/pixelegg/images/navbar.svg
index 23bd804ce5..85adb11490 100755
--- a/resources/templates/pixelegg/images/navbar.svg
+++ b/resources/templates/pixelegg/images/navbar.svg
@@ -3,6 +3,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
 <?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
+<?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
 <svg version="1.1" id="resources_navbar" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="28.347px" height="28.347px" viewBox="0 0 28.347 28.347" enable-background="new 0 0 28.347 28.347" xml:space="preserve">
 <g>
diff --git a/timesheet/templates/pixelegg/images/navbar.svg b/timesheet/templates/pixelegg/images/navbar.svg
index e1bf0ab906..ed53a3b01e 100755
--- a/timesheet/templates/pixelegg/images/navbar.svg
+++ b/timesheet/templates/pixelegg/images/navbar.svg
@@ -3,6 +3,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
 <?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
+<?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
 <svg version="1.1" id="timesheet_navbar" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="28.347px" height="28.347px" viewBox="0 0 28.347 28.347" enable-background="new 0 0 28.347 28.347" xml:space="preserve">
 <g>