diff --git a/notifications/inc/class.ajaxnotifications.inc.php b/notifications/inc/class.ajaxnotifications.inc.php
index 6864105b61..f78ed059cd 100644
--- a/notifications/inc/class.ajaxnotifications.inc.php
+++ b/notifications/inc/class.ajaxnotifications.inc.php
@@ -109,7 +109,7 @@ class ajaxnotifications {
 	 * 
 	 * @return xajax response
 	 */
-	public function get_popup_notifications() {
+	public function get_egwpopup_notifications() {
 		$session_id = $GLOBALS['egw_info']['user']['sessionid'];
 		$message = '';
 		$rs = $this->db->select(self::_notification_table, 
@@ -133,11 +133,11 @@ class ajaxnotifications {
 					break;
 				case 'high':
 					$this->response->addAlert(lang('eGroupWare has notifications for you'));
-					$this->response->addScript('notificationwindow_display();');
+					$this->response->addScript('egwpopup_display();');
 					break;
 				case 'medium':
 				default:
-					$this->response->addScript('notificationwindow_display();');
+					$this->response->addScript('egwpopup_display();');
 					break;
 			}
 		}
diff --git a/notifications/inc/class.notifications_popup.inc.php b/notifications/inc/class.notifications_popup.inc.php
index 67918ea12f..0b621a1fcd 100644
--- a/notifications/inc/class.notifications_popup.inc.php
+++ b/notifications/inc/class.notifications_popup.inc.php
@@ -116,7 +116,6 @@ class notifications_popup implements notifications_iface {
 		$message = 	$this->render_infos($_subject)
 					.html::hr()
 					.$_messages['html']
-					.html::hr()
 					.$this->render_links($_links);
 
 		$this->save( $message, $user_sessions );
@@ -174,7 +173,7 @@ class notifications_popup implements notifications_iface {
 
 		}
 		if(count($rendered_links) > 0) {
-			return html::bold(lang('Linked entries:')).$newline.implode($newline,$rendered_links);
+			return html::hr().html::bold(lang('Linked entries:')).$newline.implode($newline,$rendered_links);
 		}
 	}
 
diff --git a/notifications/inc/hook_after_navbar.inc.php b/notifications/inc/hook_after_navbar.inc.php
index 1d749d94ee..68a9b47619 100644
--- a/notifications/inc/hook_after_navbar.inc.php
+++ b/notifications/inc/hook_after_navbar.inc.php
@@ -16,15 +16,13 @@ $notification_config = config::read('notifications');
 if ($notification_config['popup_enable']) {
 	$GLOBALS['egw']->translation->add_app('notifications');
 	echo '<script src="'. $GLOBALS['egw_info']['server']['webserver_url']. '/notifications/js/notificationajaxpopup.js'. '" type="text/javascript"></script>';
-	echo '<script type="text/javascript">notificationwindow_init();</script>';
+	echo '<script type="text/javascript">egwpopup_init();</script>';
 	echo '
-		<div id="notificationwindow" style="display: none; z-index: 999;">
-			<div id="divAppboxHeader">'. lang('Notification'). '</div>
-				<div id="divAppbox">
-				<div id="notificationwindow_message"></div>
-				<center>
-					<input id="notificationwindow_ok_button" type="submit" value="'. lang('ok'). '" onClick="notificationwindow_button_ok();">
-				</center>
+		<div id="egwpopup" style="display: none; z-index: 999;">
+			<div id="egwpopup_header">'.lang('Notification').'</div>
+			<div id="egwpopup_message"></div>
+			<div id="egwpopup_footer">	
+				<input id="egwpopup_ok_button" type="submit" value="'. lang('ok'). '" onClick="egwpopup_button_ok();">
 			</div>
 		</div>
 	';
diff --git a/notifications/js/notificationajaxpopup.js b/notifications/js/notificationajaxpopup.js
index 4437a6d0fc..10cc0d13bd 100644
--- a/notifications/js/notificationajaxpopup.js
+++ b/notifications/js/notificationajaxpopup.js
@@ -10,41 +10,41 @@
 
 var notifymessages = new Array();
 
-function notificationwindow_init() {
-	window.setTimeout("notificationwindow_refresh();", 1000);
+function egwpopup_init() {
+	window.setTimeout("egwpopup_refresh();", 1000);
 }
 
-function notificationwindow_setTimeout() {
-	window.setTimeout("notificationwindow_refresh();", 60000);
+function egwpopup_setTimeout() {
+	window.setTimeout("egwpopup_refresh();", 60000);
 }
-function notificationwindow_refresh() {
+function egwpopup_refresh() {
 	xajax_doXMLHTTP("notifications.ajaxnotifications.check_mailbox");
-	xajax_doXMLHTTP("notifications.ajaxnotifications.get_popup_notifications");
-	notificationwindow_setTimeout();
+	xajax_doXMLHTTP("notifications.ajaxnotifications.get_egwpopup_notifications");
+	egwpopup_setTimeout();
 }
 
-function notificationwindow_display() {
-	var notificationwindow;
-	var notificationwindow_message;
+function egwpopup_display() {
+	var egwpopup;
+	var egwpopup_message;
 	var Browserwidth;
 	var Browserheight;
-	var notificationwindow_ok_button;
-	notificationwindow_ok_button = document.getElementById("notificationwindow_ok_button");
-	notificationwindow = document.getElementById("notificationwindow");
-	notificationwindow_message = document.getElementById("notificationwindow_message");
-	notificationwindow.style.display = "inline";
-	notificationwindow.style.position = "absolute";
-	notificationwindow.style.width = "500px";
+	var egwpopup_ok_button;
+	egwpopup_ok_button = document.getElementById("egwpopup_ok_button");
+	egwpopup = document.getElementById("egwpopup");
+	egwpopup_message = document.getElementById("egwpopup_message");
+	egwpopup.style.display = "inline";
+	egwpopup.style.position = "absolute";
+	egwpopup.style.width = "500px";
 	Browserwidth = (window.innerWidth || document.body.clientWidth || 640)
 	Browserheight = (window.innerHeight || document.body.clientHeight || 480)
-	notificationwindow.style.left = (Browserwidth/2 - 250) + "px";
-	notificationwindow.style.top = (Browserheight/4) + "px";
-	notificationwindow.style.height = "100%";
-	notificationwindow_message.innerHTML = notifymessages[0];
+	egwpopup.style.left = (Browserwidth/2 - 250) + "px";
+	egwpopup.style.top = (Browserheight/4) + "px";
+	egwpopup_message.style.maxHeight = (Browserheight/2) + "px";
+	egwpopup_message.innerHTML = notifymessages[0];
 	if(notifymessages.length-1 > 0 ) {
-		notificationwindow_ok_button.value = "OK (" + (notifymessages.length-1) + ")";
+		egwpopup_ok_button.value = "OK (" + (notifymessages.length-1) + ")";
 	} else {
-		notificationwindow_ok_button.value = "OK";
+		egwpopup_ok_button.value = "OK";
 	}
 
 }
@@ -59,17 +59,17 @@ function notificationbell_switch(mode) {
 	}
 }
 
-function notificationwindow_button_ok() {
-	var notificationwindow;
-	var notificationwindow_message;
-	notificationwindow = document.getElementById("notificationwindow");
-	notificationwindow_message = document.getElementById("notificationwindow_message");
+function egwpopup_button_ok() {
+	var egwpopup;
+	var egwpopup_message;
+	egwpopup = document.getElementById("egwpopup");
+	egwpopup_message = document.getElementById("egwpopup_message");
 	notifymessages.shift();
 	if(notifymessages.length > 0) {
-		notificationwindow_display();
+		egwpopup_display();
 	} else {
-		notificationwindow.style.display = "none";
-		notificationwindow_message.innerHTML = "";
+		egwpopup.style.display = "none";
+		egwpopup_message.innerHTML = "";
 		notificationbell_switch("inactive");
 	}
 }
diff --git a/phpgwapi/templates/idots/css/idots.css b/phpgwapi/templates/idots/css/idots.css
index 28dcb79241..25b01865d8 100644
--- a/phpgwapi/templates/idots/css/idots.css
+++ b/phpgwapi/templates/idots/css/idots.css
@@ -27,11 +27,11 @@
 }
 
 .textSidebox {
-	border-top: 1px solid lightgray;
+	border-top: 1px solid #d3d3d3;
 }
 
 .divSidebox table {
-	border: 1px solid lightgray;
+	border: 1px solid #d3d3d3;
 	border-top: none;
 }
 
@@ -46,7 +46,7 @@
 #divAppbox {
 	padding-left: 15px;
 	padding-right: 10px;
-	border: 1px solid lightgray;
+	border: 1px solid #d3d3d3;
 }
 
 #divMain {
@@ -66,7 +66,7 @@
 }
 #divUpperTabs li
 {
-	border: 1px solid lightgray;
+	border: 1px solid #d3d3d3;
 	border-top: none;
 }
 
@@ -121,7 +121,7 @@ a:link, a:visited, select, input, textarea {
 }
 
 .divLoginbox {
-	border: 1px solid lightgray;
+	border: 1px solid #d3d3d3;
 	border-top: none;
 }
 .divLoginbox td {
diff --git a/phpgwapi/templates/idots/css/traditional.css b/phpgwapi/templates/idots/css/traditional.css
index a2185a594a..666ba948ac 100755
--- a/phpgwapi/templates/idots/css/traditional.css
+++ b/phpgwapi/templates/idots/css/traditional.css
@@ -458,26 +458,53 @@ Preferences tabs
 	padding-right: 15px;
 }
 
-/*
-	notification window
-*/
-#notificationwindow_message > table
-{
-	font-size: 95%;
+/* eGroupWare popup */
+#egwpopup {
+	background-color: #ffffff;
+	border: 1px solid #d3d3d3;
 }
 
-#notificationwindow_message hr
-{
+#egwpopup hr {
 	border: none;
-	border-top: 1px solid black;
+	border-top: 1px solid #d3d3d3;
 	height: 1px;
 }
 
-#notificationwindow_message .link
-{
+#egwpopup_header {
+	background-image: url(../images/gradient22.png);
+	height: 18px;
+	line-height: 18px;
+	margin: 0;
+	padding: 0;
+	font-size:12px;
+	font-weight: bold;
+	color: #666666;
+	text-align: center;
+	border-bottom: 1px solid #d3d3d3;
+}
+
+#egwpopup_message {
+	margin: 0;
+	padding: 7px;
+	overflow: auto;
+}
+
+#egwpopup_message > table {
+	font-size: 95%;
+}
+
+#egwpopup_message .link {
 	cursor: pointer;
 }
 
+#egwpopup_footer {
+	margin: 0;
+	padding: 7px;
+	border: none;
+	border-top: 1px solid #d3d3d3;
+	text-align: center;
+}
+
 .selectbg
 {
 	position:absolute;
diff --git a/phpgwapi/templates/jerryr/css/brushed-metal.css b/phpgwapi/templates/jerryr/css/brushed-metal.css
index 67d4631d6f..5e0c355285 100644
--- a/phpgwapi/templates/jerryr/css/brushed-metal.css
+++ b/phpgwapi/templates/jerryr/css/brushed-metal.css
@@ -717,22 +717,50 @@ body {
 	padding-right: 15px;
 }
 
-/*
-	notification window
-*/
-#notificationwindow_message > table
-{
-	font-size: 95%;
+/* eGroupWare popup */
+#egwpopup {
+	background-image: url(../images/bmback2.jpg);
+	background-color: #ffffff;
+	border: 1px solid #9f9f9f;
+	border-top-style: none;
 }
 
-#notificationwindow_message hr
-{
+#egwpopup hr {
 	border: none;
-	border-top: 1px solid black;
+	border-top: 1px solid #9f9f9f;
 	height: 1px;
 }
 
-#notificationwindow_message .link
-{
+#egwpopup_header {
+	background-image: url(../images/menuTitleMid-bm.png);
+	height: 24px;
+	line-height: 24px;
+	margin: 0;
+	padding: 0;
+	font-size:12px;
+	font-weight: bold;
+	color: #666666;
+	text-align: center;
+}
+
+#egwpopup_message {
+	margin: 0;
+	padding: 7px;
+	overflow: auto;
+}
+
+#egwpopup_message > table {
+	font-size: 95%;
+}
+
+#egwpopup_message .link {
 	cursor: pointer;
 }
