diff --git a/filemanager/templates/jerryr/images/navbar.png b/filemanager/templates/jerryr/images/navbar.png
index 419e8d4193..9fcb386695 100644
Binary files a/filemanager/templates/jerryr/images/navbar.png and b/filemanager/templates/jerryr/images/navbar.png differ
diff --git a/infolog/templates/jerryr/images/navbar.png b/infolog/templates/jerryr/images/navbar.png
index 7620d20f04..9846fd8903 100755
Binary files a/infolog/templates/jerryr/images/navbar.png and b/infolog/templates/jerryr/images/navbar.png differ
diff --git a/phpgwapi/templates/jerryr/css/jerryr.css b/phpgwapi/templates/jerryr/css/jerryr.css
index c131b601d4..30d36fad7a 100644
--- a/phpgwapi/templates/jerryr/css/jerryr.css
+++ b/phpgwapi/templates/jerryr/css/jerryr.css
@@ -22,6 +22,7 @@ body
 	font-size: 11px; 
 	font-family: Verdana, Arial, Helvetica, sans-serif;
 	padding:0px;
+	margin-top: 5px;
 }
 
 img
@@ -69,7 +70,7 @@ input,button
 input[type=submit],input[type=button],button
 {
 	margin:1px;
-	padding:1px;
+	padding:0px;
 	cursor: pointer; 
 	cursor: hand;
 }
@@ -92,7 +93,7 @@ td
 {
 	font-size: 11px;
 	/*	padding-top:1px;
-	padding-bottom:1px;*/
+	padding-bottom:0px;*/
 }
 
 .divLoginbox 
@@ -117,10 +118,10 @@ td
 {
 	position:relative;
 	width: 147px; 
-	border-right: #006699 groove; 
-	border-top: #006699 groove; 
-	border-left: #006699 groove; 
-	border-bottom: #006699 groove;
+	border-right: #9c9c9c 1px solid; 
+	border-top: #9c9c9c 1px solid; 
+	border-left: #9c9c9c 1px solid; 
+	border-bottom: #9c9c9c 1px solid
 }
 
 .divSideboxHeader 
@@ -129,8 +130,8 @@ td
 	background-image:url(../images/divSideboxHeader-background.png);
 	height:18px;
 	background-color:#ffffff;
-	padding-top:2px;
-	border-bottom: #006699 groove;
+	padding-top:1px;
+	border-bottom: #9c9c9c 1px solid
 	font-size:10px;
 	font-weight:bold;
 	color:#ffffff;
@@ -147,8 +148,8 @@ a.appTitles,.appTitles
 {
 	font-size: 10px; 
 	height:16px;
-	padding-top:1px;
-	padding-bottom:1px;
+	padding-top:0px;
+	padding-bottom:0px;
 }
 
 a.textSidebox
@@ -164,7 +165,7 @@ a.textSidebox
 	font-size: 10px; 
 	height:16px;
 	padding-top:1px;
-	padding-bottom:2px;
+	padding-bottom:1px;
 	
 }
 
@@ -217,14 +218,15 @@ a.textSidebox
 #divLogo
 {
 	position:absolute;
-	left:10px;
-	top:10px;
+	left:15px;
+	top:13px;
 	z-index:51;
 }
 
 #divAppIconBar
 {
 	background-color:white;
+	padding=0px;
 	border-top-color:#9c9c9c;
 	border-top-width:1px;
 	border-top-style:solid;
@@ -242,7 +244,7 @@ a.textSidebox
 	background-color:white;
 	height:15px;
 	padding-left:175px;
-	margin-top: 5px;
+	margin-top: 1px;
 	/*	margin-bottom: 2px;*/
 }
 
@@ -262,8 +264,8 @@ a.textSidebox
 {
 	background-color:white;
 	padding-left:5px;
-	padding-right:5px;
-	padding-bottom:5px;
+	padding-right:0px;
+	padding-bottom:2px;
 	width: 100%;
 }
 #divSideboxContainer
