6 files changed, 70 insertions, 46 deletions
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
index 6cc70c4225..2b170bc45b 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
@@ -35,31 +35,40 @@
 
 
 		<!-- IF U_PM or U_EMAIL or U_JABBER -->
+			<!-- DEFINE $CNT = 0 -->
 			<dd class="profile-contact">
 				<strong>{L_CONTACT_USER}{L_COLON}</strong>
-				<div class="dropdown-container">
-					<a href="#" class="dropdown-trigger">Trigger</a>
+				<div class="dropdown-container dropdown-left">
+					<a href="#" class="dropdown-trigger"><span class="imageset icon_contact"></span></a>
 					<div class="dropdown hidden">
 						<div class="pointer"><div class="pointer-inner"></div></div>
 						<div class="dropdown-contents contact-icons">
-							<!-- EVENT ucp_pm_viewmessage_contact_fields_before -->
-							<!-- IF U_PM -->
-								<a href="{U_PM}" title="{L_PRIVATE_MESSAGE}"><span class="contact-icon pm-icon"></span></a>
-							<!-- ENDIF -->
-							<!-- IF U_EMAIL -->
-								<a href="{U_EMAIL}" title="{L_SEND_EMAIL_USER} {POST_AUTHOR}"><span class="contact-icon email-icon"></span></a>
-							<!-- ENDIF -->
-							<!-- IF U_JABBER -->
-								<a href="{U_JABBER}" onclick="popup(this.href, 550, 320); return false;" title="{L_JABBER}"><span class="contact-icon jabber-icon"></span></a>
-							<!-- ENDIF -->
-							<!-- BEGIN custom_fields -->
-								<!-- IF custom_fields.S_PROFILE_CONTACT -->
-									<a href="<!-- IF postrow.custom_fields.PROFILE_FIELD_CONTACT -->{custom_fields.PROFILE_FIELD_CONTACT}<!-- ELSE -->{U_POST_AUTHOR}<!-- ENDIF -->" title="{custom_fields.PROFILE_FIELD_NAME}">
-										<span class="contact-icon {custom_fields.PROFILE_FIELD_IDENT}-icon"></span>
-									</a>
+							<div>
+								<!-- EVENT ucp_pm_viewmessage_contact_fields_before -->
+								<!-- IF U_PM -->
+									<!-- DEFINE $CNT = definition.CNT + 1 -->
+									<a <!-- IF $CNT % 4 == 0 -->class="last-cell" <!-- ENDIF -->href="{U_PM}" title="{L_PRIVATE_MESSAGE}"><span class="contact-icon pm-icon"></span></a>
 								<!-- ENDIF -->
-							<!-- END custom_fields -->
-							<!-- EVENT ucp_pm_viewmessage_contact_fields_after -->
+								<!-- IF U_EMAIL -->
+									<!-- DEFINE $CNT = definition.CNT + 1 -->
+									<a <!-- IF $CNT % 4 == 0 -->class="last-cell" <!-- ENDIF -->href="{U_EMAIL}" title="{L_SEND_EMAIL_USER} {POST_AUTHOR}"><span class="contact-icon email-icon"></span></a>
+								<!-- ENDIF -->
+								<!-- IF U_JABBER -->
+									<!-- DEFINE $CNT = definition.CNT + 1 -->
+									<a <!-- IF $CNT % 4 == 0 -->class="last-cell" <!-- ENDIF -->href="{U_JABBER}" onclick="popup(this.href, 550, 320); return false;" title="{L_JABBER}"><span class="contact-icon jabber-icon"></span></a>
+								<!-- ENDIF -->
+								<!-- BEGIN custom_fields -->
+									<!-- IF custom_fields.S_PROFILE_CONTACT -->
+										<!-- DEFINE $CNT = definition.CNT + 1 -->
+										<!-- IF $CNT % 5 == 0 --><div><!-- ENDIF -->
+										<a <!-- IF $CNT % 4 == 0 -->class="last-cell" <!-- ENDIF -->href="<!-- IF postrow.custom_fields.PROFILE_FIELD_CONTACT -->{custom_fields.PROFILE_FIELD_CONTACT}<!-- ELSE -->{U_POST_AUTHOR}<!-- ENDIF -->" title="{custom_fields.PROFILE_FIELD_NAME}">
+											<span class="contact-icon {custom_fields.PROFILE_FIELD_IDENT}-icon"></span>
+										</a>
+										<!-- IF $CNT % 4 == 0 --></div><!-- ENDIF -->
+									<!-- ENDIF -->
+								<!-- END custom_fields -->
+								<!-- EVENT ucp_pm_viewmessage_contact_fields_after -->
+							<!-- IF $CNT % 4 != 0 --></div><!-- ENDIF -->
 						</div>
 					</div>
 				</div>
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index d9e800d1e6..cf66c5b34c 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -144,29 +144,38 @@
 		<!-- EVENT viewtopic_body_postrow_custom_fields_after -->
 
 		<!-- IF not S_IS_BOT and (postrow.U_PM or postrow.U_EMAIL or postrow.U_JABBER) -->
