4 files changed, 11 insertions, 22 deletions
diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css
index 53cffcbfe8..d600e76b44 100644
--- a/phpBB/styles/prosilver/theme/buttons.css
+++ b/phpBB/styles/prosilver/theme/buttons.css
@@ -85,7 +85,7 @@
 	font-size: 0;
 }
 
-.tools-icon:before, .modtools-icon:before, .search-adv-icon:before {
+.tools-icon:before, .modtools-icon:before, .search-icon:before, .search-adv-icon:before {
 	background-position: -80px 0;
 	height: 16px;
 	margin-top: 2px;
@@ -95,8 +95,11 @@
 .dropdown-visible .tools-icon:before,
 .nojs .dropdown-container:hover .tools-icon:before			{ background-position: -80px -20px; }
 
-.search-adv-icon:before										{ background-position: -245px 0; }
-.search-adv-icon:hover:before								{ background-position: -245px -20px; }
+.search-icon:before											{ background-position: -245px 0; }
+.search-icon:hover:before									{ background-position: -245px -20px; }
+
+.search-adv-icon:before										{ background-position: -265px 0; }
+.search-adv-icon:hover:before								{ background-position: -265px -20px; }
 
 .modtools-icon:before										{ background-position: -225px 0; }
 .dropdown-visible .modtools-icon:before,
diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css
index dccb58c579..3d6914dd47 100644
--- a/phpBB/styles/prosilver/theme/colours.css
+++ b/phpBB/styles/prosilver/theme/colours.css
@@ -33,20 +33,13 @@ hr {
 	box-shadow: 0 0 10px #0075B0;
 }
 
-#search-box .inputbox:hover,
-#search-box .inputbox:focus,
-#search-box .button:hover {
+.search-box .inputbox,
+.search-box .inputbox:hover,
+.search-box .inputbox:focus,
+.search-box .button:hover {
 	border-color: #C7C3BF;
 }
 
-.search-box .inputbox {
-	border-color: #C7C3BF;
-}
-
-.search-box button.search-icon:before {
-	background-image: url("./images/icon_textbox_search.gif");
-}
-
 /* Round cornered boxes and backgrounds
 ---------------------------------------- */
 #wrap {
diff --git a/phpBB/styles/prosilver/theme/forms.css b/phpBB/styles/prosilver/theme/forms.css
index ebed6d72eb..64773f036e 100644
--- a/phpBB/styles/prosilver/theme/forms.css
+++ b/phpBB/styles/prosilver/theme/forms.css
@@ -380,14 +380,7 @@ input.button1:focus, input.button2:focus, input.button3:focus {
 	font-size: 0;
 	height: 24px;
 	margin: 0;
-	padding: 3px;
-	position: relative;
-}
-
-.search-box button.search-icon:before {
-	margin: 0 3px;
-	height: 14px;
-	width: 16px;
+	padding: 3px 5px;
 }
 
 .search-box a.button {
diff --git a/phpBB/styles/prosilver/theme/images/icons_button.png b/phpBB/styles/prosilver/theme/images/icons_button.png
index 2b40e4f3ea..50ac8994de 100644
--- a/phpBB/styles/prosilver/theme/images/icons_button.png
+++ b/phpBB/styles/prosilver/theme/images/icons_button.png