@@ -298,25 +300,26 @@ a.textSidebox
 	border-left-width:1px;
 	border-left-style:solid;
 	border-right-color:#9c9c9c;
-	border-right-width:2px;
+	border-right-width:1px;
 	border-right-style:solid;
 	border-bottom-color:#9c9c9c;
-	border-bottom-style:groove;
+	border-bottom-width:1px;
+	border-bottom-style:solid;
 }
 
 #divAppbox
 {
 /*	width:100%;*/
-	background-color:#faf8f3;
+	background-color:#f4f2ed;
 	padding:5px;
 	border-bottom-color:#9c9c9c;
-	border-bottom-width:2px;
+	border-bottom-width:1px;
 	border-bottom-style:solid;
 	border-left-color:#9c9c9c;
 	border-left-width:1px;
 	border-left-style:solid;
 	border-right-color:#9c9c9c;
-	border-right-width:2px;
+	border-right-width:1px;
 	border-right-style:solid;
 }
 
@@ -360,10 +363,10 @@ a.textSidebox
 	margin-left:4px;
 	padding:5px;
 	position:relative;
-	border-right: #cccccc 1px solid; 
+	border-right: #9c9c9c 1px solid; 
 	border-top: #9c9c9c 2px solid; 
 	border-left: #9c9c9c 2px solid; 
-	border-bottom: #cccccc 1px solid
+	border-bottom: #9c9c9c 1px solid
 }
 
 #user_info
@@ -396,6 +399,13 @@ a.textSidebox
 	width:99%;
 }
 
+.calRowBottomShadow
+{
+	background-image: url(../images/mid-foot.png); 
+	background-repeat: repeat-x;
+}
+
+
 .titleBarBackGround
 {
 	background-image: url(../images/appbox-header-background.png); 
@@ -416,6 +426,126 @@ a.textSidebox
 	border-bottom-style:solid;
 }
 
+.calDayTitleBlue
+{
+	background-image: url(../images/mid-title.png); 
+	background-repeat: repeat-x;
+	height:28px;
+	text-align:center;
+	padding-bottom:0px;
+	font-size:14px;
+	font-weight:bold;
+	color:#ffffff;
+}
+
+.calDayTitleRed
+{
+	background-image: url(../images/mid-title-red.png); 
+	background-repeat: repeat-x;
+	height:28px;
+	text-align:center;
+	padding-bottom:0px;
+	font-size:14px;
+	font-weight:bold;
+	color:#ffffff;
+}
+
+.calLeftShadow
+{
+	background-image: url(../images/lt-body.png); 
+	padding-bottom:0px;
+}
+
+.calRightShadow
+{
+	background-image: url(../images/rt-body.png); 
+	padding-bottom:0px;
+}
+
+.calLtLtTitleBlue
+{
+	background-image: url(../images/lt-lt-title.png); 
+	padding-bottom:0px;
+	height:28px;
+}
+
+.calLtMidTitleBlue
+{
+	background-image: url(../images/lt-mid-title.png); 
+	padding-bottom:0px;
+	height:28px;
+}
+
+.calRtMidTitleBlue
+{
+	background-image: url(../images/rt-mid-title.png); 
+	padding-bottom:0px;
+	height:28px;
+}
+
+.calRtRtTitleBlue
+{
+	background-image: url(../images/rt-rt-title.png); 
+	padding-bottom:0px;
+	height:28px;
+}
+
+.calLtLtTitleRed
+{
+	background-image: url(../images/lt-lt-title-red.png); 
+	padding-bottom:0px;
+	height:28px;
+}
+
+.calLtMidTitleRed
+{
+	background-image: url(../images/lt-mid-title-red.png); 
+	padding-bottom:0px;
+	height:28px;
+}
+
+.calRtMidTitleRed
+{
+	background-image: url(../images/rt-mid-title-red.png); 
+	padding-bottom:0px;
+	height:28px;
+}
+
+.calRtRtTitleRed
+{
+	background-image: url(../images/rt-rt-title-red.png); 
+	padding-bottom:0px;
+	height:28px;
+}
+
+.calLtLtFoot
+{
+	background-image: url(../images/lt-lt-foot.png); 
+	padding-bottom:0px;
+	height:17px;
+}
+
+.calLtMidFoot
+{
+	background-image: url(../images/lt-mid-foot.png); 
+	padding-bottom:0px;
+	height:17px;
+}
+
+.calRtMidFoot
+{
+	background-image: url(../images/rt-mid-foot.png); 
+	padding-bottom:0px;
+	height:17px;
+}
+
+.calRtRtFoot
+{
+	background-image: url(../images/rt-rt-foot.png); 
+	padding-bottom:0px;
+	height:17px;
+}
+
 .calDayView
 {
 	background-image: url(../images/appbox-header-background.png); 
@@ -449,10 +579,10 @@ a.textSidebox
 	border-left-width:1px;
 	border-left-style:solid;
 	border-right-color:#9c9c9c;
-	border-right-width:2px;
+	border-right-width:1px;
 	border-right-style:solid;
 	border-bottom-color:#9c9c9c;
-	border-bottom-width:2px;
+	border-bottom-width:1px;
 	border-bottom-style:solid;
 	background-color:#faf8f3;
 }
