diff --git a/phpgwapi/templates/idsociety/images/clear.gif b/phpgwapi/templates/idsociety/images/clear.gif
new file mode 100644
index 0000000000..e565824aaf
Binary files /dev/null and b/phpgwapi/templates/idsociety/images/clear.gif differ
diff --git a/phpgwapi/templates/idsociety/images/log_out2.gif b/phpgwapi/templates/idsociety/images/log_out2.gif
new file mode 100644
index 0000000000..b8f2208826
Binary files /dev/null and b/phpgwapi/templates/idsociety/images/log_out2.gif differ
diff --git a/phpgwapi/templates/idsociety/images/logo2.gif b/phpgwapi/templates/idsociety/images/logo2.gif
new file mode 100644
index 0000000000..64b06ba154
Binary files /dev/null and b/phpgwapi/templates/idsociety/images/logo2.gif differ
diff --git a/phpgwapi/templates/idsociety/images/preferences2.gif b/phpgwapi/templates/idsociety/images/preferences2.gif
new file mode 100755
index 0000000000..8f0e6e4938
Binary files /dev/null and b/phpgwapi/templates/idsociety/images/preferences2.gif differ
diff --git a/phpgwapi/templates/idsociety/images/question_mark2.gif b/phpgwapi/templates/idsociety/images/question_mark2.gif
new file mode 100644
index 0000000000..ea851a95e5
Binary files /dev/null and b/phpgwapi/templates/idsociety/images/question_mark2.gif differ
diff --git a/phpgwapi/templates/idsociety/images/right_nav_bar2.gif b/phpgwapi/templates/idsociety/images/right_nav_bar2.gif
new file mode 100644
index 0000000000..a3b75ae57d
Binary files /dev/null and b/phpgwapi/templates/idsociety/images/right_nav_bar2.gif differ
diff --git a/phpgwapi/templates/idsociety/images/rollover/log_out_over2.gif b/phpgwapi/templates/idsociety/images/rollover/log_out_over2.gif
new file mode 100644
index 0000000000..af93865438
Binary files /dev/null and b/phpgwapi/templates/idsociety/images/rollover/log_out_over2.gif differ
diff --git a/phpgwapi/templates/idsociety/images/rollover/preferences_over2.gif b/phpgwapi/templates/idsociety/images/rollover/preferences_over2.gif
new file mode 100644
index 0000000000..f21a20dd17
Binary files /dev/null and b/phpgwapi/templates/idsociety/images/rollover/preferences_over2.gif differ
diff --git a/phpgwapi/templates/idsociety/images/rollover/question_mark_over2.gif b/phpgwapi/templates/idsociety/images/rollover/question_mark_over2.gif
new file mode 100644
index 0000000000..6e61b21222
Binary files /dev/null and b/phpgwapi/templates/idsociety/images/rollover/question_mark_over2.gif differ
diff --git a/phpgwapi/templates/idsociety/images/rollover/welcome_over2.gif b/phpgwapi/templates/idsociety/images/rollover/welcome_over2.gif
new file mode 100644
index 0000000000..4270890c53
Binary files /dev/null and b/phpgwapi/templates/idsociety/images/rollover/welcome_over2.gif differ
diff --git a/phpgwapi/templates/idsociety/images/top_spacer_middle2.gif b/phpgwapi/templates/idsociety/images/top_spacer_middle2.gif
new file mode 100644
index 0000000000..747d1d028f
Binary files /dev/null and b/phpgwapi/templates/idsociety/images/top_spacer_middle2.gif differ
diff --git a/phpgwapi/templates/idsociety/images/welcome2.gif b/phpgwapi/templates/idsociety/images/welcome2.gif
new file mode 100644
index 0000000000..3d9cd012b5
Binary files /dev/null and b/phpgwapi/templates/idsociety/images/welcome2.gif differ
diff --git a/phpgwapi/templates/idsociety/navbar.tpl b/phpgwapi/templates/idsociety/navbar.tpl
index 089bd78f12..59a87457cd 100755
--- a/phpgwapi/templates/idsociety/navbar.tpl
+++ b/phpgwapi/templates/idsociety/navbar.tpl
@@ -1,9 +1,9 @@
  marginwidth="0" marginheight="0" topmargin="0" bottommargin="0" rightmargin="0" leftmargin="0" border="0" 
  onLoad="MM_preloadImages('{app_images}',
-'{img_root_roll}/log_out_over.gif',
-'{img_root_roll}/preferences_over.gif',
-'{img_root_roll}/help-over.gif',
-'{img_root_roll}/welcome_over.gif')"
+'{img_root_roll}/log_out_over2.gif',
+'{img_root_roll}/preferences_over2.gif',
+'{img_root_roll}/question_mark_over2.gif',
+'{img_root_roll}/welcome_over2.gif')"
  background="{img_root}/content_spacer_middle.gif">
   <!-- the above is the continuation and finishing if the < body > element started in head.tpl
   the margin items could be merged into head, as head already supplies some
@@ -11,37 +11,45 @@
 
 <table border="0" width="100%" height="100%" cellspacing="0" cellpadding="0">
 <tr>
-	<td width="154" align="left" background="{img_root}/em.gif">
-		<img src="{img_root}/logo.gif">
+	<!-- top row back images are 58px high, but the row may be smaller than that -->
+	<td width="154" height="58" align="left" valign="top" background="{img_root}/em.gif">
+		<img src="{img_root}/logo2.gif">
 	</td>
