diff --git a/addressbook/templates/pixelegg/images/navbar.svg b/addressbook/templates/pixelegg/images/navbar.svg
index d84573e550..a5a58c1040 100755
--- a/addressbook/templates/pixelegg/images/navbar.svg
+++ b/addressbook/templates/pixelegg/images/navbar.svg
@@ -2,27 +2,24 @@
 <!-- Generator: Adobe Illustrator 16.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <!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" ?>
-<?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">
+<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>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#ECEDED" d="M0,0v28.347h28.348V0H0z M25.393,20.904
-		c0,1.238-1.005,2.243-2.244,2.243H5.199c-1.24,0-2.244-1.005-2.244-2.243V7.441c0-1.239,1.004-2.244,2.244-2.244h17.949
-		c1.239,0,2.244,1.005,2.244,2.244V20.904z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#ECEDED" d="M17.913,16.416h5.235c0.414,0,0.748,0.335,0.748,0.748
-		s-0.334,0.748-0.748,0.748h-5.235c-0.413,0-0.748-0.335-0.748-0.748S17.5,16.416,17.913,16.416z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#ECEDED" d="M17.913,8.938h5.235c0.414,0,0.748,0.335,0.748,0.748
-		c0,0.412-0.334,0.748-0.748,0.748h-5.235c-0.413,0-0.748-0.336-0.748-0.748C17.165,9.272,17.5,8.938,17.913,8.938z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#ECEDED" d="M14.174,7.441H5.199c-0.414,0-0.748,0.335-0.748,0.748v11.967
-		c0,0.412,0.334,0.748,0.748,0.748h8.975c0.413,0,0.748-0.336,0.748-0.748V8.189C14.922,7.776,14.587,7.441,14.174,7.441z
-		 M6.744,11.642c0.039-0.564,0.171-1.16,0.437-1.456c0.583-0.646,1.047-1.268,2.506-1.248c2.046,0.027,2.114,0.938,2.486,1.248
-		c0.467,0.39,0.437,1.456,0.437,1.456s0,0.012,0,0.485l0.437,0.485l-0.437,1.457H12.21c-0.379,0.764-1.751,1.456-2.533,1.456
-		s-2.154-0.692-2.532-1.456h-0.4l-0.437-1.457l0.437-0.485C6.744,12.041,6.734,11.732,6.744,11.642z M13.298,19.415l-7.241-0.007
-		c0,0-0.212-1.666,0.437-2.427c0.453-0.532,0.999-0.709,0.999-0.709s0.854,0.892,2.194,0.892c1.481,0,2.175-0.892,2.175-0.892
-		s0.453,0.13,0.999,0.709C13.547,17.708,13.298,19.415,13.298,19.415z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#ECEDED" d="M17.913,12.677h5.235c0.414,0,0.748,0.335,0.748,0.748
-		s-0.334,0.748-0.748,0.748h-5.235c-0.413,0-0.748-0.335-0.748-0.748S17.5,12.677,17.913,12.677z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" fill="#ECEDED" d="M11.483,16.831c0,0-0.764,0.982-2.397,0.982
+		c-1.478,0-2.418-0.982-2.418-0.982s-0.602,0.194-1.101,0.781c-0.715,0.838-0.481,2.675-0.481,2.675l7.981,0.008
+		c0,0,0.274-1.882-0.482-2.683C11.983,16.974,11.483,16.831,11.483,16.831z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" fill="#ECEDED" d="M5.843,14.402h0.441c0.417,0.842,1.929,1.605,2.791,1.605
+		s2.375-0.764,2.792-1.605h0.44l0.481-1.605l-0.481-0.535c0-0.522,0-0.535,0-0.535s0.033-1.175-0.481-1.604
+		c-0.41-0.341-0.485-1.346-2.74-1.375c-1.608-0.022-2.119,0.663-2.762,1.375c-0.293,0.326-0.438,0.982-0.481,1.604
+		c-0.011,0.1,0,0.44,0,0.535l-0.481,0.535L5.843,14.402z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" fill="#ECEDED" d="M23.924,4.624H4.141c-1.367,0-2.473,1.107-2.473,2.474v14.838
+		c0,1.365,1.106,2.473,2.473,2.473h19.783c1.366,0,2.473-1.107,2.473-2.473V7.098C26.397,5.731,25.29,4.624,23.924,4.624z
+		 M14.857,21.111c0,0.454-0.37,0.824-0.825,0.824H4.141c-0.457,0-0.824-0.37-0.824-0.824V7.922c0-0.455,0.368-0.824,0.824-0.824
+		h9.892c0.455,0,0.825,0.369,0.825,0.824V21.111z M23.924,18.638h-5.771c-0.455,0-0.824-0.369-0.824-0.824s0.369-0.824,0.824-0.824
+		h5.771c0.457,0,0.824,0.369,0.824,0.824S24.38,18.638,23.924,18.638z M23.924,14.517h-5.771c-0.455,0-0.824-0.369-0.824-0.824
+		c0-0.456,0.369-0.825,0.824-0.825h5.771c0.457,0,0.824,0.369,0.824,0.825C24.748,14.147,24.38,14.517,23.924,14.517z
+		 M23.924,10.396h-5.771c-0.455,0-0.824-0.371-0.824-0.825c0-0.455,0.369-0.824,0.824-0.824h5.771c0.457,0,0.824,0.369,0.824,0.824
+		C24.748,10.025,24.38,10.396,23.924,10.396z"/>
 </g>
 </svg>
