diff --git a/about.php b/about.php
index 65c88303ed..fefaa531b8 100644
--- a/about.php
+++ b/about.php
@@ -65,7 +65,7 @@
 		'about_app'				=> $app_data + array
 		(
 			'title'				=> lang($app),
-			'icon'				=> $GLOBALS['phpgw']->common->image($app,'navbar'),
+			'icon'				=> $GLOBALS['phpgw']->common->image($app,'navbar','',True),
 			'lang_version'		=> lang('version'),
 			'lang_author'		=> lang('author'),
 			'lang_based_on'		=> lang('based on'),
diff --git a/admin/templates/default/index.tpl b/admin/templates/default/index.tpl
index ddec4f9489..3aed46625c 100755
--- a/admin/templates/default/index.tpl
+++ b/admin/templates/default/index.tpl
@@ -33,7 +33,7 @@
 
 <!-- BEGIN app_row_noicon -->
  <tr class="row_off">
-  <td colspan="2" width="95%" valign="middle"><b>&nbsp;&nbsp;{app_title}</b> <a name="{app_name}"></a></td>
+  <td height="25" colspan="2" width="95%" valign="bottom"><b>&nbsp;{app_title}</b> <a name="{app_name}"></a></td>
  </tr>
 <!-- END app_row_noicon -->
 
diff --git a/phpgwapi/templates/funkwerk/css/funkwerk.css b/phpgwapi/templates/funkwerk/css/funkwerk.css
index d4471b79f8..bf41e4e043 100644
--- a/phpgwapi/templates/funkwerk/css/funkwerk.css
+++ b/phpgwapi/templates/funkwerk/css/funkwerk.css
@@ -47,6 +47,7 @@ td.left
 
 .bottom
 {
+	color: #FFFFFF;
 	background-color: #FF3300;
 }
 
@@ -55,42 +56,13 @@ a:link,a:active,a:visited,a:hover
 	color: #0000A0;
 }
 
-a:link.top_menu,a:active.top_menu,a:visited.top_menu
+a:link.bottom,a:active.bottom,a:visited.bottom,a:hover.bottom,a:link.top_menu,a:active.top_menu,a:visited.top_menu,a:link.left,a:active.left,a:visited.left
 {
 	color: #FFFFFF;
-	font-weight: bold;
 }
 
-a:hover.top_menu
+a:hover.top_menu,a:link.top_menu_selected,a:active.top_menu_selected,a:visited.top_menu_selected,a:hover.top_menu_selected,a:hover.left,a:link.left_selected,a:active.left_selected,a:visited.left_selected,a:hover.left_selected
 {
-	font-weight: bold;
-	color: #660000;
-	background-color: #FFE000;
-}
-
-a:link.top_menu_selected,a:active.top_menu_selected,a:visited.top_menu_selected,a:hover.top_menu_selected
-{
-	font-weight: bold;
-	color: #660000;
-	background-color: #FFE000;
-}
-
-a:link.left,a:active.left,a:visited.left
-{
-	color: #FFFFFF;
-	font-weight: bold;
-}
-
-a:hover.left
-{
-	font-weight: bold;
-	color: #660000;
-	background-color: #FFE000;
-}
-
-a:link.left_selected,a:active.left_selected,a:visited.left_selected,a:hover.left_selected
-{
-	font-weight: bold;
 	color: #660000;
 	background-color: #FFE000;
 }
@@ -108,7 +80,7 @@ a:link.left_selected,a:active.left_selected,a:visited.left_selected,a:hover.left
 
 .row_on,.th_bright,.app_header
 {
-	background-color: #999999;
+	background-color: #ADADAD;
 }
 
 .msgbox
diff --git a/phpgwapi/templates/funkwerk/css/phpgw.css b/phpgwapi/templates/funkwerk/css/phpgw.css
index 2a46f6204f..83aea9d7c7 100644
--- a/phpgwapi/templates/funkwerk/css/phpgw.css
+++ b/phpgwapi/templates/funkwerk/css/phpgw.css
@@ -36,6 +36,17 @@ a:hover
 a:hover.left,a:hover.top_link
 {
 	text-decoration: none;
+	font-weight: bold;
+}
+
+a:link.bottom,a:active.bottom,a:visited.bottom,a:hover.bottom,a:link.top_menu,a:active.top_menu,a:visited.top_menu,a:link.left,a:active.left,a:visited.left
+{
+	font-weight: bold;
+}
+
+a:hover.top_menu,a:link.top_menu_selected,a:active.top_menu_selected,a:visited.top_menu_selected,a:hover.top_menu_selected,a:hover.left,a:link.left_selected,a:active.left_selected,a:visited.left_selected,a:hover.left_selected
+{
+	font-weight: bold;
 }
 
 a.th,a.th_text
