Index: skins/larry/includes/mailtoolbar.html
===================================================================
--- skins/larry/includes/mailtoolbar.html	(revision a4be516f688d934699dd40f39d7f4f9eaa1ce1eb)
+++ skins/larry/includes/mailtoolbar.html	(revision af05fecf245cc1bdeee0f6a1ee32559add539134)
@@ -43,10 +43,10 @@
 
 <div id="messagemenu" class="popupmenu">
-  <ul class="toolbarmenu iconized">
-	<li><roundcube:button command="print" label="printmessage" class="printlink" classAct="printlink active" /></li>
-	<li><roundcube:button command="download" label="emlsave" class="downloadlink" classAct="downloadlink active" /></li>
-	<li><roundcube:button command="edit" label="editasnew" class="editlink" classAct="editlink active" /></li>
-	<li><roundcube:button command="viewsource" label="viewsource" class="sourcelink" classAct="sourcelink active" /></li>
-	<li><roundcube:button command="open" label="openinextwin" target="_blank" class="openlink" classAct="openlink active" /></li>
+  <ul class="toolbarmenu">
+	<li><roundcube:button command="print" label="printmessage" class="icon" classAct="icon active" innerclass="icon print" /></li>
+	<li><roundcube:button command="download" label="emlsave" class="icon" classAct="icon active" innerclass="icon download" /></li>
+	<li><roundcube:button command="edit" label="editasnew" class="icon" classAct="icon active" innerclass="icon edit" /></li>
+	<li><roundcube:button command="viewsource" label="viewsource" class="icon" classAct="icon active" innerclass="icon viewsource" /></li>
+	<li><roundcube:button command="open" label="openinextwin" target="_blank" class="icon" classAct="icon active" innerclass="icon extwin" /></li>
 	<roundcube:container name="messagemenu" id="messagemenu" />
   </ul>
@@ -55,9 +55,9 @@
 <roundcube:if condition="template:name == 'mail'" />
 <div id="markmessagemenu" class="popupmenu">
-  <ul class="toolbarmenu iconized">
-	<li><roundcube:button command="mark" prop="read" label="markread" classAct="readlink active" class="readlink" /></li>
-	<li><roundcube:button command="mark" prop="unread" label="markunread" classAct="unreadlink active" class="unreadlink" /></li>
-	<li><roundcube:button command="mark" prop="flagged" label="markflagged" classAct="flaggedlink active" class="flaggedlink" /></li>
-	<li><roundcube:button command="mark" prop="unflagged" label="markunflagged" classAct="unflaggedlink active" class="unflaggedlink" /></li>
+  <ul class="toolbarmenu">
+	<li><roundcube:button command="mark" prop="read" label="markread" classAct="icon active" class="icon" innerclass="icon read" /></li>
+	<li><roundcube:button command="mark" prop="unread" label="markunread" classAct="icon active" class="icon" innerclass="icon unread" /></li>
+	<li><roundcube:button command="mark" prop="flagged" label="markflagged" classAct="icon active" class="icon" innerclass="icon flagged" /></li>
+	<li><roundcube:button command="mark" prop="unflagged" label="markunflagged" classAct="icon active" class="icon" innerclass="icon unflagged" /></li>
 	<roundcube:container name="markmenu" id="markmessagemenu" />
   </ul>
Index: skins/larry/mail.css
===================================================================
--- skins/larry/mail.css	(revision 74d4c7f9ada668d0bf53361a407b00be7d10488c)
+++ skins/larry/mail.css	(revision af05fecf245cc1bdeee0f6a1ee32559add539134)
@@ -957,4 +957,12 @@
 }
 
+#compose-contacts {
+	position: absolute;
+	top: 42px;
+	left: 0;
+	width: 100%;
+	bottom: 0;
+}
+
 #compose-content {
 	position: absolute;
Index: skins/larry/styles.css
===================================================================
--- skins/larry/styles.css	(revision 74d4c7f9ada668d0bf53361a407b00be7d10488c)
+++ skins/larry/styles.css	(revision af05fecf245cc1bdeee0f6a1ee32559add539134)
@@ -245,12 +245,20 @@
 
 .pagenav a.pageup span.inner {
+	background-position: -7px -241px;
+}
+
+.pagenav a.pagedown span.inner {
+	background-position: -29px -241px;
+}
+
+.pagenav a.reply span.inner {
 	background-position: -7px -256px;
 }
 
