6 files changed, 30 insertions, 18 deletions
diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css
index 542440e847..b04e6576d3 100644
--- a/phpBB/styles/prosilver/theme/bidi.css
+++ b/phpBB/styles/prosilver/theme/bidi.css
@@ -231,6 +231,11 @@
 	unicode-bidi: embed;
 }
 
+ul.linklist li.small-icon > a, ul.linklist li.breadcrumbs span:first-child > a {
+	padding-left: 0;
+	padding-right: 19px;
+}
+
 .rtl a.top {
 	float: left;
 }
@@ -527,10 +532,13 @@
 
 /* Icon images
 ---------------------------------------- */
-.rtl .sitehome, .rtl .icon-faq, .rtl .icon-members, .rtl .icon-home, .rtl .icon-ucp, .rtl .icon-register, .rtl .icon-logout,
-.rtl .icon-bookmark, .rtl .icon-bump, .rtl .icon-subscribe, .rtl .icon-unsubscribe, .rtl .icon-pages, .rtl .icon-search, .rtl .icon-notification, .rtl .icon-pm {
+.rtl .small-icon {
 	background-position: 100% 50%;
-	padding: 1px 17px 0 0;
+	padding: 1px 19px 0 0;
+}
+
+.rtl ul.linklist li.small-icon {
+	padding-right: 0;
 }
 
 /* Poster profile icons
diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css
index 33f924717a..cdd325fb13 100644
--- a/phpBB/styles/prosilver/theme/buttons.css
+++ b/phpBB/styles/prosilver/theme/buttons.css
@@ -90,23 +90,19 @@ a.sendemail {
 
 /* Icon images
 ---------------------------------------- */
-.sitehome, .icon-faq, .icon-members, .icon-home, .icon-ucp, .icon-register, .icon-logout,
-.icon-bookmark, .icon-bump, .icon-subscribe, .icon-unsubscribe, .icon-pages, .icon-search, .icon-notification, .icon-pm {
+.small-icon {
 	background-position: 0 50%;
 	background-repeat: no-repeat;
 	background-image: none;
 	padding: 1px 0 0 17px;
 }
 
-ul.linklist.bulletin li.icon-home:before, ul.linklist.bulletin li.icon-ucp:before, ul.linklist.bulletin li.icon-notification:before, ul.linklist.bulletin li.icon-pm:before,
-ul.linklist.bulletin li.icon-bookmark:before, ul.linklist.bulletin li.icon-bump:before, ul.linklist.bulletin li.icon-subscribe:before, ul.linklist.bulletin li.icon-unsubscribe:before {
-	display: none;
+ul.linklist li.small-icon {
+	padding-left: 0;
 }
 
-.icon-home > span:first-child > a, .icon-notification > a, .icon-pm > a {
-	display: inline-block;
-	margin-left: -17px;
-	padding-left: 17px;
+ul.linklist.bulletin li.small-icon:before {
+	display: none;
 }
 
 /* Poster profile icons
diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css
index d4e63bf3ec..55b01f1269 100644
--- a/phpBB/styles/prosilver/theme/colours.css
+++ b/phpBB/styles/prosilver/theme/colours.css
@@ -684,7 +684,6 @@ a.sendemail {
 
 /* Icon images
 ---------------------------------------- */
-.sitehome						{ background-image: url("./images/icon_home.gif"); }
 .icon-faq						{ background-image: url("./images/icon_faq.gif"); }
 .icon-members					{ background-image: url("./images/icon_members.gif"); }
 .icon-home						{ background-image: url("./images/icon_home.gif"); }
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 225673a932..dced25f541 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -631,6 +631,11 @@ table.info tbody th {
 	margin: 0 -1px;
 }
 
+#color_palette_placeholder table {
+	border-collapse: separate;
+	border-spacing: 1px;
+}
+
 /* Misc layout styles
 ---------------------------------------- */
 /* column[1-2] styles are containers for two column layouts
@@ -810,6 +815,8 @@ li.pagination ul {
 
 #darkenwrapper {
 	display: none;
+	position: relative;
+	z-index: 44;
 }
 
 #darken {
@@ -819,6 +826,7 @@ li.pagination ul {
 	width: 100%;
 	height: 100%;
 	opacity: 0.5;
+	z-index: 45;
 }
 
 #loading_indicator {
diff --git a/phpBB/styles/prosilver/theme/forms.css b/phpBB/styles/prosilver/theme/forms.css
index 1ee364ce93..755ce4a19d 100644
--- a/phpBB/styles/prosilver/theme/forms.css
+++ b/phpBB/styles/prosilver/theme/forms.css
@@ -235,11 +235,6 @@ fieldset.submit-buttons input {
 /* Posting page styles
 ----------------------------------------*/
 
-#colour_palette table {
-	border-collapse: separate;
-	border-spacing: 1px;
-}
-
 /* Buttons used in the editor */
 #format-buttons {
 	margin: 15px 0 2px 0;
diff --git a/phpBB/styles/prosilver/theme/links.css b/phpBB/styles/prosilver/theme/links.css
index 5dc8a13313..7e3dc094f0 100644
--- a/phpBB/styles/prosilver/theme/links.css
+++ b/phpBB/styles/prosilver/theme/links.css
@@ -43,6 +43,12 @@ a:active {
 	text-decoration: none;
 }
 
+/* Navigation bar links */
+ul.linklist li.small-icon > a, ul.linklist li.breadcrumbs span:first-child > a {
+	display: inline-block;
+	padding-left: 17px;
+}
+
 /* Links for forum/topic lists */
 a.forumtitle {
 	font-family: "Trebuchet MS", Helvetica, Arial, Sans-serif;