diff --git a/admin/templates/pixelegg/images/navbar.svg b/admin/templates/pixelegg/images/navbar.svg
new file mode 100755
index 0000000000..865e1bd6c2
--- /dev/null
+++ b/admin/templates/pixelegg/images/navbar.svg
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!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" ?>
+<svg version="1.1" id="admin_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>
+	<path fill="#ECEDED" d="M16.736,8.489h0.776c0.062,0.356,0.174,0.693,0.317,1.01l-0.632,0.484c-0.316,0.24-0.387,0.705-0.158,1.036
+		c0.23,0.331,0.673,0.405,0.987,0.164l0.637-0.485c0.244,0.242,0.516,0.457,0.813,0.629l-0.242,0.779
+		c-0.12,0.391,0.084,0.809,0.453,0.936c0.372,0.127,0.771-0.086,0.891-0.477l0.242-0.783c0.166,0.023,0.333,0.048,0.505,0.048
+		c0.174,0,0.337-0.029,0.504-0.053l0.244,0.788c0.12,0.391,0.519,0.604,0.889,0.477c0.372-0.127,0.574-0.545,0.455-0.936
+		L23.17,11.31c0.295-0.172,0.576-0.369,0.818-0.613l0.638,0.487c0.315,0.241,0.757,0.167,0.986-0.164s0.159-0.796-0.156-1.036
+		l-0.641-0.489c0.145-0.317,0.263-0.649,0.325-1.005h0.777c0.39,0,0.706-0.333,0.706-0.742c0-0.41-0.316-0.743-0.706-0.743h-0.777
+		c-0.063-0.356-0.175-0.693-0.319-1.009l0.635-0.484c0.315-0.241,0.386-0.705,0.156-1.037c-0.229-0.332-0.671-0.405-0.986-0.164
+		L23.99,4.796c-0.246-0.244-0.517-0.458-0.814-0.629l0.242-0.78c0.119-0.39-0.083-0.809-0.455-0.936
+		c-0.37-0.127-0.769,0.086-0.889,0.477l-0.243,0.783c-0.167-0.023-0.332-0.047-0.505-0.047c-0.172,0-0.337,0.029-0.503,0.052
+		l-0.244-0.789c-0.12-0.39-0.519-0.604-0.891-0.477c-0.369,0.127-0.573,0.545-0.453,0.936l0.247,0.797
+		c-0.296,0.173-0.575,0.37-0.817,0.613L18.027,4.31c-0.314-0.241-0.757-0.167-0.987,0.164c-0.229,0.332-0.158,0.796,0.158,1.037
+		L17.837,6c-0.143,0.317-0.262,0.649-0.323,1.004h-0.777c-0.392,0-0.707,0.333-0.707,0.743C16.029,8.157,16.345,8.489,16.736,8.489z
+		 M21.329,5.965c0.974,0,1.764,0.798,1.764,1.782s-0.79,1.781-1.764,1.781c-0.973,0-1.763-0.797-1.763-1.781
+		S20.356,5.965,21.329,5.965z"/>
+	<path fill="#ECEDED" d="M17.813,18.829c1.258-1.122,1.532-2.998,0.895-4.785l-4.309,1.98l-1.26-1.434l2.481-4.078
+		c-1.682-0.855-3.569-0.799-4.829,0.323C9.461,12.022,9.214,14.054,10,15.928l-7.684,6.904c-0.484,0.685-0.396,1.712,0.257,2.456
+		c0.652,0.744,1.655,0.955,2.39,0.556l7.737-6.843C14.451,20.017,16.482,20.015,17.813,18.829z M5.249,24.548
+		c-0.441,0.393-1.162,0.299-1.61-0.21c-0.446-0.509-0.451-1.241-0.01-1.636c0.441-0.393,1.162-0.299,1.61,0.21
+		C5.687,23.422,5.69,24.153,5.249,24.548z"/>
+	<path fill="#ECEDED" d="M24.179,20.329c0,1.893-1.523,3.426-3.401,3.426H10.324l0.067,2.463h11.342
+		c2.701,0,4.891-2.205,4.891-4.926v-8.277l-2.445,0.068V20.329z"/>
+	<path fill="#ECEDED" d="M4.619,7.479c0-1.892,1.523-3.426,3.402-3.426h8.008V1.59H7.064c-2.7,0-4.891,2.206-4.891,4.926v11.493
+		h2.445V7.479z"/>
+</g>
+</svg>
diff --git a/calendar/templates/pixelegg/images/navbar.svg b/calendar/templates/pixelegg/images/navbar.svg
index c1b6a12434..46a586167d 100755
--- a/calendar/templates/pixelegg/images/navbar.svg
+++ b/calendar/templates/pixelegg/images/navbar.svg
@@ -2,25 +2,24 @@
 <!-- Generator: Adobe Illustrator 16.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <!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" ?>
-<?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
-	c-0.912,0-1.652-0.74-1.652-1.653V4.068h-6.613v2.479c0,0.913-0.739,1.653-1.652,1.653H8.545c-0.913,0-1.653-0.74-1.653-1.653V4.068
-	H6.066c-0.913,0-1.653,0.74-1.653,1.653v9.482c0.458-0.1,0.932-0.156,1.419-0.156c0.361,0,0.715,0.037,1.061,0.094v-0.328h4.959
-	v4.123c0.377,0.83,0.593,1.752,0.593,2.725c0,1.852-0.764,3.523-1.991,4.725H24.25c0.913,0,1.653-0.74,1.653-1.654V5.721
-	C25.903,4.808,25.163,4.068,24.25,4.068z M11.851,13.987H6.892V9.854h4.959V13.987z M17.637,23.904h-4.959v-4.133h4.959V23.904z
-	 M17.637,18.945h-4.959v-4.132h4.959V18.945z M17.637,13.987h-4.959V9.854h4.959V13.987z M23.423,23.904h-4.959v-4.133h4.959V23.904
-	z M23.423,18.945h-4.959v-4.132h4.959V18.945z M23.423,13.987h-4.959V9.854h4.959V13.987z"/>
-<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M19.291,3.242c0-0.913,0.74-1.653,1.653-1.653
-	s1.652,0.74,1.652,1.653v2.479c0,0.913-0.739,1.653-1.652,1.653s-1.653-0.74-1.653-1.653V3.242z"/>
-<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M7.719,3.242c0-0.913,0.74-1.653,1.652-1.653
-	c0.913,0,1.653,0.74,1.653,1.653v2.479c0,0.913-0.74,1.653-1.653,1.653c-0.912,0-1.652-0.74-1.652-1.653V3.242z"/>
-<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M6.066,16.473c-2.735,0-4.953,2.217-4.953,4.953
-	c0,2.734,2.218,4.951,4.953,4.951c2.734,0,4.952-2.217,4.952-4.951C11.018,18.689,8.8,16.473,6.066,16.473z M9.097,21.033
-	l-3.17,2.643c-0.106,0.088-0.234,0.141-0.368,0.176c-0.083,0.027-0.166,0.043-0.251,0.041c-0.234,0.004-0.47-0.068-0.648-0.217
-	c-0.128-0.105-0.192-0.238-0.228-0.375l-0.647-0.646c-0.284-0.285-0.284-0.746,0-1.031c0.284-0.283,0.746-0.283,1.03,0l0.472,0.473
-	l2.542-2.117c0.351-0.293,0.919-0.293,1.269,0C9.447,20.27,9.447,20.742,9.097,21.033z"/>
+<g>
+	<path fill-rule="evenodd" clip-rule="evenodd" fill="#ECEDED" d="M18.804,8.086c0.888,0,1.607-0.721,1.607-1.608V4.067
+		c0-0.89-0.72-1.609-1.607-1.609c-0.89,0-1.608,0.72-1.608,1.609v2.411C17.196,7.366,17.915,8.086,18.804,8.086z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" fill="#ECEDED" d="M9.259,8.086c0.891,0,1.609-0.721,1.609-1.608V4.067
+		c0-0.89-0.719-1.609-1.609-1.609c-0.887,0-1.606,0.72-1.606,1.609v2.411C7.653,7.366,8.373,8.086,9.259,8.086z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" fill="#ECEDED" d="M8.807,20.488c0,2.689,2.262,2.871,3.104,2.871
+		c1.799,0,3.044-1.15,3.044-2.775c0-1.467-1.032-1.916-1.345-2.002v-0.023c0.502-0.217,1.067-0.764,1.067-1.637
+		c0-1.818-1.572-2.4-2.767-2.4c-2.011,0-2.954,1.15-2.954,2.763h1.634c0-0.305,0-1.406,1.206-1.406c0.969,0,1.12,0.787,1.12,1.102
+		c0,1.117-0.969,1.168-1.497,1.168h-0.275v1.211c0.816,0,2,0.049,2,1.225c0,0.957-0.618,1.418-1.321,1.418
+		c-1.183,0-1.309-1.043-1.309-1.504l0.014-0.01H8.807z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" fill="#ECEDED" d="M22.066,4.874h-0.642v2.582c0,0.965-0.781,1.748-1.746,1.748
+		h-1.749c-0.965,0-1.747-0.783-1.747-1.748V4.874h-4.3v2.582c0,0.965-0.781,1.748-1.747,1.748H8.387
+		c-0.966,0-1.747-0.783-1.747-1.748V4.874H5.998c-2.001,0-3.619,1.622-3.619,3.616v0.003v14.466c0,1.996,1.618,3.615,3.619,3.615
+		h16.068c1.997,0,3.62-1.619,3.62-3.615V8.493V8.49C25.686,6.496,24.063,4.874,22.066,4.874z M23.255,22.895
+		c0,0.596-0.482,1.084-1.081,1.084H6.041c-0.598,0-1.084-0.488-1.084-1.084v-9.343h18.299V22.895z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" fill="#ECEDED" d="M17.497,23.129h1.761v-8.607h-1.446
+		c-0.036,0.643-0.489,1.492-2.185,1.492h-0.253v1.188h2.123V23.129z"/>
+</g>
 </svg>