@@ -460,10 +590,10 @@ a.textSidebox
 .calDayViewShadowBox
 {
 	border-top-color:#9c9c9c;
-	border-top-width:2px;
+	border-top-width:1px;
 	border-top-style:solid;
 	border-left-color:#9c9c9c;
-	border-left-width:2px;
+	border-left-width:1px;
 	border-left-style:solid;
 	border-right-color:#9c9c9c;
 	border-right-width:1px;
@@ -472,7 +602,7 @@ a.textSidebox
 	border-bottom-width:1px;
 	border-bottom-style:solid;
 	background-color:#ffffff;
-	padding:5px;
+	padding:2px;
 }
 
 .addBookAlphaLinks
diff --git a/phpgwapi/templates/jerryr/images/background-icon-bar.png b/phpgwapi/templates/jerryr/images/background-icon-bar.png
index 2ba2b40c45..2856d6c13f 100644
Binary files a/phpgwapi/templates/jerryr/images/background-icon-bar.png and b/phpgwapi/templates/jerryr/images/background-icon-bar.png differ
diff --git a/phpgwapi/templates/jerryr/images/divSideboxHeader-background.png b/phpgwapi/templates/jerryr/images/divSideboxHeader-background.png
index fe33afd8af..85f49ff3d1 100644
Binary files a/phpgwapi/templates/jerryr/images/divSideboxHeader-background.png and b/phpgwapi/templates/jerryr/images/divSideboxHeader-background.png differ
diff --git a/phpgwapi/templates/jerryr/images/home.png b/phpgwapi/templates/jerryr/images/home.png
index 8abff182f0..46d29c2e81 100755
Binary files a/phpgwapi/templates/jerryr/images/home.png and b/phpgwapi/templates/jerryr/images/home.png differ
diff --git a/phpgwapi/templates/jerryr/images/logo.png b/phpgwapi/templates/jerryr/images/logo.png
index 2da628bfa4..d9c52968d9 100644
Binary files a/phpgwapi/templates/jerryr/images/logo.png and b/phpgwapi/templates/jerryr/images/logo.png differ
diff --git a/phpgwapi/templates/jerryr/images/logout.png b/phpgwapi/templates/jerryr/images/logout.png
index c82f022993..d057da82b1 100644
Binary files a/phpgwapi/templates/jerryr/images/logout.png and b/phpgwapi/templates/jerryr/images/logout.png differ
diff --git a/phpgwapi/templates/jerryr/images/lt-body.png b/phpgwapi/templates/jerryr/images/lt-body.png
new file mode 100644
index 0000000000..41633d65fd
Binary files /dev/null and b/phpgwapi/templates/jerryr/images/lt-body.png differ
diff --git a/phpgwapi/templates/jerryr/images/lt-lt-foot.png b/phpgwapi/templates/jerryr/images/lt-lt-foot.png
new file mode 100644
index 0000000000..2126920259
Binary files /dev/null and b/phpgwapi/templates/jerryr/images/lt-lt-foot.png differ
diff --git a/phpgwapi/templates/jerryr/images/lt-lt-title-red.png b/phpgwapi/templates/jerryr/images/lt-lt-title-red.png
new file mode 100644
index 0000000000..5e0275fe56
Binary files /dev/null and b/phpgwapi/templates/jerryr/images/lt-lt-title-red.png differ
diff --git a/phpgwapi/templates/jerryr/images/lt-lt-title.png b/phpgwapi/templates/jerryr/images/lt-lt-title.png
new file mode 100644
index 0000000000..7c88f69b20
Binary files /dev/null and b/phpgwapi/templates/jerryr/images/lt-lt-title.png differ
diff --git a/phpgwapi/templates/jerryr/images/lt-mid-foot.png b/phpgwapi/templates/jerryr/images/lt-mid-foot.png
new file mode 100644
index 0000000000..11ad8b07dd
Binary files /dev/null and b/phpgwapi/templates/jerryr/images/lt-mid-foot.png differ
diff --git a/phpgwapi/templates/jerryr/images/lt-mid-title-red.png b/phpgwapi/templates/jerryr/images/lt-mid-title-red.png
new file mode 100644
index 0000000000..f4a6ba5b9c
Binary files /dev/null and b/phpgwapi/templates/jerryr/images/lt-mid-title-red.png differ
diff --git a/phpgwapi/templates/jerryr/images/lt-mid-title.png b/phpgwapi/templates/jerryr/images/lt-mid-title.png
new file mode 100644
index 0000000000..3a600cf9cf
Binary files /dev/null and b/phpgwapi/templates/jerryr/images/lt-mid-title.png differ
diff --git a/phpgwapi/templates/jerryr/images/mid-foot.png b/phpgwapi/templates/jerryr/images/mid-foot.png
new file mode 100644
index 0000000000..6f6b158bbc
Binary files /dev/null and b/phpgwapi/templates/jerryr/images/mid-foot.png differ
diff --git a/phpgwapi/templates/jerryr/images/mid-title-red.png b/phpgwapi/templates/jerryr/images/mid-title-red.png
new file mode 100644
index 0000000000..f18d95ee1f
Binary files /dev/null and b/phpgwapi/templates/jerryr/images/mid-title-red.png differ
diff --git a/phpgwapi/templates/jerryr/images/mid-title.png b/phpgwapi/templates/jerryr/images/mid-title.png
new file mode 100644
index 0000000000..d68dbefcb0
Binary files /dev/null and b/phpgwapi/templates/jerryr/images/mid-title.png differ
diff --git a/phpgwapi/templates/jerryr/images/rt-body.png b/phpgwapi/templates/jerryr/images/rt-body.png
new file mode 100644
index 0000000000..7647dba1fe
Binary files /dev/null and b/phpgwapi/templates/jerryr/images/rt-body.png differ
diff --git a/phpgwapi/templates/jerryr/images/rt-mid-foot.png b/phpgwapi/templates/jerryr/images/rt-mid-foot.png
new file mode 100644
index 0000000000..1308ad82e9
Binary files /dev/null and b/phpgwapi/templates/jerryr/images/rt-mid-foot.png differ
diff --git a/phpgwapi/templates/jerryr/images/rt-mid-title-red.png b/phpgwapi/templates/jerryr/images/rt-mid-title-red.png
new file mode 100644
index 0000000000..8a61f8cc12
Binary files /dev/null and b/phpgwapi/templates/jerryr/images/rt-mid-title-red.png differ
diff --git a/phpgwapi/templates/jerryr/images/rt-mid-title.png b/phpgwapi/templates/jerryr/images/rt-mid-title.png
new file mode 100644
index 0000000000..d3fe12d051
Binary files /dev/null and b/phpgwapi/templates/jerryr/images/rt-mid-title.png differ
diff --git a/phpgwapi/templates/jerryr/images/rt-rt-foot.png b/phpgwapi/templates/jerryr/images/rt-rt-foot.png
new file mode 100644
index 0000000000..388b04434f
Binary files /dev/null and b/phpgwapi/templates/jerryr/images/rt-rt-foot.png differ
diff --git a/phpgwapi/templates/jerryr/images/rt-rt-title-red.png b/phpgwapi/templates/jerryr/images/rt-rt-title-red.png
new file mode 100644
index 0000000000..2190ee20bb
Binary files /dev/null and b/phpgwapi/templates/jerryr/images/rt-rt-title-red.png differ
diff --git a/phpgwapi/templates/jerryr/images/rt-rt-title.png b/phpgwapi/templates/jerryr/images/rt-rt-title.png
new file mode 100644
index 0000000000..26ba29480b
Binary files /dev/null and b/phpgwapi/templates/jerryr/images/rt-rt-title.png differ
diff --git a/phpgwapi/templates/jerryr/navbar.inc.php b/phpgwapi/templates/jerryr/navbar.inc.php
index 62f657a75d..e4853935f5 100644
--- a/phpgwapi/templates/jerryr/navbar.inc.php
+++ b/phpgwapi/templates/jerryr/navbar.inc.php
@@ -139,7 +139,7 @@
 			{
 				$app_extra_icons_div = '
 				<script language="javascript">
-				new ypSlideOutMenu("menu1", "down", 10, 114, 160, 200,\'right\')
+				new ypSlideOutMenu("menu1", "down", 10, 90, 160, 200,\'right\')
 				</script>
 				<div id="menu1Container">
 				<div id="menu1Content" style="position: relative; left: 0; text-align: left;">
@@ -155,8 +155,8 @@
 				';
 
 				$var['app_extra_icons_div']= $app_extra_icons_div;
-				//			$var['app_extra_icons_icon']= '<td width="26" valign="top" align="right" style="padding-right:3px;padding-top:50px;"><a title="'.lang('show_more_apps').'" href="javascript:void(0);" onClick="HideShow(\'extraIcons\');"><img src="'.$var['img_root'].'/extra_icons.png" border="0" /></a></td>';
-				$var['app_extra_icons_icon']= '<td width="26" valign="top" align="right" style="padding-right:3px;padding-top:50px;"><a title="'.lang('show_more_apps').'" href="#"  '.$show_menu_event.'="ypSlideOutMenu.showMenu(\'menu1\')"><img src="'.$var['img_root'].'/extra_icons.png" border="0" /></a></td>';
+				//			$var['app_extra_icons_icon']= '<td width="26" valign="top" align="right" style="padding-right:3px;padding-top:30px;"><a title="'.lang('show_more_apps').'" href="javascript:void(0);" onClick="HideShow(\'extraIcons\');"><img src="'.$var['img_root'].'/extra_icons.png" border="0" /></a></td>';
+				$var['app_extra_icons_icon']= '<td width="26" valign="top" align="right" style="padding-right:3px;padding-top:30px;"><a title="'.lang('show_more_apps').'" href="#"  '.$show_menu_event.'="ypSlideOutMenu.showMenu(\'menu1\')"><img src="'.$var['img_root'].'/extra_icons.png" border="0" /></a></td>';
 			}
 
 			if($GLOBALS['phpgw_info']['user']['preferences']['common']['navbar_format']!='icons')