-.pagenav a.pagedown span.inner {
+.pagenav a.forward span.inner {
 	background-position: -29px -256px;
 }
 
-.pagenav a.viewsource span.inner {
+.pagenav a.replyall span.inner {
 	background-position: -7px -271px;
 }
@@ -856,4 +864,15 @@
 	background: -ms-linear-gradient(top, rgba(249,249,249,1) 0%,rgba(226,226,226,1) 100%);
 	background: linear-gradient(top, rgba(249,249,249,1) 0%,rgba(226,226,226,1) 100%);
+	box-shadow: inset 0 1px 0 0 #fff;
+	-moz-box-shadow: inset 0 1px 0 0 #fff;
+	-webkit-box-shadow: inset 0 1px 0 0 #fff;
+	-o-box-shadow: inset 0 1px 0 0 #fff;
+}
+
+#login-form input.button:hover {
+	box-shadow: 0 0 5px 2px rgba(71,135,177, 0.6), inset 0 1px 0 0 #fff;
+	-moz-box-shadow: 0 0 5px 2px rgba(71,135,177, 0.6), inset 0 1px 0 0 #fff;
+	-webkit-box-shadow: 0 0 5px 2px rgba(71,135,177, 0.6), inset 0 1px 0 0 #fff;
+	-o-box-shadow: 0 0 5px 2px rgba(71,135,177, 0.6), inset 0 1px 0 0 #fff;
 }
 
@@ -1103,8 +1122,4 @@
 }
 
-ul.toolbarmenu.iconized li a {
-	padding-left: 28px;
-}
-
 ul.toolbarmenu li label {
 	display: block;
@@ -1112,4 +1127,59 @@
 	padding: 4px 8px;
 	text-shadow: 0px 1px 1px #333;
+}
+
+ul.toolbarmenu li a.icon {
+	color: #eee;
+	padding: 2px 6px;
+}
+
+ul.toolbarmenu li span.icon {
+	display: block;
+	min-height: 14px;
+	padding: 4px 4px 4px 24px;
+	background-image: url(images/listicons.png);
+	background-position: -100px 0;
+	background-repeat: no-repeat;
+	opacity: 0.2;
+}
+
+ul.toolbarmenu li a.active span.icon {
+	opacity: 0.99;
+}
+
+ul.toolbarmenu li span.read {
+	background-position: 0 -1220px;
+}
+
+ul.toolbarmenu li span.unread {
+	background-position: 0 -1196px;
+}
+
+ul.toolbarmenu li span.flagged {
+	background-position: 0 -1244px;
+}
+
+ul.toolbarmenu li span.unflagged {
+	background-position: 0 -1268px;
+}
+
+ul.toolbarmenu li span.print {
+	background-position: 0 -1436px;
+}
+
+ul.toolbarmenu li span.download {
+	background-position: 0 -1412px;
+}
+
+ul.toolbarmenu li span.edit {
+	background-position: 0 -1388px;
+}
+
+ul.toolbarmenu li span.viewsource {
+	background-position: 0 -1460px;
+}
+
+ul.toolbarmenu li span.extwin {
+	background-position: 0 -1484px;
 }
 
Index: skins/larry/templates/compose.html
===================================================================
--- skins/larry/templates/compose.html	(revision 74d4c7f9ada668d0bf53361a407b00be7d10488c)
+++ skins/larry/templates/compose.html	(revision af05fecf245cc1bdeee0f6a1ee32559add539134)
@@ -15,4 +15,13 @@
 
 <!-- inline address book -->
+<div id="compose-contacts" class="uibox listbox">
+<h2 class="boxtitle"><roundcube:label name="contacts" /></h2>
+<div class="scroller withfooter">
+	
+</div>
+<div class="boxfooter">
+	
+</div>
+</div>
 
 </div>
Index: skins/larry/templates/messagepreview.html
===================================================================
--- skins/larry/templates/messagepreview.html	(revision b540ed15a30cd9379df7feb62b0ae81a8a111e9c)
+++ skins/larry/templates/messagepreview.html	(revision af05fecf245cc1bdeee0f6a1ee32559add539134)
@@ -14,6 +14,9 @@
 <!-- record navigation -->
 <div id="countcontrols" class="pagenav">
+	<roundcube:button command="reply" type="link" class="button reply" classSel="button reply pressed" innerClass="inner" title="replytomessage" content="&lt;-" />
+	<roundcube:button command="replyall" type="link" class="button replyall" classSel="button replyall pressed" innerClass="inner" title="replytoallmessage" content="&lt;&lt;-" />
+	<roundcube:button command="forward" type="link" class="button forward" classSel="button forward pressed" innerClass="inner" title="forwardmessage" content="-&gt;" />
+	&nbsp;
 	<roundcube:button command="permaurl" type="link" class="button extwin" classSel="button extwin pressed" innerClass="inner" title="openinextwin" content="[]" target="_blank" />
-	<roundcube:button command="viewsource" type="link" class="button viewsource" classSel="button extwin pressed" innerClass="inner" title="viewsource" content="&lt;&gt;" />
 <!--
 	&nbsp;