diff --git a/etemplate/templates/pixelegg/images/navbar.svg b/etemplate/templates/pixelegg/images/navbar.svg
index d218d2ddcd..d55f592aa5 100755
--- a/etemplate/templates/pixelegg/images/navbar.svg
+++ b/etemplate/templates/pixelegg/images/navbar.svg
@@ -2,29 +2,21 @@
 <!-- Generator: Adobe Illustrator 16.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <!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>
-	<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#ECEDED" points="18.37,7.888 12.636,9.116 12.983,10.769 18.719,9.539 	
-		"/>
-	<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#ECEDED" points="5.996,17.552 6.343,19.196 12.014,17.981 11.667,16.337 	
-		"/>
-	<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#ECEDED" points="10.975,13.052 5.304,14.267 5.65,15.913 11.321,14.697 	
-		"/>
-	<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#ECEDED" points="10.282,9.769 4.611,10.982 4.958,12.629 10.629,11.413 	
-		"/>
-	<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#ECEDED" points="19.065,11.191 13.331,12.42 13.681,14.071 19.415,12.843 
-			"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#ECEDED" d="M-0.001-0.001v28.348h28.348V-0.001H-0.001z M1.797,7.259
-		C1.686,6.732,2.015,6.215,2.533,6.105L18.31,2.724c0.518-0.111,1.027,0.226,1.139,0.752l0.206,0.982L2.004,8.241L1.797,7.259z
-		 M4.707,20.255L2.452,9.562l17.421-3.732l1.505,7.135c0,0,0.476,2.259,0.762,3.611c0.046,0.344,0.012,1.015-0.83,1.184
-		c-1.715,0.318-4.946,0.918-4.946,0.918L5.831,21.002C5.321,21.112,4.816,20.777,4.707,20.255z M26.568,20.961c0,0,0,2.31,0,3.692
-		c-0.026,0.346-0.2,0.994-1.078,0.982c-1.776-0.048-5.128-0.139-5.128-0.139L9.363,25.565c-0.533,0-0.965-0.434-0.965-0.967v-2.502
-		c0.04-0.006,0.081-0.005,0.121-0.014l14.746-3.16c0.905-0.193,1.482-1.09,1.29-2.002l-0.686-3.254h2.698V20.961z M26.568,12.28
-		h-2.99l-0.417-1.979h2.441c0.533,0,0.966,0.436,0.966,0.975V12.28z"/>
-	<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#ECEDED" points="19.763,14.495 14.028,15.724 14.377,17.376 
-		20.112,16.146 	"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" fill="#ECEDED" d="M19.592,3.21c-0.111-0.525-0.621-0.862-1.139-0.752L2.677,5.839
+		C2.159,5.949,1.83,6.466,1.941,6.993l0.207,0.981l17.65-3.782L19.592,3.21z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" fill="#ECEDED" d="M24.7,16.654c0.192,0.912-0.385,1.809-1.29,2.002L8.664,21.817
+		c-0.04,0.009-0.081,0.007-0.121,0.014v2.501c0,0.534,0.432,0.968,0.965,0.968l10.999-0.069c0,0,3.352,0.092,5.128,0.139
+		c0.878,0.013,1.052-0.636,1.078-0.982c0-1.383,0-3.691,0-3.691v-7.294h-2.698L24.7,16.654z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" fill="#ECEDED" d="M25.747,10.036h-2.441l0.417,1.979h2.99V11.01
+		C26.712,10.472,26.28,10.036,25.747,10.036z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" fill="#ECEDED" d="M21.454,17.492c0.842-0.168,0.876-0.839,0.83-1.184
+		c-0.286-1.352-0.762-3.611-0.762-3.611l-1.505-7.134L2.596,9.296l2.255,10.692c0.109,0.523,0.614,0.857,1.124,0.748l10.532-2.326
+		C16.507,18.41,19.739,17.811,21.454,17.492z M4.755,10.717l5.671-1.215l0.347,1.645l-5.671,1.217L4.755,10.717z M5.794,15.646
+		l-0.347-1.646l5.671-1.215l0.347,1.646L5.794,15.646z M6.487,18.931L6.14,17.286l5.671-1.216l0.347,1.646L6.487,18.931z
+		 M12.78,8.85l5.734-1.228l0.349,1.651l-5.735,1.229L12.78,8.85z M13.475,12.154l5.734-1.229l0.35,1.65l-5.734,1.229L13.475,12.154z
+		 M14.172,15.457l5.734-1.229l0.35,1.652l-5.735,1.229L14.172,15.457z"/>
 </g>
 </svg>