-	<td width="100%">
-		<table cellpadding="0" cellspacing="0" border="0" width="100%">
+	<td width="100%" align="right" background="{img_root}/em.gif">
+		<table width="100%" height="28" cellpadding="0" cellspacing="0" border="0" valign="top">
 		<tr>
-			<td background="{img_root}/nav_top_spacer.gif" align="left">
-				<font size="{user_info_size}" color="{user_info_color}">
-				<strong>{user_info_name}<br>{user_info_date}</strong></font>
+			<!-- <td width="100%" align="right" valign="top"><font size="{powered_by_size}" color="{powered_by_color}">{powered_by}&nbsp;{current_users}</font></td> -->
+			<td width="50%" align="left" valign="top">
+				<font size="{powered_by_size}" color="{powered_by_color}">{current_users}</font>
 			</td>
-			<td background="{img_root}/nav_top_spacer.gif" align="right">
-				<font size="{powered_by_size}" color="{powered_by_color}">{powered_by}&nbsp;<br>{current_users}&nbsp;</font>
+			<td width="50%" align="right" valign="top">
+				<font size="{powered_by_size}" color="{powered_by_color}">{powered_by}&nbsp;</font>
+			</td>
+		</tr>
+		</table>
+		<table width="100%" height="29" cellpadding="0" cellspacing="0" border="0" valign="bottom">
+		<tr>
+			<td width="50%" align="left" valign="bottom">
+				<font size="{user_info_size}" color="{user_info_color}">
+				<strong>{user_info_name}</strong></font>
+			</td>
+			<td width="50%" align="right" valign="bottom">
+				<font size="{user_info_size}" color="{user_info_color}">
+				<strong>{user_info_date}&nbsp;</strong></font>
 			</td>
 		</tr>
 		</table>
 	</td>
 </tr>
 <tr>
-	<td width="154" align="left" background="{img_root}/top_spacer_middle.gif">
-		<!-- the td background image is the important one in this row, it has the silver linuing at the bottom -->
-		<!--  this img inside the td is not visually relevant, just to put something here -->
-		<img src="{img_root}/top_spacer_middle.gif">
-	</td>
-	<td width="100%" align="right" background="{img_root}/top_spacer_middle.gif">
-		<!-- right top nav table -->
-		<table cellpadding="0" cellspacing="0" border="0" height="15">
+	<td colspan="2" width="100%" height="15" align="right" valign="top" background="{img_root}/top_spacer_middle2.gif">
+		<!-- row 2 right nav buttons -->
+		<table cellpadding="0" cellspacing="0" border="0">
 		<tr>
-			<td><a href="{home_link}" onMouseOver="nine.src='{img_root}/rollover/welcome_over.gif'" onMouseOut="nine.src='{img_root}/welcome.gif'"><img src="{img_root}/welcome.gif" border="0" name="nine"></a></td>
-			<td><a href="{preferences_link}" onMouseOver="ten.src='{img_root}/rollover/preferences_over.gif'" onMouseOut="ten.src='{img_root}/preferences.gif'"><img src="{img_root}/preferences.gif" border="0" name="ten"></a></td>
-			<td><a href="{logout_link}" onMouseOver="eleven.src='{img_root}/rollover/log_out_over.gif'" onMouseOut="eleven.src='{img_root}/log_out.gif'"><img src="{img_root}/log_out.gif" border="0" name="eleven"></a></td>
-			<td><a href="{help_link}" onMouseOver="help.src='{img_root}/rollover/help-over.gif'" onMouseOut="help.src='{img_root}/question_mark.gif'"><img src="{img_root}/question_mark.gif" border="0" name="help"></a></td>
+			<td><a href="{home_link}" onMouseOver="nine.src='{img_root}/rollover/welcome_over2.gif'" onMouseOut="nine.src='{img_root}/welcome2.gif'"><img src="{img_root}/welcome2.gif" border="0" name="nine"></a></td>
+			<td><a href="{preferences_link}" onMouseOver="ten.src='{img_root}/rollover/preferences_over2.gif'" onMouseOut="ten.src='{img_root}/preferences2.gif'"><img src="{img_root}/preferences2.gif" border="0" name="ten"></a></td>
+			<td><a href="{logout_link}" onMouseOver="eleven.src='{img_root}/rollover/log_out_over2.gif'" onMouseOut="eleven.src='{img_root}/log_out2.gif'"><img src="{img_root}/log_out2.gif" border="0" name="eleven"></a></td>
+			<td><a href="{help_link}" onMouseOver="help.src='{img_root}/rollover/question_mark_over2.gif'" onMouseOut="help.src='{img_root}/question_mark2.gif'"><img src="{img_root}/question_mark2.gif" border="0" name="help"></a></td>
 		</tr>
 		</table>
 	</td>
@@ -49,7 +57,7 @@
 <tr>
 	<td width="154" align="left" valign="top" background="{img_root}/nav_bar_left_spacer.gif">
 		<!-- left nav table -->
-		<table border="0" cellpadding="0" cellspacing="0" width="154">
+		<table border="0" cellpadding="0" cellspacing="0">
 		<!-- applications supplies their own tr's and td's -->
 		{applications}
 		<tr>
@@ -60,4 +68,4 @@
 	<td width="100%" align="left" valign="top">
 		<!-- this TD background image moved to body element -->
 		<br>
-<!-- END navbar -->
+<!-- END navbar -->
\ No newline at end of file