3 files changed, 23 insertions, 20 deletions
diff --git a/skins/larry/mail.css b/skins/larry/mail.css
index 3ec14568f..5bcada438 100644
--- a/skins/larry/mail.css
+++ b/skins/larry/mail.css
@@ -1274,23 +1274,6 @@ div.message-partheaders .headers-table td.header {
 	bottom: 0;
 }
 
-#composequicksearch {
-	position: relative;
-	padding: 4px;
-	background: #c7e3ef;
-}
-
-#composequicksearch .searchbox input {
-	width: 100%;
-	height: 26px;
-	-moz-box-sizing: border-box;
-	box-sizing: border-box;
-}
-
-#composequicksearch #searchmenulink {
-	width: 15px;
-}
-
 #compose-contacts #directorylist {
 	border-bottom: 4px solid #c7e3ef;
 }
diff --git a/skins/larry/styles.css b/skins/larry/styles.css
index 580b20f1a..106279828 100644
--- a/skins/larry/styles.css
+++ b/skins/larry/styles.css
@@ -433,11 +433,17 @@ a.iconbutton.disabled {
 	cursor: default;
 }
 
+a.iconbutton.searchicon,
 a.iconbutton.searchoptions {
 	width: 24px;
 	background-position: -2px -317px;
 }
 
+a.iconbutton.searchicon,
+a.iconbutton.searchoptions {
+	width: 15px;
+}
+
 a.iconbutton.reset {
 	width: 24px;
 	background-position: -25px -317px;
@@ -1857,6 +1863,7 @@ ul.proplist li {
 	font-size: 11px;
 }
 
+.searchbox .searchicon,
 .searchbox #searchmenulink,
 #quicksearchbar #searchmenulink {
 	position: absolute;
@@ -1865,12 +1872,25 @@ ul.proplist li {
 }
 
 .searchbox #searchreset,
+.searchbox .iconbutton.reset,
 #quicksearchbar #searchreset {
 	position: absolute;
 	top: 4px;
 	right: 1px;
 }
 
+.listsearchbox {
+	position: relative;
+	padding: 4px;
+	background: #c7e3ef;
+}
+
+.listsearchbox input {
+	width: 100%;
+	height: 26px;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+}
 
 /*** toolbar ***/
 
diff --git a/skins/larry/templates/compose.html b/skins/larry/templates/compose.html
index d0338292b..90df4f3a8 100644
--- a/skins/larry/templates/compose.html
+++ b/skins/larry/templates/compose.html
@@ -42,11 +42,11 @@
 <!-- inline address book -->
 <div id="compose-contacts" class="uibox listbox">
 <h2 class="boxtitle"><roundcube:label name="contacts" /></h2>
-	<div id="composequicksearch">
+	<div class="listsearchbox">
 		<div class="searchbox">
 			<roundcube:object name="searchform" id="contactsearchbox" />
-			<a id="searchmenulink" class="iconbutton searchoptions"> </a>
-			<roundcube:button command="reset-search" id="searchreset" class="iconbutton reset" title="resetsearch" content=" " />
+			<a id="searchmenulink" class="iconbutton searchicon"> </a>
+			<roundcube:button command="reset-search" class="iconbutton reset" title="resetsearch" content=" " />
 		</div>
 	</div>
 	<roundcube:object name="addressbooks" id="directorylist" class="listing" />