diff --git a/filemanager/templates/pixelegg/images/navbar.svg b/filemanager/templates/pixelegg/images/navbar.svg
index f2e5b34217..fb9d1b11c1 100755
--- a/filemanager/templates/pixelegg/images/navbar.svg
+++ b/filemanager/templates/pixelegg/images/navbar.svg
@@ -2,19 +2,18 @@
 <!-- Generator: Adobe Illustrator 16.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <!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" ?>
-<?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">
+<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>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#ECEDED" d="M0,0v28.347h28.348V0H0z M14.135,2.813v1.603h11.22l-0.802,4.007
-		H3.717l-0.802-5.61H14.135z M21.747,26.146c-2.485,0-4.501-2.015-4.501-4.501s2.016-4.502,4.501-4.502
-		c2.486,0,4.502,2.016,4.502,4.502S24.233,26.146,21.747,26.146z M24.582,16.346c-0.844-0.452-1.81-0.71-2.835-0.71
-		c-3.318,0-6.01,2.689-6.01,6.01c0,0.703,0.127,1.376,0.35,2.003H6.121L1.312,9.224h25.645L24.582,16.346z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#ECEDED" d="M23.351,20.329l-2.311,1.926l-0.43-0.429
-		c-0.259-0.258-0.678-0.258-0.936,0c-0.258,0.259-0.258,0.677,0,0.936l0.589,0.589c0.031,0.123,0.089,0.244,0.205,0.34
-		c0.163,0.137,0.378,0.2,0.591,0.197c0.077,0.002,0.152-0.012,0.228-0.037c0.121-0.031,0.238-0.079,0.335-0.16l2.882-2.4
-		c0.316-0.266,0.316-0.695,0-0.961C24.185,20.065,23.669,20.065,23.351,20.329z"/>
+	<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#ECEDED" points="24.45,8.459 25.252,4.452 14.032,4.452 14.032,2.849 
+		2.812,2.849 3.614,8.459 	"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" fill="#ECEDED" d="M21.645,15.672c1.025,0,1.991,0.258,2.835,0.71l2.375-7.122H1.21
+		l4.809,14.425h9.966c-0.223-0.627-0.35-1.3-0.35-2.003C15.635,18.361,18.326,15.672,21.645,15.672z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" fill="#ECEDED" d="M21.645,17.18c-2.485,0-4.501,2.016-4.501,4.502
+		s2.016,4.501,4.501,4.501c2.486,0,4.502-2.015,4.502-4.501S24.131,17.18,21.645,17.18z M24.401,21.326l-2.882,2.4
+		c-0.097,0.081-0.214,0.129-0.335,0.16c-0.075,0.025-0.15,0.039-0.228,0.037c-0.213,0.003-0.428-0.061-0.591-0.197
+		c-0.116-0.096-0.174-0.217-0.205-0.34l-0.589-0.589c-0.258-0.259-0.258-0.677,0-0.936c0.258-0.258,0.677-0.258,0.936,0l0.43,0.429
+		l2.311-1.926c0.318-0.264,0.834-0.264,1.153,0C24.718,20.631,24.718,21.061,24.401,21.326z"/>
 </g>
 </svg>
diff --git a/importexport/templates/pixelegg/images/navbar.svg b/importexport/templates/pixelegg/images/navbar.svg
new file mode 100755
index 0000000000..dc4c286837
--- /dev/null
+++ b/importexport/templates/pixelegg/images/navbar.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!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" ?>
+<svg version="1.1" id="importexport_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>
+	<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#ECEDED" points="23.106,10.853 26.518,8.239 23.106,5.624 23.106,5.624 
+		23.105,5.624 17.985,1.702 17.985,5.624 7.746,5.624 7.746,10.854 17.985,10.854 17.985,14.775 23.105,10.854 23.106,10.854 	"/>
+	<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#ECEDED" points="10.648,13.032 5.528,16.954 5.527,16.954 5.527,16.954 
+		2.115,19.569 5.527,22.184 5.527,22.184 5.528,22.184 10.648,26.105 10.648,22.184 20.887,22.184 20.887,16.954 10.648,16.954 	"/>
+</g>
+</svg>
diff --git a/infolog/templates/pixelegg/app.css b/infolog/templates/pixelegg/app.css
index 9e0d541f15..54f051764d 100755
--- a/infolog/templates/pixelegg/app.css
+++ b/infolog/templates/pixelegg/app.css
@@ -11,7 +11,7 @@
  * @package infolog
  * @version $Id$
  */
-/* $Id: app.css 44607 2013-11-19 22:02:37Z ralfbecker $ */
+/* $Id: app.css 45124 2014-01-14 13:48:11Z nathangray $ */
 .infolog_headertext {
   color: black;
   font-size: 120%;
@@ -65,6 +65,9 @@ table.infolog_fullWidth {
 td.infolog_infoId:before {
   content: "#";
 }
+#infolog-edit_info_contact {
+  width: 98%;
+}
 .infolog_fixedHeight {
   height: 12px;
 }
diff --git a/infolog/templates/pixelegg/images/done.svg b/infolog/templates/pixelegg/images/done.svg
index 4252c2a87c..dbdc2126a0 100755
--- a/infolog/templates/pixelegg/images/done.svg
+++ b/infolog/templates/pixelegg/images/done.svg
@@ -2,8 +2,6 @@
 <!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <!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 09141ecd1f..a925faee28 100755
--- a/infolog/templates/pixelegg/images/email.svg
+++ b/infolog/templates/pixelegg/images/email.svg
@@ -2,8 +2,6 @@
 <!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <!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 79a4c5529d..63e8cfca18 100755
--- a/infolog/templates/pixelegg/images/navbar.svg
+++ b/infolog/templates/pixelegg/images/navbar.svg
@@ -2,9 +2,6 @@
 <!-- Generator: Adobe Illustrator 16.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <!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" ?>
-<?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 4630046c73..6b6b2cc40f 100755
--- a/infolog/templates/pixelegg/images/not-started.svg
+++ b/infolog/templates/pixelegg/images/not-started.svg
@@ -2,8 +2,6 @@
 <!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <!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 5b5b8e77f6..eec57a0bf2 100755
--- a/infolog/templates/pixelegg/images/note.svg
+++ b/infolog/templates/pixelegg/images/note.svg
@@ -2,8 +2,6 @@
 <!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <!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 010de12399..1addd81b7a 100755
--- a/infolog/templates/pixelegg/images/phone.svg
+++ b/infolog/templates/pixelegg/images/phone.svg
@@ -2,8 +2,6 @@
 <!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <!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 2e6e8fa6d7..3bfb50ec1e 100755
--- a/infolog/templates/pixelegg/images/task.svg
+++ b/infolog/templates/pixelegg/images/task.svg
@@ -2,8 +2,6 @@
 <!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <!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/app.css b/mail/templates/pixelegg/app.css
index 6f02b61a1b..6dfeab026c 100755
--- a/mail/templates/pixelegg/app.css
+++ b/mail/templates/pixelegg/app.css
@@ -1,6 +1,8 @@
 /**
  * EGroupware: CSS with less preprocessor
  *
+ * Mail
+ * 
  * Please do NOT change app.css directly, instead change app.less and compile it!
  *
  * @link http://www.egroupware.org
@@ -594,7 +596,18 @@ div#mail-index div#mail-index_nm div.nextmatch_header div.filters input#mail-ind
   /*height: 20px !important;*/
 }
 div#mail-index div#mail-index_nm tr.mail td img {