@@ -53,14 +64,10 @@ a.th,a.th_text
 	height: 30;
 }
 
-.info
-{
-	font-size: 85%;
-}
-
 td.left
 {
 	height: 30;
+	width: 131;
 }
 
 .bottom
@@ -98,16 +105,9 @@ table.login
 	background: url(../../default/images/bg_filler.png);
 }
 
-
-.user_info,.admin_info
+.user_info,.admin_info,.small_text
 {
-	font-size: 80%;
-	font-weight: bold;
-}
-
-.small_text
-{
-	font-size: 80%;
+	font-size: 85%;
 }
 
 .header_text
diff --git a/phpgwapi/templates/funkwerk/phpgw.xsl b/phpgwapi/templates/funkwerk/phpgw.xsl
index 77b658fc9c..3096e54918 100644
--- a/phpgwapi/templates/funkwerk/phpgw.xsl
+++ b/phpgwapi/templates/funkwerk/phpgw.xsl
@@ -41,7 +41,7 @@
 				<!-- BEGIN top_part -->
 				<table width="100%" height="100%" cellspacing="2" cellpadding="2" valign="top">
 					<tr>
-						<td width="131" height="30" valign="bottom" class="top_top"><a href="" target="blank" onMouseover="window.status='phpGroupWare --> home'; return true;" onMouseout="window.status=''; return true;" class="left">[phpGroupWare]</a></td>
+						<td width="131" height="30" valign="bottom" class="top_top"><a href="" target="blank" onMouseover="window.status='phpGroupWare --> home'; return true;" onMouseout="window.status=''; return true;" class="bottom">[phpGroupWare]</a></td>
 						<td height="30" width="19%" valign="bottom" class="user_info">[<xsl:value-of select="user_info_name"/>]</td>
 						<xsl:choose>
 							<xsl:when test="current_users">
@@ -116,8 +116,8 @@
 					<tr valign="top">
 						<td colspan="3" align="center" valign="top" class="bottom">
 						<!-- BEGIN bottom_part -->
-							<xsl:value-of select="lang_powered_by"/>
-							<a href="http://www.phpgroupware.org" target="blank" onMouseout="window.status='';return true;">
+							[<xsl:value-of select="lang_powered_by"/>
+							<a href="http://www.phpgroupware.org" target="blank" onMouseout="window.status='';return true;" class="bottom">
 								<xsl:attribute name="onMouseover">
 									<xsl:text>window.status='</xsl:text>
 									<xsl:value-of select="lang_phpgw_statustext"/>
@@ -125,7 +125,7 @@
 								</xsl:attribute>
 								<xsl:text> phpGroupWare </xsl:text>
 							</a>
-							<xsl:text> </xsl:text><xsl:value-of select="lang_version"/><xsl:text> </xsl:text><xsl:value-of select="phpgw_version"/>
+							<xsl:text> </xsl:text><xsl:value-of select="lang_version"/><xsl:text> </xsl:text><xsl:value-of select="phpgw_version"/>]
 						<!-- END bottom_part -->
 						</td>
 					</tr>
diff --git a/preferences/templates/default/index.tpl b/preferences/templates/default/index.tpl
index fa84729df7..5ed7c98392 100644
--- a/preferences/templates/default/index.tpl
+++ b/preferences/templates/default/index.tpl
@@ -19,7 +19,7 @@
 
 <!-- BEGIN app_row_noicon -->
  <tr class="th_bright">
-  <td colspan="2" width="95%" valign="middle"><b>&nbsp;&nbsp;{app_title}</b> <a name="{app_name}"></a></td>
+  <td height="25" colspan="2" width="95%" valign="bottom"><b>&nbsp;{app_title}</b> <a name="{app_name}"></a></td>
  </tr>
 <!-- END app_row_noicon -->