3 files changed, 37 insertions, 19 deletions
diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index e00ad555ff..20b98c6f8c 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -137,14 +137,15 @@
 						<ul class="topiclist forums">
 						<!-- BEGIN notifications -->
 							<li class="row<!-- IF notifications.UNREAD --> bg2<!-- ENDIF -->">
-								<!-- IF notifications.URL --><a href="{notifications.URL}"><!-- ENDIF -->
-									{notifications.AVATAR}
-									<div>
-										{notifications.FORMATTED_TITLE}<br />
-										{notifications.TIME}
-									</div>
+								<!-- IF notifications.URL or notifications.U_MARK_READ --><a href="<!-- IF notifications.UNREAD -->{notifications.U_MARK_READ}<!-- ELSE -->{notifications.URL}<!-- ENDIF -->"><!-- ENDIF -->
+								<span>
+										{notifications.AVATAR}
+										<span class="notification_title">
+											{notifications.FORMATTED_TITLE}
+											<div class="notification_time">{notifications.TIME}</div>
+										</span>
+								</span>
 								<!-- IF notifications.URL --></a><!-- ENDIF -->
-								<!-- IF notifications.UNREAD --><a href="{notifications.U_MARK_READ}" title="{L_MARK_READ}">{L_MARK_READ}</a><!-- ENDIF -->
 							</li>
 				   			<!-- END notifications -->
 						</ul>
diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html
index 94e8432508..f71d8698b9 100644
--- a/phpBB/styles/prosilver/template/ucp_notifications.html
+++ b/phpBB/styles/prosilver/template/ucp_notifications.html
@@ -77,14 +77,17 @@
 					<li class="row<!-- IF notification_list.UNREAD --> bg3<!-- ELSE --><!-- IF notification_list.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF --><!-- ENDIF -->">
 						<dl>
 							<dt>
-								<!-- IF notification_list.URL --><a href="{notification_list.URL}"><!-- ENDIF -->
-									{notification_list.AVATAR}
-									<div>
-										{notification_list.FORMATTED_TITLE}<br />
-										{notification_list.TIME}
-									</div>
+								<!-- IF notification_list.URL or notification_list.U_MARK_READ --><a href="<!-- IF notification_list.UNREAD -->{notification_list.U_MARK_READ}<!-- ELSE -->{notification_list.URL}<!-- ENDIF -->"><!-- ENDIF -->
+								<span>
+										{notification_list.AVATAR}
+										<span class="notification_title">
+											{notification_list.FORMATTED_TITLE}
+											<div class="notification_time">{notification_list.TIME}</div>
+										</span>
+								</span>
 								<!-- IF notification_list.URL --></a><!-- ENDIF -->
 							</dt>
+
 							<dd class="mark"><!-- IF notification_list.UNREAD --><input type="checkbox" name="mark[]" value="{notification_list.NOTIFICATION_ID}" /> <dfn>{L_MARK_READ}</dfn><!-- ENDIF --></dd>
 						</dl>
 					</li>
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 3d8d640598..c82fa5b7c8 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -680,15 +680,29 @@ p.rules a {
 #notification_list ul li {
 	padding: 10px;
 	width: 310px;
+	line-height: 1.5em;
 }
 
-.notification_list ul li a {
-	text-decoration: none;
-}
-
-.notification_list ul li img {
+.notification_list ul li a span img {
 	float: left;
-	padding: 0 10px 10px 0;
 	max-width: 50px;
 	max-height: 50px;
 }
+
+.notification_list ul li span .notification_title {
+	float: left;
+	width: 240px;
+	margin: 0 0 0 5px;
+	word-wrap: break-word;
+	position: relative;
+	top: -0.2em;
+}
+
+.notification_list ul li dl dt span .notification_title {
+	width: auto;
+	padding: 10px 0 0 0;
+}
+
+.notification_time {
+	margin-top: 0.5em;
+}