diff --git a/html/themes/breezy/lists.css b/html/themes/breezy/lists.css
index b9f0569f6fe4e16058112f5320e2f17951b36d30..4617e55ef978c45694aaa9bfd9c8c99ceab92b99 100644
--- a/html/themes/breezy/lists.css
+++ b/html/themes/breezy/lists.css
@@ -93,7 +93,7 @@ border-left: 1px solid #C0C2C3;
 
 table.listingTable > tbody > tr td > input[type=image],
 table.listingTable > tbody > tr td > img {
-padding: 1px;
+padding: 2px;
 }
 
 table.listingTable > tbody > tr td > a:link {
diff --git a/html/themes/legacy/lists.css b/html/themes/legacy/lists.css
index 2be1dbbb22805dbd7f9c2cc421af006a710d2dde..680397b2d94d912979198a97d48a683e7a23744e 100644
--- a/html/themes/legacy/lists.css
+++ b/html/themes/legacy/lists.css
@@ -93,7 +93,7 @@ border-left: 1px solid #AAA;
 
 table.listingTable > tbody > tr td > input[type=image],
 table.listingTable > tbody > tr td > img {
-padding: 1px;
+padding: 2px;
 }
 
 
diff --git a/include/class_SnapshotDialogs.inc b/include/class_SnapshotDialogs.inc
index d21a770a378d1bbf04e2460cee4453ebb6a7534b..7404ebc3f8d5b9a686cc022af8f58f162258f2cd 100644
--- a/include/class_SnapshotDialogs.inc
+++ b/include/class_SnapshotDialogs.inc
@@ -127,7 +127,7 @@ class SnapshotsAttribute extends OrderedArrayAttribute
   protected function genRowIcons($key, $value)
   {
     $id = $this->getHtmlId();
-    list ($img, $width) = parent::genRowIcons($key, $value);
+    list ($img, $nbicons) = parent::genRowIcons($key, $value);
     $img = $this->renderInputField(
       'image', $id.'_restore_'.$key,
       array(
@@ -136,10 +136,10 @@ class SnapshotsAttribute extends OrderedArrayAttribute
         'alt'   => _('Restore'),
         'class' => 'center'
       )
-    ).' '.$img;
-    $width += 15;
+    ).$img;
+    $nbicons++;
 
-    return array ($img, $width);
+    return array ($img, $nbicons);
   }
 
   protected function handlePostValueActions($id, $postValue)
diff --git a/include/simpleplugin/attributes/class_SetAttribute.inc b/include/simpleplugin/attributes/class_SetAttribute.inc
index 5478f47ba110f00be6b65198fc39c5f5fa676a67..13d609f3be0f2403d8fb0d0ac9b12b15dcf99bc1 100644
--- a/include/simpleplugin/attributes/class_SetAttribute.inc
+++ b/include/simpleplugin/attributes/class_SetAttribute.inc
@@ -434,9 +434,9 @@ class OrderedArrayAttribute extends SetAttribute
         continue;
       }
 
-      list ($img, $width) = $this->genRowIcons($key, $value);
+      list ($img, $nbicons) = $this->genRowIcons($key, $value);
 
-      $fields[] = array("html" => $img, "attach" => 'style="border:0px;width:'.$width.'px;"');
+      $fields[] = array("html" => $img, "attach" => 'style="border:0px;width:'.($nbicons * 20).'px;"');
       $div->AddEntry($fields);
     }
     $smarty->assign("div_$id", $div->DrawList());
@@ -448,10 +448,10 @@ class OrderedArrayAttribute extends SetAttribute
     $id = $this->getHtmlId();
 
     $img = '';
-    $width = 25;
+    $nbicons = 1;
 
     if ($this->order) {
-      $width += 20;
+      $nbicons += 2;
       if ($key != 0) {
         $img .= $this->renderInputField(
           'image', $id.'_up_'.$key,
@@ -461,9 +461,9 @@ class OrderedArrayAttribute extends SetAttribute
             'alt'   => _('Sort up'),
             'class' => 'center'
           )
-        ).' ';
+        );
       } else {
-        $img .= '<img src="images/empty.png" alt="" style="width:10px;"/>';
+        $img .= '<img src="images/empty.png" alt="" style="width:16px;"/>';
       }
       if (($key + 1) < count($this->value)) {
         $img .= $this->renderInputField(
@@ -474,13 +474,13 @@ class OrderedArrayAttribute extends SetAttribute
             'alt'   => _('Sort down'),
             'class' => 'center'
           )
-        ).'&nbsp;';
+        );
       } else {
-        $img .= '<img src="images/empty.png" alt="" style="width:10px;"/>';
+        $img .= '<img src="images/empty.png" alt="" style="width:16px;"/>';
       }
     }
     if ($this->edit_enabled) {
-      $width += 15;
+      $nbicons++;
       $img .= $this->renderInputField(
         'image', $id.'_edit_'.$key,
         array(
@@ -489,7 +489,7 @@ class OrderedArrayAttribute extends SetAttribute
           'alt'   => _('Edit'),
           'class' => 'center'
         )
-      ).'&nbsp;';
+      );
     }
     $img .= $this->renderInputField(
       'image', $id.'_del_'.$key,
@@ -499,9 +499,9 @@ class OrderedArrayAttribute extends SetAttribute
         'alt'   => _('Delete'),
         'class' => 'center'
       )
-    ).'&nbsp;';
+    );
 
-    return array ($img, $width);
+    return array ($img, $nbicons);
   }
 
   protected function getAttributeArrayValue($key, $value)