+			<!-- DEFINE $CNT = 0 -->
 			<dd class="profile-contact">
 				<strong>{L_CONTACT_USER}{L_COLON}</strong>
-				<div class="dropdown-container">
-					<a href="#" class="dropdown-trigger">Trigger</a>
+				<div class="dropdown-container dropdown-left">
+					<a href="#" class="dropdown-trigger"><span class="imageset icon_contact"></span></a>
 					<div class="dropdown hidden">
 						<div class="pointer"><div class="pointer-inner"></div></div>
 						<div class="dropdown-contents contact-icons">
-							<!-- IF postrow.U_PM -->
-								<a href="{postrow.U_PM}" title="{L_PRIVATE_MESSAGE}"><span class="contact-icon pm-icon"></span></a>
-							<!-- ENDIF -->
-							<!-- IF postrow.U_EMAIL -->
-								<a href="{postrow.U_EMAIL}" title="{L_SEND_EMAIL_USER} {postrow.POST_AUTHOR}"><span class="contact-icon email-icon"></span></a>
-							<!-- ENDIF -->
-							<!-- IF postrow.U_JABBER -->
-								<a href="{postrow.U_JABBER}" onclick="popup(this.href, 550, 320); return false;" title="{L_JABBER}"><span class="contact-icon jabber-icon"></span></a>
-							<!-- ENDIF -->
-							<!-- BEGIN custom_fields -->
-								<!-- IF postrow.custom_fields.S_PROFILE_CONTACT -->
-									<a href="<!-- IF postrow.custom_fields.PROFILE_FIELD_CONTACT -->{postrow.custom_fields.PROFILE_FIELD_CONTACT}<!-- ELSE -->{postrow.U_POST_AUTHOR}<!-- ENDIF -->" title="{postrow.custom_fields.PROFILE_FIELD_NAME}">
-										<span class="contact-icon {postrow.custom_fields.PROFILE_FIELD_IDENT}-icon"></span>
-									</a>
+							<div>
+								<!-- IF postrow.U_PM -->
+									<!-- DEFINE $CNT = definition.CNT + 1 -->
+									<a <!-- IF $CNT % 4 == 0 -->class="last-cell" <!-- ENDIF -->href="{postrow.U_PM}" title="{L_PRIVATE_MESSAGE}"><span class="contact-icon pm-icon"></span></a>
 								<!-- ENDIF -->
