diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
index efc45e1af8..6cc70c4225 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
@@ -35,18 +35,6 @@
 
 
 		<!-- IF U_PM or U_EMAIL or U_JABBER -->
-			{% set CELL_BREAK = {1: 1, 2: 1, 3: 2, 4: 2, 5: 3, 6: 3, 7: 4, 8: 4, 9: 5, 10: 5, 11: 4, 12: 4, 13: 5, 14: 5, 16: 4} %}
-			{% set CONTACT_CNT = 0 %}
-			{% set CNT = 0 %}
-			<!-- IF U_PM -->{% set CONTACT_CNT = CONTACT_CNT + 1 %}<!-- ENDIF -->
-			<!-- IF U_EMAIL -->{% set CONTACT_CNT = CONTACT_CNT + 1 %}<!-- ENDIF -->
-			<!-- IF U_JABBER -->{% set CONTACT_CNT = CONTACT_CNT + 1 %}<!-- ENDIF -->
-
-			<!-- BEGIN custom_fields -->
-				<!-- IF custom_fields.S_PROFILE_CONTACT -->{% set CONTACT_CNT = CONTACT_CNT + 1 %}<!-- ENDIF -->
-			<!-- END custom_fields -->
-			<!-- IF CELL_BREAK[CONTACT_CNT] -->{% set DIV_CNT = CELL_BREAK[CONTACT_CNT] %}<!-- ELSE -->{% set DIV_CNT = 4 %}<!-- ENDIF -->
-			
 			<dd class="profile-contact">
 				<strong>{L_CONTACT_USER}{L_COLON}</strong>
 				<div class="dropdown-container">
@@ -54,32 +42,24 @@
 					<div class="dropdown hidden">
 						<div class="pointer"><div class="pointer-inner"></div></div>
 						<div class="dropdown-contents contact-icons">
-							<div>
 							<!-- EVENT ucp_pm_viewmessage_contact_fields_before -->
 							<!-- IF U_PM -->
-								{% set CNT = CNT + 1 %}
 								<a href="{U_PM}" title="{L_PRIVATE_MESSAGE}"><span class="contact-icon pm-icon"></span></a>
 							<!-- ENDIF -->
 							<!-- IF U_EMAIL -->
-								{% set CNT = CNT + 1 %}
 								<a href="{U_EMAIL}" title="{L_SEND_EMAIL_USER} {POST_AUTHOR}"><span class="contact-icon email-icon"></span></a>
 							<!-- ENDIF -->
 							<!-- IF U_JABBER -->
-								{% set CNT = CNT + 1 %}
-								<a <!-- IF CNT % DIV_CNT == 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>
-								<!-- IF (CNT % DIV_CNT == 0) && CNT != CONTACT_CNT --></div><div><!-- ENDIF -->
+								<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 -->
-									{% set CNT = CNT + 1 %}
-									<a <!-- IF CNT % DIV_CNT == 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}">
+									<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>
-									<!-- IF (CNT % DIV_CNT == 0) && CNT != CONTACT_CNT --></div><div><!-- ENDIF -->
 								<!-- ENDIF -->
 							<!-- END custom_fields -->
 							<!-- EVENT ucp_pm_viewmessage_contact_fields_after -->
-							</div>
 						</div>
 					</div>
 				</div>
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index b528fc18a5..d9e800d1e6 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -144,17 +144,6 @@
 		<!-- EVENT viewtopic_body_postrow_custom_fields_after -->
 
 		<!-- IF not S_IS_BOT and (postrow.U_PM or postrow.U_EMAIL or postrow.U_JABBER) -->
-			{% set CELL_BREAK = {1: 1, 2: 1, 3: 2, 4: 2, 5: 3, 6: 3, 7: 4, 8: 4, 9: 5, 10: 5, 11: 4, 12: 4, 13: 5, 14: 5, 16: 4} %}
-			{% set CONTACT_CNT = 0 %}
-			{% set CNT = 0 %}
-			<!-- IF postrow.U_PM -->{% set CONTACT_CNT = CONTACT_CNT + 1 %}<!-- ENDIF -->
-			<!-- IF postrow.U_EMAIL -->{% set CONTACT_CNT = CONTACT_CNT + 1 %}<!-- ENDIF -->
-			<!-- IF postrow.U_JABBER -->{% set CONTACT_CNT = CONTACT_CNT + 1 %}<!-- ENDIF -->
-			<!-- BEGIN custom_fields -->
-				<!-- IF postrow.custom_fields.S_PROFILE_CONTACT -->{% set CONTACT_CNT = CONTACT_CNT + 1 %}<!-- ENDIF -->
-			<!-- END custom_fields -->
-			<!-- IF CELL_BREAK[CONTACT_CNT] -->{% set DIV_CNT = CELL_BREAK[CONTACT_CNT] %}<!-- ELSE -->{% set DIV_CNT = 4 %}<!-- ENDIF -->
-			
 			<dd class="profile-contact">
 				<strong>{L_CONTACT_USER}{L_COLON}</strong>
 				<div class="dropdown-container">
@@ -162,30 +151,22 @@
 					<div class="dropdown hidden">
 						<div class="pointer"><div class="pointer-inner"></div></div>
 						<div class="dropdown-contents contact-icons">
-							<div>
 							<!-- IF postrow.U_PM -->
-								{% set CNT = CNT + 1 %}
 								<a href="{postrow.U_PM}" title="{L_PRIVATE_MESSAGE}"><span class="contact-icon pm-icon"></span></a>
 							<!-- ENDIF -->
 							<!-- IF postrow.U_EMAIL -->
-								{% set CNT = CNT + 1 %}
 								<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 -->
-								{% set CNT = CNT + 1 %}
-								<a <!-- IF CNT % DIV_CNT == 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>
-								<!-- IF (CNT % DIV_CNT == 0) && CNT != CONTACT_CNT --></div><div><!-- ENDIF -->
+								<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 -->
-									{% set CNT = CNT + 1 %}
-									<a <!-- IF CNT % DIV_CNT == 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}">
+									<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>
-									<!-- IF (CNT % DIV_CNT == 0) && CNT != CONTACT_CNT --></div><div><!-- ENDIF -->
 								<!-- ENDIF -->
 							<!-- END custom_fields -->
-							</div>
 						</div>
 					</div>
 				</div>
diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css
index 7f271ee648..b17903c958 100644
--- a/phpBB/styles/prosilver/theme/buttons.css
+++ b/phpBB/styles/prosilver/theme/buttons.css
@@ -254,12 +254,16 @@ ul.profile-icons.responsive a.responsive-menu-link:before {
 	padding: 8px;
 }
 
-.contact-icons div:last-child a {
-	border-bottom: none;
+.contact-icons a:nth-child(4) {
+	border-right: none;
 }
 
-.contact-icons .last-cell {
-	border-right: none;
+.contact-icons a:nth-child(5) {
+	clear: left;
+}
+
+.contact-icons div:last-child a {
+	border-bottom: none;
 }