Better icon for deleting folders + remove hard-coded icon path

4 files changed, 2 insertions, 2 deletions

diff --git a/skins/default/images/icons/remove-attachment.png b/skins/default/images/icons/delete.png
index 8d496fe10..8d496fe10 100644
--- a/skins/default/images/icons/remove-attachment.png
+++ b/skins/default/images/icons/delete.png
diff --git a/skins/default/images/icons/trash.png b/skins/default/images/icons/trash.png
deleted file mode 100644
index 0712aaa71..000000000
--- a/skins/default/images/icons/trash.png
+++ /dev/null
diff --git a/skins/default/templates/compose.html b/skins/default/templates/compose.html
index d5abd47cc..3225b2895 100644
--- a/skins/default/templates/compose.html
+++ b/skins/default/templates/compose.html
@@ -93,7 +93,7 @@
 
 <div id="compose-attachments">
 <div id="attachment-title"><roundcube:label name="attachments" /></div>
-<roundcube:object name="composeAttachmentList" deleteIcon="/images/icons/remove-attachment.png"/ >
+<roundcube:object name="composeAttachmentList" deleteIcon="/images/icons/delete.png"/ >
 <p><roundcube:button command="add-attachment" imagePas="/images/buttons/add_pas.png" imageSel="/images/buttons/add_sel.png" imageAct="/images/buttons/add_act.png" width="23" height="18" title="addattachment" /></p>
 </div>
 
diff --git a/skins/default/templates/managefolders.html b/skins/default/templates/managefolders.html
index b886cf6fc..80f5df279 100644
--- a/skins/default/templates/managefolders.html
+++ b/skins/default/templates/managefolders.html
@@ -16,7 +16,7 @@
 <div id="folder-manager">
 <roundcube:object name="foldersubscription" form="subscriptionform" id="subscription-table"
   cellpadding="1" cellspacing="0" summary="Folder subscription table" class="records-table"
-  deleteIcon="/images/icons/trash.png"
+  deleteIcon="/images/icons/delete.png"
   renameIcon="/images/icons/rename.png" />
 </div>