-							<!-- END custom_fields -->
+								<!-- IF postrow.U_EMAIL -->
+									<!-- DEFINE $CNT = definition.CNT + 1 -->
+									<a <!-- IF $CNT % 4 == 0 -->class="last-cell" <!-- ENDIF -->href="{postrow.U_EMAIL}" title="{L_SEND_EMAIL_USER} {postrow.POST_AUTHOR}"><span class="contact-icon email-icon"></span></a>
+								<!-- ENDIF -->
+								<!-- IF postrow.U_JABBER -->
+									<!-- DEFINE $CNT = definition.CNT + 1 -->
+									<a <!-- IF $CNT % 4 == 0 -->class="last-cell" <!-- ENDIF -->href="{postrow.U_JABBER}" onclick="popup(this.href, 550, 320); return false;" title="{L_JABBER}"><span class="contact-icon jabber-icon"></span></a>
+								<!-- ENDIF -->
+								<!-- BEGIN custom_fields -->
+									<!-- IF postrow.custom_fields.S_PROFILE_CONTACT -->
+										<!-- DEFINE $CNT = definition.CNT + 1 -->
+										<!-- IF $CNT % 5 == 0 --><div><!-- ENDIF -->
+										<a <!-- IF $CNT % 4 == 0 -->class="last-cell" <!-- ENDIF -->href="<!-- IF postrow.custom_fields.PROFILE_FIELD_CONTACT -->{postrow.custom_fields.PROFILE_FIELD_CONTACT}<!-- ELSE -->{postrow.U_POST_AUTHOR}<!-- ENDIF -->" title="{postrow.custom_fields.PROFILE_FIELD_NAME}">
+											<span class="contact-icon {postrow.custom_fields.PROFILE_FIELD_IDENT}-icon"></span>
+										</a>
+										<!-- IF $CNT % 4 == 0 --></div><!-- ENDIF -->
+									<!-- ENDIF -->
+								<!-- END custom_fields -->
+							<!-- IF $CNT % 4 != 0 --></div><!-- ENDIF -->
 						</div>
 					</div>
 				</div>
diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css
index b17903c958..4a243392ee 100644
--- a/phpBB/styles/prosilver/theme/buttons.css
+++ b/phpBB/styles/prosilver/theme/buttons.css
@@ -254,14 +254,10 @@ ul.profile-icons.responsive a.responsive-menu-link:before {
 	padding: 8px;
 }
 
-.contact-icons a:nth-child(4) {
+.contact-icons .last-cell {
 	border-right: none;
 }
 
-.contact-icons a:nth-child(5) {
-	clear: left;
-}
-
 .contact-icons div:last-child a {
 	border-bottom: none;
 }
diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css
index 6d39e675ce..998b139262 100644
--- a/phpBB/styles/prosilver/theme/content.css
+++ b/phpBB/styles/prosilver/theme/content.css
@@ -735,6 +735,15 @@ dd.profile-contact {
 	overflow: visible;
 }
 
+.profile-contact .dropdown-container {
+	display: inline-block;
+	width: 30px;
+}
+
+.profile-contact .icon_contact {
+	vertical-align: middle;
+}
+
 .online {
 	background-image: none;
 	background-position: 100% 0;
diff --git a/phpBB/styles/prosilver/theme/images/icon_contact.png b/phpBB/styles/prosilver/theme/images/icon_contact.png
new file mode 100644
index 0000000000..04e4d9ad17
--- /dev/null
+++ b/phpBB/styles/prosilver/theme/images/icon_contact.png
diff --git a/phpBB/styles/prosilver/theme/imageset.css b/phpBB/styles/prosilver/theme/imageset.css
index e6d306c7fd..6bc345889e 100644
--- a/phpBB/styles/prosilver/theme/imageset.css
+++ b/phpBB/styles/prosilver/theme/imageset.css
@@ -356,13 +356,14 @@ span.imageset {
 	padding-top: 20px;
 }
 
+.imageset.icon_contact {
+	background-image: url("./images/icon_contact.png");
+	padding-left: 16px;
+	padding-top: 12px;
+}
+
 
 /* English images for fallback */
-.imageset.icon_contact_pm {
-	background-image: url("./en/icon_contact_pm.gif");
-	padding-left: 28px;
-	padding-top: 20px;
-}
 .imageset.icon_post_edit {
 	background-image: url("./en/icon_post_edit.gif");
 	padding-left: 42px;