-  height: 16px;
+  height: 12px;
+  -webkit-box-shadow: 0px 0px 0px rgba(0, 0, 0, 0);
+  -moz-box-shadow: 0px 0px 0px rgba(0, 0, 0, 0);
+  box-shadow: 0px 0px 0px rgba(0, 0, 0, 0);
+  border: 0px solid rgba(0, 0, 0, 0.9);
+}
+div#mail-index div#mail-index_nm tr.mail div span {
+  height: 12px;
+  -webkit-box-shadow: 0px 0px 0px rgba(0, 0, 0, 0);
+  -moz-box-shadow: 0px 0px 0px rgba(0, 0, 0, 0);
+  box-shadow: 0px 0px 0px rgba(0, 0, 0, 0);
+  display: table-cell;
 }
 div#mail-index div.splitter-bar,
 div#mail-index div.splitter-bar-horizontal {
@@ -1642,8 +1655,8 @@ div.mailPreviewHeaders div.mail_extraEmails img.et2_button_icon {
 }
 /* Button after field*/
 #mail-index_mailPreviewHeadersAttachments img.et2_button_icon {
-  width: 24px;
-  height: 24px;
+  width: 12px;
+  height: 12px;
 }
 .mailDisplayContainer,
 .mailDisplayAttachments {
diff --git a/mail/templates/pixelegg/app.less b/mail/templates/pixelegg/app.less
index ec1b501b9f..ed5f917776 100755
--- a/mail/templates/pixelegg/app.less
+++ b/mail/templates/pixelegg/app.less
@@ -1,6 +1,8 @@
 /**
  * EGroupware: CSS with less preprocessor
  *
+ * Mail
+ * 
  * Please do NOT change app.css directly, instead change app.less and compile it!
  *
  * @link http://www.egroupware.org
@@ -13,6 +15,7 @@
 @import (reference) "../../../pixelegg/less/def_buttons.less";
 @import (reference) "../../../pixelegg/less/def_design_pattern_color_font_shadow.less";
 @import (less) "../default/app.css";
+
 #popupMainDiv{
 	padding: 5px;
 	.et2_grid{
@@ -108,7 +111,8 @@ div#mail-index{
             div {}
 
             // Bilder in den Listen
-            tr.mail td img {height: 16px;}
+            tr.mail td img {.dimension_height_xs;.box_shadow_none;.border_none;}
+            tr.mail div span {.dimension_height_xs;.box_shadow_none; display: table-cell; }
 
 
 
@@ -1302,7 +1306,7 @@ div.mailPreviewHeaders div.mail_extraEmails {
 #mail-index_mailPreviewHeadersAttachments{
     
     
-    img.et2_button_icon {.dimension_width_height_m;}
+    img.et2_button_icon {.dimension_width_height_xs;}
     
 }
 
diff --git a/mail/templates/pixelegg/images/navbar.svg b/mail/templates/pixelegg/images/navbar.svg
index 3c37ddb3f6..5ce8142435 100755
--- a/mail/templates/pixelegg/images/navbar.svg
+++ b/mail/templates/pixelegg/images/navbar.svg
@@ -2,21 +2,20 @@
 <!-- Generator: Adobe Illustrator 16.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <!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" ?>
-<?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>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#ECEDED" d="M17.771,22.017c0,0.654,0.348,1.129,1.043,1.129
-		c0.916,0,1.753-1.1,1.927-2.02l0.332-1.664c-0.158-0.06-0.427-0.119-0.79-0.119C18.892,19.343,17.771,20.576,17.771,22.017z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#ECEDED" d="M0-0.001v28.348h28.348V-0.001H0z M2.51,7.284l20.027-4.594
-		l0.431,1.877l-8.578,8.556L2.939,9.161L2.51,7.284z M21.894,23.948c-0.632,0-1.216-0.387-1.186-1.307h-0.046
-		c-0.554,0.876-1.28,1.307-2.228,1.307c-0.917,0-1.706-0.698-1.706-1.871c0-1.842,1.547-3.521,3.743-3.521
-		c0.663,0,1.279,0.134,1.691,0.312l-0.537,2.689c-0.238,1.129-0.048,1.647,0.473,1.662c0.806,0.03,1.707-0.994,1.707-2.703
-		c0-2.169-1.375-3.729-3.823-3.729c-2.575,0-4.739,1.932-4.739,4.947c0,2.48,1.722,4.025,4.06,4.025c0.9,0,1.738-0.178,2.386-0.52
-		l0.253,0.639c-0.869,0.431-1.753,0.594-2.812,0.594c-2.593,0-4.788-1.782-4.788-4.649c0-3.061,2.26-5.72,5.767-5.72
-		c2.749,0,4.582,1.828,4.582,4.309C24.69,22.642,23.362,23.948,21.894,23.948z M25.013,16.615c-1.302-1.387-3.146-2.259-5.197-2.259
-		c-3.2,0-5.909,2.109-6.812,5.014l-7.337,1.683l-2.44-9.841l11.45,3.961l8.578-8.556l2.44,9.841L25.013,16.615z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" fill="#ECEDED" d="M20.038,16.039c-3.507,0-5.767,2.659-5.767,5.72
+		c0,2.867,2.195,4.649,4.788,4.649c1.059,0,1.942-0.163,2.812-0.595l-0.253-0.639c-0.647,0.342-1.485,0.521-2.386,0.521
+		c-2.338,0-4.06-1.545-4.06-4.026c0-3.016,2.164-4.947,4.739-4.947c2.448,0,3.823,1.561,3.823,3.729
+		c0,1.708-0.901,2.733-1.707,2.703c-0.521-0.015-0.711-0.534-0.473-1.663l0.537-2.689c-0.412-0.178-1.028-0.312-1.691-0.312
+		c-2.196,0-3.743,1.68-3.743,3.521c0,1.174,0.789,1.871,1.706,1.871c0.947,0,1.674-0.43,2.228-1.307h0.046
+		c-0.03,0.921,0.554,1.307,1.186,1.307c1.469,0,2.797-1.307,2.797-3.535C24.62,17.866,22.787,16.039,20.038,16.039z M20.67,21.061
+		c-0.174,0.92-1.011,2.02-1.927,2.02c-0.695,0-1.043-0.476-1.043-1.129c0-1.44,1.121-2.674,2.512-2.674
+		c0.363,0,0.632,0.06,0.79,0.119L20.67,21.061z"/>
+	<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#ECEDED" points="22.897,4.501 22.467,2.624 2.439,7.218 2.869,9.095 
+		14.319,13.058 	"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" fill="#ECEDED" d="M23.185,6.551l-8.578,8.556l-11.45-3.961l2.44,9.842l7.337-1.684
+		c0.902-2.904,3.611-5.013,6.812-5.013c2.052,0,3.896,0.872,5.197,2.259l0.683-0.157L23.185,6.551z"/>
 </g>
 </svg>
diff --git a/notifications/templates/pixelegg/images/navbar.svg b/notifications/templates/pixelegg/images/navbar.svg
index 6efa1aec08..352b9872cf 100755
--- a/notifications/templates/pixelegg/images/navbar.svg
+++ b/notifications/templates/pixelegg/images/navbar.svg
@@ -2,25 +2,24 @@
 <!-- Generator: Adobe Illustrator 16.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <!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" ?>
-<?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">
+<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>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#ECEDED" d="M14.176,8.55c-3.822,0-6.921,3.1-6.921,6.922
-		s3.099,6.921,6.921,6.921c3.823,0,6.922-3.099,6.922-6.921S17.999,8.55,14.176,8.55z M16.875,12.713l-2.006,4.308
-		c-0.007,0.016-0.006,0.031-0.013,0.047c-0.207,0.43-0.724,0.611-1.154,0.406l-2.343-1.123c-0.431-0.207-0.612-0.723-0.405-1.154
-		c0.206-0.432,0.724-0.613,1.154-0.407l1.545,0.741l1.652-3.55c0.202-0.434,0.719-0.62,1.151-0.419
-		C16.891,11.765,17.077,12.279,16.875,12.713z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#ECEDED" d="M0,0v28.347h28.346V0H0z M14.176,1.622
-		c0.957,0,1.731,0.775,1.731,1.731c0,0.956-0.774,1.731-1.731,1.731c-0.956,0-1.73-0.775-1.73-1.731
-		C12.445,2.397,13.22,1.622,14.176,1.622z M4.15,3.192l2.036-1.364c0,0,2.125-0.892,3.097,0.891l1.023,1.619
-		C6.401,5.872,5.103,8.565,5.103,8.565L3.301,6.551C3.301,6.551,2.021,5.019,4.15,3.192z M23.519,25.442
-		c0.239,0.413,0.098,0.942-0.317,1.182c-0.413,0.239-0.942,0.098-1.183-0.316l-1.958-3.391c-1.618,1.287-3.659,2.062-5.885,2.062
-		c-2.267,0-4.346-0.802-5.979-2.132l-1.998,3.461c-0.24,0.414-0.77,0.556-1.183,0.316c-0.414-0.239-0.557-0.769-0.317-1.182
-		l2.225-3.853c-1.404-1.666-2.253-3.818-2.253-6.173c0-5.281,4.255-9.562,9.506-9.562c5.252,0,9.507,4.28,9.507,9.562
-		c0,2.398-0.884,4.586-2.334,6.264L23.519,25.442z M25.053,6.551L23.25,8.565c0,0-1.299-2.693-5.203-4.227l1.021-1.619
-		c0.973-1.783,3.097-0.891,3.097-0.891l2.036,1.364C26.33,5.019,25.053,6.551,25.053,6.551z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" fill="#ECEDED" d="M16.597,11.292c-0.433-0.202-0.949-0.016-1.151,0.418l-1.652,3.55
+		l-1.545-0.741c-0.431-0.205-0.948-0.023-1.154,0.408c-0.207,0.431-0.025,0.948,0.405,1.155l2.343,1.122
+		c0.431,0.206,0.947,0.024,1.154-0.406c0.007-0.015,0.006-0.031,0.013-0.046l2.006-4.309C17.217,12.009,17.03,11.495,16.597,11.292z
+		"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" fill="#ECEDED" d="M14.315,5.586c-5.251,0-9.506,4.281-9.506,9.562
+		c0,2.354,0.849,4.506,2.253,6.172l-2.225,3.853c-0.239,0.413-0.097,0.942,0.317,1.183c0.413,0.238,0.942,0.097,1.183-0.317
+		l1.998-3.461c1.634,1.331,3.713,2.132,5.979,2.132c2.226,0,4.267-0.773,5.885-2.062l1.958,3.391c0.24,0.414,0.77,0.556,1.183,0.317
+		c0.415-0.24,0.557-0.77,0.317-1.183l-2.17-3.761c1.45-1.679,2.334-3.865,2.334-6.264C23.822,9.867,19.567,5.586,14.315,5.586z
+		 M14.315,22.123c-3.822,0-6.921-3.098-6.921-6.92c0-3.823,3.099-6.922,6.921-6.922c3.823,0,6.922,3.099,6.922,6.922
+		C21.237,19.025,18.139,22.123,14.315,22.123z"/>
+	<circle fill-rule="evenodd" clip-rule="evenodd" fill="#ECEDED" cx="14.315" cy="3.083" r="1.731"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" fill="#ECEDED" d="M10.446,4.069L9.423,2.45C8.451,0.667,6.326,1.559,6.326,1.559
+		L4.29,2.923C2.161,4.75,3.44,6.282,3.44,6.282l1.802,2.014C5.242,8.295,6.541,5.602,10.446,4.069z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" fill="#ECEDED" d="M24.341,2.923l-2.036-1.364c0,0-2.124-0.892-3.097,0.891
+		l-1.021,1.619c3.904,1.533,5.203,4.227,5.203,4.227l1.803-2.014C25.192,6.282,26.47,4.75,24.341,2.923z"/>
 </g>
 </svg>
diff --git a/preferences/templates/pixelegg/app.css b/preferences/templates/pixelegg/app.css
index 392f0957aa..d9920a57cd 100755
--- a/preferences/templates/pixelegg/app.css
+++ b/preferences/templates/pixelegg/app.css
@@ -103,7 +103,7 @@ tr.prefRow > td {
   position: absolute;
   display: none;
   width: 98%;
-  background-color: #679fd2;
+  background-color: rgba(103, 159, 210, 0.1);
   padding: 5px;
   margin-top: 5px;
   border: 1px solid rgba(0, 0, 0, 0.15);
diff --git a/preferences/templates/pixelegg/images/navbar.svg b/preferences/templates/pixelegg/images/navbar.svg
index 8684c776d3..25a4d67789 100755
--- a/preferences/templates/pixelegg/images/navbar.svg
+++ b/preferences/templates/pixelegg/images/navbar.svg
@@ -2,46 +2,43 @@
 <!-- Generator: Adobe Illustrator 16.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <!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" ?>
-<?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">
+<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>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#ECEDED" d="M10.921,15.066c-1.777-0.476-3.604,0.578-4.08,2.355
-		s0.579,3.604,2.355,4.08c1.776,0.475,3.604-0.579,4.079-2.355C13.752,17.369,12.696,15.543,10.921,15.066z M11.132,18.572
-		c-0.159,0.592-0.769,0.943-1.36,0.785c-0.593-0.16-0.943-0.769-0.785-1.361c0.158-0.592,0.767-0.943,1.359-0.784
-		C10.939,17.371,11.29,17.979,11.132,18.572z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#ECEDED" d="M20.145,9.848c1.243,0.332,2.522-0.406,2.854-1.649
-		c0.335-1.244-0.403-2.523-1.647-2.856s-2.522,0.405-2.855,1.648C18.163,8.235,18.901,9.514,20.145,9.848z M19.997,7.394
-		c0.111-0.415,0.538-0.661,0.951-0.55c0.416,0.111,0.661,0.537,0.551,0.952c-0.112,0.415-0.537,0.661-0.951,0.55
-		C20.132,8.234,19.887,7.809,19.997,7.394z"/>
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#ECEDED" d="M0.001,0v28.348h28.346V0H0.001z M15.017,6.461l0.201-0.75
-		c0.112-0.416,0.538-0.661,0.953-0.55l0.909,0.244c0.171-0.286,0.371-0.549,0.599-0.783l-0.502-0.869
-		c-0.216-0.374-0.088-0.852,0.286-1.067l0.677-0.391c0.372-0.215,0.852-0.087,1.067,0.286l0.501,0.869
-		c0.316-0.08,0.645-0.122,0.978-0.126l0.244-0.91c0.11-0.414,0.537-0.66,0.951-0.55l0.751,0.202c0.414,0.111,0.66,0.537,0.55,0.952
-		l-0.244,0.91c0.275,0.165,0.531,0.355,0.759,0.573l0.847-0.489c0.373-0.216,0.851-0.087,1.066,0.286l0.392,0.677
-		c0.216,0.373,0.087,0.851-0.286,1.066l-0.833,0.48c0.087,0.327,0.132,0.666,0.137,1.011l0.91,0.244
-		c0.414,0.111,0.661,0.538,0.55,0.952l-0.201,0.75c-0.111,0.415-0.538,0.661-0.951,0.549l-0.911-0.243
-		c-0.17,0.286-0.369,0.549-0.598,0.783l0.467,0.81c0.216,0.373,0.089,0.852-0.286,1.067l-0.676,0.391
-		c-0.374,0.216-0.852,0.087-1.068-0.286l-0.466-0.81c-0.317,0.08-0.646,0.122-0.978,0.127l-0.244,0.909
-		c-0.11,0.415-0.537,0.661-0.952,0.55l-0.751-0.201c-0.413-0.11-0.659-0.537-0.548-0.951l0.243-0.911
-		c-0.297-0.176-0.567-0.385-0.809-0.623l-0.831,0.48c-0.374,0.215-0.852,0.088-1.067-0.286l-0.391-0.677
-		c-0.216-0.374-0.087-0.852,0.285-1.066l0.848-0.489c-0.075-0.306-0.111-0.623-0.117-0.943l-0.909-0.244
-		C15.153,7.302,14.906,6.876,15.017,6.461z M1.836,6.772c0-2.725,2.209-4.934,4.934-4.934h8.223v2.467H7.734
-		c-1.896,0-3.432,1.537-3.432,3.432v4.791H1.836V6.772z M15.11,23.688c0.309,0.533,0.126,1.216-0.408,1.524l-0.966,0.558
-		c-0.534,0.309-1.218,0.125-1.524-0.408l-0.668-1.156c-0.453,0.114-0.921,0.174-1.396,0.181l-0.348,1.3
-		c-0.159,0.592-0.768,0.944-1.36,0.785l-1.072-0.287c-0.593-0.159-0.943-0.768-0.786-1.359l0.349-1.301
-		c-0.423-0.253-0.81-0.551-1.152-0.891l-1.188,0.686c-0.534,0.309-1.216,0.125-1.525-0.408l-0.558-0.967
-		c-0.309-0.533-0.126-1.216,0.409-1.524l1.208-0.698c-0.106-0.438-0.159-0.889-0.165-1.348l-1.301-0.348
-		c-0.593-0.159-0.944-0.768-0.786-1.359l0.288-1.073c0.159-0.592,0.768-0.944,1.359-0.784l1.3,0.348
-		c0.244-0.408,0.529-0.784,0.854-1.119l-0.717-1.24c-0.307-0.534-0.125-1.217,0.41-1.525l0.966-0.558
-		c0.533-0.309,1.217-0.126,1.524,0.409l0.717,1.24c0.451-0.114,0.92-0.174,1.396-0.181l0.349-1.3
-		c0.159-0.592,0.767-0.944,1.359-0.785l1.073,0.287c0.592,0.158,0.943,0.768,0.784,1.359l-0.348,1.301
-		c0.395,0.234,0.758,0.508,1.084,0.817l1.209-0.698c0.534-0.308,1.216-0.125,1.524,0.408l0.558,0.968
-		c0.309,0.534,0.125,1.216-0.408,1.524l-1.188,0.686c0.121,0.468,0.188,0.952,0.194,1.445l1.301,0.348
-		c0.591,0.159,0.942,0.768,0.784,1.359l-0.288,1.073c-0.157,0.593-0.767,0.944-1.359,0.784l-1.301-0.348
-		c-0.243,0.408-0.528,0.784-0.854,1.119L15.11,23.688z M26.504,21.573c0,2.725-2.209,4.934-4.934,4.934h-5.003l0.069-2.467h3.969
-		c1.896,0,3.432-1.537,3.432-3.433v-6.436l2.467,0.068V21.573z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" fill="#ECEDED" d="M16.745,21.49c0.593,0.16,1.202-0.191,1.359-0.784l0.288-1.073
+		c0.158-0.592-0.193-1.2-0.784-1.359l-1.301-0.348c-0.007-0.493-0.073-0.978-0.194-1.445l1.188-0.686
+		c0.533-0.309,0.717-0.99,0.408-1.524l-0.558-0.968c-0.309-0.533-0.99-0.716-1.524-0.408l-1.209,0.698
+		c-0.326-0.31-0.689-0.583-1.084-0.817l0.348-1.301c0.159-0.592-0.192-1.201-0.784-1.359l-1.073-0.287
+		c-0.593-0.159-1.2,0.193-1.359,0.785l-0.349,1.3C9.64,11.92,9.171,11.979,8.72,12.094l-0.717-1.24
+		c-0.308-0.535-0.991-0.718-1.524-0.409l-0.966,0.558c-0.535,0.309-0.717,0.991-0.41,1.525l0.717,1.24
+		c-0.325,0.335-0.61,0.711-0.854,1.119l-1.3-0.348c-0.592-0.16-1.2,0.192-1.359,0.784l-0.288,1.073
+		c-0.158,0.592,0.193,1.2,0.786,1.359l1.301,0.348c0.006,0.459,0.059,0.91,0.165,1.348l-1.208,0.698
+		c-0.535,0.309-0.718,0.991-0.409,1.524l0.558,0.967c0.31,0.533,0.991,0.717,1.525,0.408l1.188-0.686
+		c0.343,0.34,0.729,0.638,1.152,0.891l-0.349,1.301c-0.157,0.592,0.193,1.2,0.786,1.359l1.072,0.287
+		c0.593,0.159,1.201-0.193,1.36-0.785l0.348-1.3c0.476-0.007,0.943-0.066,1.396-0.181l0.668,1.156
+		c0.307,0.533,0.99,0.717,1.524,0.408l0.966-0.558c0.534-0.309,0.717-0.991,0.408-1.524l-0.667-1.156
+		c0.325-0.335,0.61-0.711,0.854-1.119L16.745,21.49z M13.422,18.877c-0.476,1.776-2.303,2.83-4.079,2.355
+		c-1.776-0.477-2.832-2.303-2.355-4.08s2.303-2.831,4.08-2.355C12.843,15.273,13.899,17.1,13.422,18.877z"/>
+	<circle fill-rule="evenodd" clip-rule="evenodd" fill="#ECEDED" cx="10.206" cy="18.015" r="1.111"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" fill="#ECEDED" d="M15.714,7.145l0.909,0.244c0.006,0.32,0.042,0.637,0.117,0.942
+		L15.893,8.82c-0.372,0.215-0.501,0.692-0.285,1.066l0.391,0.677c0.216,0.374,0.693,0.501,1.067,0.286l0.831-0.48
+		c0.241,0.238,0.512,0.447,0.809,0.623l-0.243,0.911c-0.111,0.414,0.135,0.841,0.548,0.951l0.751,0.201
+		c0.415,0.111,0.842-0.135,0.952-0.55l0.244-0.909c0.332-0.005,0.66-0.047,0.978-0.127l0.466,0.81
+		c0.217,0.373,0.694,0.502,1.068,0.286l0.676-0.391c0.375-0.216,0.502-0.694,0.286-1.067l-0.467-0.81
+		c0.229-0.234,0.428-0.497,0.598-0.783l0.911,0.243c0.413,0.112,0.84-0.134,0.951-0.549l0.201-0.75
+		c0.111-0.414-0.136-0.841-0.55-0.952l-0.91-0.244c-0.005-0.345-0.05-0.684-0.137-1.011l0.833-0.48
+		c0.373-0.216,0.502-0.693,0.286-1.066l-0.392-0.678c-0.216-0.373-0.693-0.501-1.066-0.285L23.843,4.23
+		c-0.228-0.217-0.483-0.408-0.759-0.572l0.244-0.91c0.11-0.415-0.136-0.841-0.55-0.952l-0.751-0.201
+		c-0.414-0.11-0.841,0.136-0.951,0.55l-0.244,0.91C20.5,3.06,20.171,3.101,19.855,3.181l-0.501-0.868
+		c-0.216-0.374-0.695-0.502-1.067-0.286L17.61,2.417c-0.374,0.216-0.502,0.693-0.286,1.067l0.502,0.868
+		c-0.228,0.234-0.428,0.497-0.599,0.783l-0.909-0.244c-0.415-0.11-0.841,0.135-0.953,0.551l-0.201,0.75
+		C15.053,6.606,15.3,7.033,15.714,7.145z M18.643,6.722c0.333-1.243,1.611-1.981,2.855-1.648s1.982,1.612,1.647,2.856
+		c-0.332,1.242-1.611,1.98-2.854,1.648C19.048,9.244,18.31,7.966,18.643,6.722z"/>
+	<circle fill-rule="evenodd" clip-rule="evenodd" fill="#ECEDED" cx="20.895" cy="7.326" r="0.777"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" fill="#ECEDED" d="M4.45,7.468c0-1.896,1.536-3.432,3.432-3.432h7.258V1.569H6.917
+		c-2.725,0-4.934,2.209-4.934,4.934v5.755H4.45V7.468z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" fill="#ECEDED" d="M24.184,13.902v6.436c0,1.896-1.536,3.433-3.432,3.433h-3.969
+		l-0.069,2.467h5.003c2.725,0,4.934-2.209,4.934-4.934v-7.333L24.184,13.902z"/>
 </g>
 </svg>
diff --git a/resources/templates/pixelegg/images/navbar.svg b/resources/templates/pixelegg/images/navbar.svg
index 85adb11490..dd5fae9fe5 100755
--- a/resources/templates/pixelegg/images/navbar.svg
+++ b/resources/templates/pixelegg/images/navbar.svg
@@ -2,8 +2,6 @@
 <!-- Generator: Adobe Illustrator 16.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <!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>