diff --git a/program/js/app.js b/program/js/app.js
index 53a67c7ad..5fe97c9fd 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -959,7 +959,7 @@ function rcube_webmail()
       case 'send-attachment':
         // Reset the auto-save timer
         self.clearTimeout(this.save_timer);
-        
+
         this.upload_file(props || this.gui_objects.uploadform);
         break;
 
@@ -3443,8 +3443,9 @@ function rcube_webmail()
 
       if (this.env.loadingicon)
         content = '<img src="'+this.env.loadingicon+'" alt="" class="uploading" />'+content;
-      if (this.env.cancelicon)
-        content = '<a title="'+this.get_label('cancel')+'" onclick="return rcmail.cancel_attachment_upload(\''+ts+'\', \''+frame_name+'\');" href="#cancelupload" class="cancelupload"><img src="'+this.env.cancelicon+'" alt="" /></a>'+content;
+      content = '<a title="'+this.get_label('cancel')+'" onclick="return rcmail.cancel_attachment_upload(\''+ts+'\', \''+frame_name+'\');" href="#cancelupload" class="cancelupload">'
+        + (this.env.cancelicon ? '<img src="'+this.env.cancelicon+'" alt="" />' : this.get_label('cancel')) + '</a>' + content;
+
       this.add2attachment_list(ts, { name:'', html:content, classname:'uploading', complete:false });
 
       // upload progress support
diff --git a/skins/default/common.css b/skins/default/common.css
index 57fc1275a..3e8bee71a 100644
--- a/skins/default/common.css
+++ b/skins/default/common.css
@@ -556,6 +556,11 @@ body.iframe .boxtitle
   background-position: -74px 0;
 }
 
+img.uploading
+{
+  width: 16px;
+  height: 16px;
+}
 
 /***** common table settings ******/
 
diff --git a/skins/default/images/messageicons.gif b/skins/default/images/messageicons.gif
index 5c681e354..a914a955a 100644
Binary files a/skins/default/images/messageicons.gif and b/skins/default/images/messageicons.gif differ
diff --git a/skins/default/images/messageicons.png b/skins/default/images/messageicons.png
index 99038c732..ca7b23075 100644
Binary files a/skins/default/images/messageicons.png and b/skins/default/images/messageicons.png differ
diff --git a/skins/default/mail.css b/skins/default/mail.css
index b884eda87..a217b8571 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -204,7 +204,8 @@
   background-position: 7px -71px;
 }
 
-#markmessagemenu li a
+#markmessagemenu li a,
+#compose-attachments li a
 {
   background: url(images/messageicons.png) no-repeat;
 }
@@ -1469,9 +1470,29 @@ input.from_address
   -o-text-overflow: ellipsis;
 }
 
-#compose-attachments ul li img
+#compose-attachments li a
 {
-  padding-right: 2px;
+  text-indent: -1000px;
+  width: 17px;
+  display: block;
+  float: left;
+  text-decoration: none;
+}
+
+#compose-attachments li img
+{
+  vertical-align: middle;
+}
+
+#compose-attachments li a.delete,
+#compose-attachments li a.cancelupload
+{
+  background-position: 0px -392px;
+}
+
+#compose-attachments li span
+{
+  line-height: 18px;
   vertical-align: middle;
 }
 
diff --git a/skins/default/templates/compose.html b/skins/default/templates/compose.html
index 285a783a1..adb0949c1 100644
--- a/skins/default/templates/compose.html
+++ b/skins/default/templates/compose.html
@@ -43,7 +43,7 @@
 <div id="compose-attachments">
 <div class="boxtitle"><roundcube:label name="attachments" /></div>
 <div class="boxlistcontent">
-    <roundcube:object name="composeAttachmentList" deleteIcon="/images/icons/delete.png" cancelIcon="/images/icons/delete.png" loadingIcon="/images/display/loading_blue.gif" />
+    <roundcube:object name="composeAttachmentList" id="attachmentslist" loadingIcon="/images/display/loading_blue.gif" />
 </div>
 <div class="boxfooter">
   <roundcube:button name="uploadmenulink" id="uploadmenulink" type="link" title="addattachment" class="button addgroup" onclick="rcmail_ui.show_popup('uploadmenu', true);return false" content=" " />
diff --git a/skins/larry/templates/compose.html b/skins/larry/templates/compose.html
index a4c9fc10d..a2263dae4 100644
--- a/skins/larry/templates/compose.html
+++ b/skins/larry/templates/compose.html
@@ -155,7 +155,7 @@
 		<div style="text-align:center; margin-bottom:20px">
 			<roundcube:button name="addattachment" type="input" class="button" classSel="button pressed" label="addattachment" onclick="UI.show_uploadform();return false" tabindex="10" />
 		</div>
-		<roundcube:object name="composeAttachmentList" id="attachment-list" class="attachmentslist" cancelIcon="/images/0.gif" />
+		<roundcube:object name="composeAttachmentList" id="attachment-list" class="attachmentslist" />
 	</div>
 </div>