Implemented using a single image to display all icons via CSS positioning of the image in a div.

1 files changed, 4 insertions, 11 deletions

diff --git a/roundcubemail/program/steps/settings/manage_folders.inc b/roundcubemail/program/steps/settings/manage_folders.inc
index 9affded98..c466bcd1e 100644
--- a/roundcubemail/program/steps/settings/manage_folders.inc
+++ b/roundcubemail/program/steps/settings/manage_folders.inc
@@ -213,15 +213,8 @@ function rcube_subscription_form($attrib)
     'onclick' => JS_OBJECT_NAME.".command(this.checked?'subscribe':'unsubscribe',this.value)",
   ));
   
-  if (!empty($attrib['deleteicon']))
-    $del_button = html::img(array('src' => $CONFIG['skin_path'] . $attrib['deleteicon'], 'alt' => rcube_label('delete')));
-  else
-    $del_button = rcube_label('delete');
-
-  if (!empty($attrib['renameicon']))
-    $edit_button = html::img(array('src' => $CONFIG['skin_path'] . $attrib['renameicon'], 'alt' => rcube_label('rename')));
-  else
-    $edit_button = rcube_label('rename');
+  $del_button = '<div class="icon-holder delete"></div>';
+  $edit_button = '<div class="icon-holder rename"></div>';
     
   // create list of available folders
   foreach ($list_folders as $i => $folder) {
@@ -245,8 +238,8 @@ function rcube_subscription_form($attrib)
     
     // add rename and delete buttons
     if (!$protected && !$folder['virtual']) {
-      $table->add('rename', html::a(array('href' => "#rename", 'title' => rcube_label('renamefolder')), $edit_button));
-      $table->add('delete', html::a(array('href' => "#delete", 'title' => rcube_label('deletefolder')), $del_button));
+      $table->add('rename', html::div('icon-holder rename', html::a(array('href' => "#rename", 'title' => rcube_label('renamefolder'), 'style' => 'display: block; width: 16px; height: 16px;'), '')));
+      $table->add('delete', html::div('icon-holder delete', html::a(array('href' => "#delete", 'title' => rcube_label('deletefolder'), 'style' => 'display: block; width: 16px; height: 16px;'), '')));
     }
     else {
       $table->add('rename', '&nbsp;');