+
+#egwpopup_footer {
+	margin: 0;
+	padding: 7px;
+	border: none;
+	border-top: 1px solid #9f9f9f;
+	text-align: center;
+}
diff --git a/phpgwapi/templates/jerryr/css/jerryr.css b/phpgwapi/templates/jerryr/css/jerryr.css
index 5c4e2adf40..6e428c3142 100644
--- a/phpgwapi/templates/jerryr/css/jerryr.css
+++ b/phpgwapi/templates/jerryr/css/jerryr.css
@@ -392,6 +392,7 @@ body {
 	padding:9px;
 	padding-top: 0px;	/* CHANGED RALF */
 	border:solid 1px #17202b;
+	border-bottom-style:none;
 }
 
 #divLogo
@@ -641,31 +642,58 @@ body {
 	padding-right: 15px;
 }
 
-/*
-	notification window
-*/
-#notificationwindow_message > table
-{
-	font-size: 95%;
+/* eGroupWare popup */
+#egwpopup {
+	background-color: #fbf8f1;
+	border: 1px solid #17202b;
 }
 
-#notificationwindow_message hr
-{
+#egwpopup hr {
 	border: none;
-	border-top: 1px solid black;
+	border-top: 1px solid #17202b;
 	height: 1px;
 }
 
-#notificationwindow_message .link
-{
+#egwpopup_header {
+	background-image: url(../images/appTitleBar.png);
+	height: 18px;
+	line-height: 18px;
+	margin: 0;
+	padding: 0;
+	font-size:12px;
+	font-weight: bold;
+	color: #17202b;
+	text-align: center;
+	border-bottom: 1px solid #17202b;
+}
+
+#egwpopup_message {
+	margin: 0;
+	padding: 7px;
+	overflow: auto;
+}
+
+#egwpopup_message > table {
+	font-size: 95%;
+}
+
+#egwpopup_message .link {
 	cursor: pointer;
 }
 
+#egwpopup_footer {
+	margin: 0;
+	padding: 7px;
+	border: none;
+	border-top: 1px solid #17202b;
+	text-align: center;
+}
+
 .selectbg
 {
 	position:absolute;
 	z-index:10;
-	overflow:hidden;/
+	overflow:hidden;
 	width:250px;
 }
 .iframeforselectbox