From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 14 Apr 2008 10:40:56 +0000 (+0000)
Subject: list base image migration for gosa-plugins
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=fbf8e4356f625423e3ccfcb0c6520942726a44e1;p=gosa.git

list base image migration for gosa-plugins


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@10412 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/gosa-plugins/addressbook/addons/addressbook/class_addressbook.inc b/gosa-plugins/addressbook/addons/addressbook/class_addressbook.inc
index a2136774f..73614737b 100644
--- a/gosa-plugins/addressbook/addons/addressbook/class_addressbook.inc
+++ b/gosa-plugins/addressbook/addons/addressbook/class_addressbook.inc
@@ -635,9 +635,9 @@ class addressbook extends plugin
     $smarty->assign ('personal_image', get_template_path('images/addr_personal.png'));
     $smarty->assign ('home_image', get_template_path('images/addr_home.png'));
     $smarty->assign ('company_image', get_template_path('images/addr_company.png'));
-    $smarty->assign ('add_image', get_template_path('images/editpaste.png'));
+    $smarty->assign ('add_image', get_template_path('images/lists/paste.png'));
     $smarty->assign ('edit_image', get_template_path('images/edit.png'));
-    $smarty->assign ('delete_image', get_template_path('images/editdelete.png'));
+    $smarty->assign ('delete_image', get_template_path('images/lists/delete.png'));
     return($smarty->fetch(get_template_path('contents.tpl', TRUE)));
   }
 
diff --git a/gosa-plugins/connectivity/personal/connectivity/main.inc b/gosa-plugins/connectivity/personal/connectivity/main.inc
index b9b58e09d..c2e337d91 100644
--- a/gosa-plugins/connectivity/personal/connectivity/main.inc
+++ b/gosa-plugins/connectivity/personal/connectivity/main.inc
@@ -102,10 +102,10 @@ if (!$remove_lock){
     $display.= "<input type=submit name=\"edit_finish\" style=\"width:80px\" value=\"".msgPool::okButton()."\">\n";
     $display.= "&nbsp;";
     $display.= "<input type=submit name=\"edit_cancel\" value=\"".msgPool::cancelButton()."\">\n";
-    $info= "<img class=\"center\" alt=\"\" align=\"middle\" src=\"".get_template_path('images/closedlock.png').
+    $info= "<img class=\"center\" alt=\"\" align=\"middle\" src=\"".get_template_path('images/lists/locked.png').
       "\"> ".$ui->dn."&nbsp;";
   } else {
-    $info= "<img class=\"center\" alt=\"\" align=\"middle\" src=\"".get_template_path('images/openlock.png').
+    $info= "<img class=\"center\" alt=\"\" align=\"middle\" src=\"".get_template_path('images/lists/unlocked.png').
       "\"> ".$ui->dn."&nbsp;";
 
     $info.= "<img class=\"center\" alt=\"\" align=\"middle\" src=\"".get_template_path('images/lamp.png').
diff --git a/gosa-plugins/dfs/addons/godfs/class_dfsManagment.inc b/gosa-plugins/dfs/addons/godfs/class_dfsManagment.inc
index a4f13c28e..a73d1749f 100644
--- a/gosa-plugins/dfs/addons/godfs/class_dfsManagment.inc
+++ b/gosa-plugins/dfs/addons/godfs/class_dfsManagment.inc
@@ -208,8 +208,8 @@ class dfsManagment extends plugin {
       }
   
       $listhead = "<div style='background:#F0F0F9;padding:5px;'>".
-         " <input type='image' class='center' src='images/list_up.png' align='middle' title='"._("Go up one dfsshare")."' name='dfs_back' alt='"._("Up")."'>&nbsp;".
-         " <input type='image' class='center' src='images/list_root.png' align='middle' title='"._("Go to dfs root")."' name='dfs_root' alt='"._("Root")."'>&nbsp;".
+         " <input type='image' class='center' src='images/lists/up.png' align='middle' title='"._("Go up one dfsshare")."' name='dfs_back' alt='"._("Up")."'>&nbsp;".
+         " <input type='image' class='center' src='images/lists/root.png' align='middle' title='"._("Go to dfs root")."' name='dfs_root' alt='"._("Root")."'>&nbsp;".
          " <input class='center' type='image' src='images/dtree.png' align='middle' alt='"._("Create new dfsshare")."' name='dfs_new'>&nbsp;".
          " <img class='center' src='images/list_seperator.png' align='middle' alt='' height='16' width='1'>&nbsp;".
          _("Base")."&nbsp;<select name='depselect' onChange='mainform.submit()' class='center'>$options</select>".
diff --git a/gosa-plugins/dfs/addons/godfs/main.inc b/gosa-plugins/dfs/addons/godfs/main.inc
index 2c9994e96..48acde3a4 100644
--- a/gosa-plugins/dfs/addons/godfs/main.inc
+++ b/gosa-plugins/dfs/addons/godfs/main.inc
@@ -26,7 +26,7 @@
        $display = print_header(get_template_path('images/dfs.png'), 
                                 _("Distributed File System Administration"),
                                 "<img alt=\"\" class=\"center\" src=\"".
-                                get_template_path('images/closedlock.png').
+                                get_template_path('images/lists/locked.png').
                                 "\"> ".session::get('objectinfo'));
      } else {
        $display = print_header(get_template_path('images/dfs.png'),
diff --git a/gosa-plugins/dhcp/admin/systems/services/dhcp/class_servDHCP.inc b/gosa-plugins/dhcp/admin/systems/services/dhcp/class_servDHCP.inc
index efca699cc..2c08d1c68 100644
--- a/gosa-plugins/dhcp/admin/systems/services/dhcp/class_servDHCP.inc
+++ b/gosa-plugins/dhcp/admin/systems/services/dhcp/class_servDHCP.inc
@@ -323,11 +323,11 @@ class servdhcp extends goService
      */
     $editImgIns = "<input type='image' src='images/list_new.png' name='insertDhcp_%s' title='"._("Insert new DHCP section")."'>".
       "<input type='image' src='images/edit.png' name='editDhcp_%s' title='"._("Edit DHCP section")."'>".
-      "<input type='image' src='images/edittrash.png' name='delDhcp_%s' title='"._("Remove DHCP section")."'>";
+      "<input type='image' src='images/lists/trash.png' name='delDhcp_%s' title='"._("Remove DHCP section")."'>";
     $editImgInsNoDel = "<input type='image' src='images/list_new.png' name='insertDhcp_%s' title='"._("Insert new DHCP section")."'>".
       "<input type='image' src='images/edit.png' name='editDhcp_%s' title='"._("Edit DHCP section")."'>";
     $editImg = "<input type='image' src='images/edit.png' name='editDhcp_%s' title='"._("Edit DHCP section")."'>".
-      "<input type='image' src='images/edittrash.png' name='delDhcp_%s' title='"._("Remove DHCP section")."'>";
+      "<input type='image' src='images/lists/trash.png' name='delDhcp_%s' title='"._("Remove DHCP section")."'>";
       	
     $tmp = new dhcpNewSectionDialog(NULL);
     foreach($this->dhcpSections as $section => $values ){
diff --git a/gosa-plugins/dns/admin/systems/services/dns/class_servDNS.inc b/gosa-plugins/dns/admin/systems/services/dns/class_servDNS.inc
index 25c91f31b..0fb5c5940 100644
--- a/gosa-plugins/dns/admin/systems/services/dns/class_servDNS.inc
+++ b/gosa-plugins/dns/admin/systems/services/dns/class_servDNS.inc
@@ -266,7 +266,7 @@ class servdns extends goService
      */
     $editImg = "<input type='image' src='images/edit.png' name='editZone_%s'>";
     if($this->acl_is_removeable()){
-      $editImg.= "<input type='image' src='images/edittrash.png' name='delZone_%s'>";
+      $editImg.= "<input type='image' src='images/lists/trash.png' name='delZone_%s'>";
     }
 
     $link = "<a href='?plug=".$_GET['plug']."&act=edit&id=%s'>%s</a>";
diff --git a/gosa-plugins/dns/admin/systems/services/dns/class_servDNSeditZone.inc b/gosa-plugins/dns/admin/systems/services/dns/class_servDNSeditZone.inc
index 315771c39..1a37e952f 100644
--- a/gosa-plugins/dns/admin/systems/services/dns/class_servDNSeditZone.inc
+++ b/gosa-plugins/dns/admin/systems/services/dns/class_servDNSeditZone.inc
@@ -336,7 +336,7 @@ class servdnseditZone extends plugin
     $oneup    = "<input name='MXup_%s'    type='image' src='images/sort_up.png'    title='"._("Up")."'      class='center'>&nbsp;"; 
     $onedown  = "<input name='MXdown_%s'  type='image' src='images/sort_down.png'  title='"._("Down")."'    class='center'>&nbsp;"; 
     $onedel   = "<img src='images/empty.png' width='20' class='center'>
-                 <input name='MXdel_%s'   type='image' src='images/edittrash.png'  title='"._("Delete")."'  class='center'>"; 
+                 <input name='MXdel_%s'   type='image' src='images/lists/trash.png'  title='"._("Delete")."'  class='center'>"; 
 
     foreach($recs as $key => $rec){
       $div ->AddEntry(array(
diff --git a/gosa-plugins/dns/admin/systems/services/dns/class_servDNSeditZoneEntries.inc b/gosa-plugins/dns/admin/systems/services/dns/class_servDNSeditZoneEntries.inc
index 41cbf45c3..589bd74d3 100644
--- a/gosa-plugins/dns/admin/systems/services/dns/class_servDNSeditZoneEntries.inc
+++ b/gosa-plugins/dns/admin/systems/services/dns/class_servDNSeditZoneEntries.inc
@@ -449,7 +449,7 @@ class servDNSeditZoneEntries extends plugin
         </td>
         <td style='width:75px;text-align:right;'>
           <input type='image' name='AddRecord_".$name."'   src='images/list_new.png' alt='"._("Add")."' title='"._("Add")."'>
-          <input type='image' name='RemoveRecord_".$name."' src='images/edittrash.png'      alt='"._("Remove")."' title='"._("Remove")."'>
+          <input type='image' name='RemoveRecord_".$name."' src='images/lists/trash.png'      alt='"._("Remove")."' title='"._("Remove")."'>
         ";
 
       $str.=
diff --git a/gosa-plugins/fai/admin/fai/branch_selector.tpl b/gosa-plugins/fai/admin/fai/branch_selector.tpl
index 6b236c313..67d4d0b4f 100644
--- a/gosa-plugins/fai/admin/fai/branch_selector.tpl
+++ b/gosa-plugins/fai/admin/fai/branch_selector.tpl
@@ -31,7 +31,7 @@
 
     {if $selectedBranch != "main" && $allow_remove}
     <br>
-        <input class="center" type="image" name="remove_branch" src="images/edittrash.png">
+        <input class="center" type="image" name="remove_branch" src="images/lists/trash.png">
 	    <a href="?plug={$plug_id}&act=remove_branch">{t}Delete current release{/t}</a>
     {/if}
       </td>
diff --git a/gosa-plugins/fai/admin/fai/class_divListFai.inc b/gosa-plugins/fai/admin/fai/class_divListFai.inc
index 98be0f7ba..7b47c4072 100644
--- a/gosa-plugins/fai/admin/fai/class_divListFai.inc
+++ b/gosa-plugins/fai/admin/fai/class_divListFai.inc
@@ -216,15 +216,15 @@ class divListFai extends MultiSelectWindow
     }
 
     /* Multiple options */
-    $s.= "..|<img src='images/edittrash.png' alt='' border='0' class='center'>".
+    $s.= "..|<img src='images/lists/trash.png' alt='' border='0' class='center'>".
       "&nbsp;"._("Remove")."|"."remove_multiple|\n";
 
     /* Add multiple copy & cut icons */
     if(is_object($this->parent->CopyPasteHandler)){
       $s.= "..|---|\n";
-      $s.= "..|<img src='images/editcopy.png' alt='' border='0' class='center'>".
+      $s.= "..|<img src='images/lists/copy.png' alt='' border='0' class='center'>".
         "&nbsp;"._("Copy")."|"."multiple_copy_systems|\n";
-      $s.= "..|<img src='images/editcut.png' alt='' border='0' class='center'>".
+      $s.= "..|<img src='images/lists/cut.png' alt='' border='0' class='center'>".
         "&nbsp;"._("Cut")."|"."multiple_cut_systems|\n";
     }
 
@@ -233,10 +233,10 @@ class divListFai extends MultiSelectWindow
       preg_match("/(c.*w|w.*c)/",$acl_all) &&  isset($this->parent->CopyPasteHandler) && $this->parent->CopyPasteHandler){
       $s .= "..|---|\n";
       if($this->parent->CopyPasteHandler->entries_queued()){
-        $img = "<img border='0' class='center' src='images/editpaste.png' alt=''>";
+        $img = "<img border='0' class='center' src='images/lists/paste.png' alt=''>";
         $s.="..|".$img."&nbsp;"._("Paste")."|editPaste|\n";
       }else{
-        $img = "<img border='0' class='center' src='images/cant_editpaste.png' alt=''>";
+        $img = "<img border='0' class='center' src='images/cant_lists/paste.png' alt=''>";
         $s.="..|".$img."&nbsp;"._("Paste")."\n";
       }
     }
@@ -322,22 +322,22 @@ class divListFai extends MultiSelectWindow
        $acl_all = $ui->has_complete_category_acls($this->selectedBase,$this->module);
        if(preg_match("/(c.*w|w.*c)/",$acl_all) && $this->parent->CopyPasteHandler){
          $action .= "<input class='center' type='image'
-           src='images/editcut.png' alt='"._("cut")."' name='cut_%KEY%' title='"._("Cut this entry")."'>&nbsp;";
+           src='images/lists/cut.png' alt='"._("cut")."' name='cut_%KEY%' title='"._("Cut this entry")."'>&nbsp;";
          $action.= "<input class='center' type='image'
-           src='images/editcopy.png' alt='"._("copy")."' name='copy_%KEY%' title='"._("Copy this entry")."'>&nbsp;";
+           src='images/lists/copy.png' alt='"._("copy")."' name='copy_%KEY%' title='"._("Copy this entry")."'>&nbsp;";
        }
 
        if(preg_match("/^freeze/", $value['FAIstate'])){
          $editlink ="<a href='?plug=".$_GET['plug']."&amp;edit_freeze_entry=%KEY%' title='%TITLE%'>%NAME%</a>";
          $action.=  "<input class='center' type='image' src='images/edit.png'  alt='"._("edit")."'
            name='entry_freeze_edit_%KEY%' title='"._("Edit class")."'>";
-         $action.=  "<img src='images/closedlock.png' alt='F' class='center'>";
+         $action.=  "<img src='images/lists/locked.png' alt='F' class='center'>";
        }else{
          $editlink ="<a href='?plug=".$_GET['plug']."&amp;edit_entry=%KEY%' title='%TITLE%'>%NAME%</a>";
          $action.= "<input class='center' type='image' src='images/edit.png'  alt='"._("edit")."'
            name='entry_edit_%KEY%' title='"._("Edit class")."'>";
          if(preg_match("/d/",$value['acl'])){
-           $action.= "<input class='center' type='image' src='images/edittrash.png' alt='"._("delete")."'
+           $action.= "<input class='center' type='image' src='images/lists/trash.png' alt='"._("delete")."'
              name='entry_delete_%KEY%' title='"._("Delete class")."'>";
          }
        }
diff --git a/gosa-plugins/fai/admin/fai/class_faiHook.inc b/gosa-plugins/fai/admin/fai/class_faiHook.inc
index 746282057..b385e490d 100644
--- a/gosa-plugins/fai/admin/fai/class_faiHook.inc
+++ b/gosa-plugins/fai/admin/fai/class_faiHook.inc
@@ -328,7 +328,7 @@ class faiHook extends plugin
       }else{
         $act .= "<input type='image' src='images/edit.png'      name='editscript_%s'    title='"._("Edit")."' alt='"._("Edit")."'>";
         if(preg_match("/d/",$acl)){
-          $act .="<input type='image' src='images/edittrash.png' name='deletescript_%s'  title='"._("Delete")."' alt='"._("Delete")."'>";
+          $act .="<input type='image' src='images/lists/trash.png' name='deletescript_%s'  title='"._("Delete")."' alt='"._("Delete")."'>";
         }
       }
 
diff --git a/gosa-plugins/fai/admin/fai/class_faiProfile.inc b/gosa-plugins/fai/admin/fai/class_faiProfile.inc
index 6307a268f..83a57eddb 100644
--- a/gosa-plugins/fai/admin/fai/class_faiProfile.inc
+++ b/gosa-plugins/fai/admin/fai/class_faiProfile.inc
@@ -299,7 +299,7 @@ class faiProfile extends plugin
     $objTypes['FAIpartitionTable']  = "<img src='images/fai_partitionTable.png' title='"._("Partition table")."' alt=''>";
 
     /* Delete button */
-    $actions = "<input type='image' src='images/edittrash.png' title='"._("Remove class from profile")."' name='DEL_%KEY%'>"; 
+    $actions = "<input type='image' src='images/lists/trash.png' title='"._("Remove class from profile")."' name='DEL_%KEY%'>"; 
     
     /* Up down buttons */
     $linkupdown = "&nbsp;<input type='image' name='sortup_%s'   alt='up'    title='"._("Up")."'   src='images/sort_up.png' align='top' >";
diff --git a/gosa-plugins/fai/admin/fai/class_faiProfileEntry.inc b/gosa-plugins/fai/admin/fai/class_faiProfileEntry.inc
index fe8b7fd4f..d15526631 100644
--- a/gosa-plugins/fai/admin/fai/class_faiProfileEntry.inc
+++ b/gosa-plugins/fai/admin/fai/class_faiProfileEntry.inc
@@ -236,7 +236,7 @@ class faiProfileEntry extends plugin
     $smarty->assign("faihead"       , "");
     $smarty->assign("failist"       , $divlist->DrawList());
     $smarty->assign("infoimage"     , get_template_path('images/info_small.png'));
-    $smarty->assign("launchimage"   , get_template_path('images/small_filter.png'));
+    $smarty->assign("launchimage"   , get_template_path('images/lists/action.png'));
     $smarty->assign("alphabet"      , generate_alphabet());
     $smarty->assign("apply"         , apply_filter(TRUE));
     $smarty->assign("search_image"  , get_template_path('images/search.png'));
diff --git a/gosa-plugins/fai/admin/fai/class_faiScript.inc b/gosa-plugins/fai/admin/fai/class_faiScript.inc
index c94c49d58..500dddb0a 100644
--- a/gosa-plugins/fai/admin/fai/class_faiScript.inc
+++ b/gosa-plugins/fai/admin/fai/class_faiScript.inc
@@ -365,7 +365,7 @@ class faiScript extends plugin
       }else{
         $act .= "<input type='image' src='images/edit.png'      name='editscript_%s'    title='"._("edit")."' alt='"._("edit")."'>";
         if(preg_match("/d/",$acl)){
-          $act .="<input type='image' src='images/edittrash.png' name='deletescript_%s'  title='"._("delete")."' alt='"._("delete")."'>";
+          $act .="<input type='image' src='images/lists/trash.png' name='deletescript_%s'  title='"._("delete")."' alt='"._("delete")."'>";
         }
       }
 
diff --git a/gosa-plugins/fai/admin/fai/class_faiTemplate.inc b/gosa-plugins/fai/admin/fai/class_faiTemplate.inc
index 018d8596c..7ea9a836b 100644
--- a/gosa-plugins/fai/admin/fai/class_faiTemplate.inc
+++ b/gosa-plugins/fai/admin/fai/class_faiTemplate.inc
@@ -304,7 +304,7 @@ class faiTemplate extends plugin
       }else{
         $act .= "<input type='image' src='images/edit.png'      name='editscript_%s'    title='"._("edit")."' alt='"._("edit")."'>";
         if(preg_match("/d/",$acl)){
-          $act .="<input type='image' src='images/edittrash.png' name='deletescript_%s'  title='"._("delete")."' alt='"._("delete")."'>";
+          $act .="<input type='image' src='images/lists/trash.png' name='deletescript_%s'  title='"._("delete")."' alt='"._("delete")."'>";
         }
       }
 
diff --git a/gosa-plugins/fai/admin/fai/faiPartitionTableEntry.tpl b/gosa-plugins/fai/admin/fai/faiPartitionTableEntry.tpl
index 9c69106f1..4b920ed0a 100644
--- a/gosa-plugins/fai/admin/fai/faiPartitionTableEntry.tpl
+++ b/gosa-plugins/fai/admin/fai/faiPartitionTableEntry.tpl
@@ -21,7 +21,7 @@
 <br>
 <p class="seperator">&nbsp;</p>
 <br>
-<h2><img class="center" alt="" src="images/editpaste.png" align="middle" title="{t}Partition entries{/t}">&nbsp;{t}Partition entries{/t}</h2>
+<h2><img class="center" alt="" src="images/lists/paste.png" align="middle" title="{t}Partition entries{/t}">&nbsp;{t}Partition entries{/t}</h2>
 {$setup}
 <br>
 {if $sub_object_is_createable}
diff --git a/gosa-plugins/fai/admin/fai/faiSummary.tpl b/gosa-plugins/fai/admin/fai/faiSummary.tpl
index 196f7cab8..cb6a9cdaf 100644
--- a/gosa-plugins/fai/admin/fai/faiSummary.tpl
+++ b/gosa-plugins/fai/admin/fai/faiSummary.tpl
@@ -7,7 +7,7 @@
 {if $readable}
  <tr>
 	<td style="padding-left:5px;padding-top:5px;padding-bottom:12px;border-bottom:1px solid #B0B0B0">
-		<input type="image" src="images/list_reload.png" name="reloadList" class="center">	
+		<input type="image" src="images/lists/reload.png" name="reloadList" class="center">	
 		{t}Reload class and release configuration from parent object.{/t}
 	</td>
  </tr>
diff --git a/gosa-plugins/fai/admin/fai/main.inc b/gosa-plugins/fai/admin/fai/main.inc
index 5f1ff2866..5357a01e9 100644
--- a/gosa-plugins/fai/admin/fai/main.inc
+++ b/gosa-plugins/fai/admin/fai/main.inc
@@ -44,7 +44,7 @@ if ($remove_lock){
 	}
 	/* Page header*/
 	if (session::is_set('objectinfo')){
-		$display= print_header(get_template_path('images/fai.png'), _("Software deployment"), "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/closedlock.png')."\"> ".@LDAP::fix(session::get('objectinfo')));
+		$display= print_header(get_template_path('images/fai.png'), _("Software deployment"), "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/lists/locked.png')."\"> ".@LDAP::fix(session::get('objectinfo')));
 	} else {
 		$display= print_header(get_template_path('images/fai.png'), _("Software deployment"));
 	}
diff --git a/gosa-plugins/glpi/admin/systems/services/glpi/class_glpiAccount.inc b/gosa-plugins/glpi/admin/systems/services/glpi/class_glpiAccount.inc
index cdfa15332..398d9a5c8 100644
--- a/gosa-plugins/glpi/admin/systems/services/glpi/class_glpiAccount.inc
+++ b/gosa-plugins/glpi/admin/systems/services/glpi/class_glpiAccount.inc
@@ -627,7 +627,7 @@ class glpiAccount extends plugin
     $divlist-> SetHeight(130); 
     $atts = $this->getUsedAttachments(true);
     $downlink = "<a href='?plug=".$_GET['plug']."&get_attachment=%s'>%s</a>";
-    $del_link = "<input type='image' src='images/edittrash.png' name='delAttachment_%s'>";
+    $del_link = "<input type='image' src='images/lists/trash.png' name='delAttachment_%s'>";
     foreach($atts as $id => $attachment){
       $divlist->AddEntry
           (
diff --git a/gosa-plugins/glpi/admin/systems/services/glpi/class_glpiAttachmentPool.inc b/gosa-plugins/glpi/admin/systems/services/glpi/class_glpiAttachmentPool.inc
index eca6b9d01..90ba05a02 100644
--- a/gosa-plugins/glpi/admin/systems/services/glpi/class_glpiAttachmentPool.inc
+++ b/gosa-plugins/glpi/admin/systems/services/glpi/class_glpiAttachmentPool.inc
@@ -202,7 +202,7 @@ class glpiAttachmentPool extends plugin
     $divlist->SetEntriesPerPage(0);
 
     $editdel = "<input type='image' name='editAttach_%s' src='images/edit.png'>";
-    $editdel.= "<input type='image' name='delAttach_%s'  src='images/edittrash.png'>";
+    $editdel.= "<input type='image' name='delAttach_%s'  src='images/lists/trash.png'>";
 
     /* Add all given attachments to divlist 
      */ 
@@ -264,7 +264,7 @@ class glpiAttachmentPool extends plugin
     $smarty->assign("searchu_image",    get_template_path('images/search_user.png'));
     $smarty->assign("tree_image",       get_template_path('images/tree.png'));
     $smarty->assign("infoimage",        get_template_path('images/info_small.png'));
-    $smarty->assign("launchimage",      get_template_path('images/small_filter.png'));
+    $smarty->assign("launchimage",      get_template_path('images/lists/action.png'));
     $smarty->assign("apply",            apply_filter());
     $smarty->assign("alphabet",         generate_alphabet());
     $smarty->assign("attachment_regex", $GlpiAttachmentFilter['filter']);
diff --git a/gosa-plugins/glpi/admin/systems/services/glpi/class_glpiDeviceManagement.inc b/gosa-plugins/glpi/admin/systems/services/glpi/class_glpiDeviceManagement.inc
index f07216390..df7cc6b3e 100644
--- a/gosa-plugins/glpi/admin/systems/services/glpi/class_glpiDeviceManagement.inc
+++ b/gosa-plugins/glpi/admin/systems/services/glpi/class_glpiDeviceManagement.inc
@@ -185,7 +185,7 @@ class glpiDeviceManagement extends plugin
 
     $edit = "<a href='?plug=".$_GET['plug']."&amp;act=edit_device&amp;id=%s'>%s</a>";
     $editdel = "<a href='?plug=".$_GET['plug']."&amp;act=edit_device&amp;id=%s'><img src='images/edit.png' alt='"._("Edit")."' border=0></a>";
-    $editdel.= "<a href='?plug=".$_GET['plug']."&amp;act=del_device&amp;id=%s'><img src='images/edittrash.png' alt='"._("Delete")."' border=0></a>";
+    $editdel.= "<a href='?plug=".$_GET['plug']."&amp;act=del_device&amp;id=%s'><img src='images/lists/trash.png' alt='"._("Delete")."' border=0></a>";
     
     $useDevice = "<input type='hidden' name='wasOnPage_%s' value='%s'><input type='checkbox' value='%s' name='useDevice_%s' %USE%>";
 
@@ -252,7 +252,7 @@ class glpiDeviceManagement extends plugin
     $smarty->assign("searchu_image", get_template_path('images/search_user.png'));
     $smarty->assign("tree_image", get_template_path('images/tree.png'));
     $smarty->assign("infoimage", get_template_path('images/info_small.png'));
-    $smarty->assign("launchimage", get_template_path('images/small_filter.png'));
+    $smarty->assign("launchimage", get_template_path('images/lists/action.png'));
     $smarty->assign("apply", apply_filter());
     $smarty->assign("alphabet", generate_alphabet());
     $smarty->assign("device_regex", $filter['device_regex']);
diff --git a/gosa-plugins/glpi/admin/systems/services/glpi/class_glpiPrinterAccount.inc b/gosa-plugins/glpi/admin/systems/services/glpi/class_glpiPrinterAccount.inc
index 80bc9241a..5e2779ace 100644
--- a/gosa-plugins/glpi/admin/systems/services/glpi/class_glpiPrinterAccount.inc
+++ b/gosa-plugins/glpi/admin/systems/services/glpi/class_glpiPrinterAccount.inc
@@ -596,7 +596,7 @@ class glpiPrinterAccount extends plugin
     $divlist-> SetHeight(120);
     $atts = $this->getUsedAttachments(true);
     $downlink = "<a href='?plug=".$_GET['plug']."&get_attachment=%s'>%s</a>";
-    $del_link = "<input type='image' src='images/edittrash.png' name='delAttachment_%s'>";
+    $del_link = "<input type='image' src='images/lists/trash.png' name='delAttachment_%s'>";
     foreach($atts as $id => $attachment){
       $divlist->AddEntry
           (
diff --git a/gosa-plugins/glpi/admin/systems/services/glpi/class_glpiPrinterCartridges.inc b/gosa-plugins/glpi/admin/systems/services/glpi/class_glpiPrinterCartridges.inc
index 0e6e1eb74..59cb03c21 100644
--- a/gosa-plugins/glpi/admin/systems/services/glpi/class_glpiPrinterCartridges.inc
+++ b/gosa-plugins/glpi/admin/systems/services/glpi/class_glpiPrinterCartridges.inc
@@ -161,7 +161,7 @@ class glpiPrinterCartridges extends plugin
     /* Links for editing,adding.... */
     $edit =     "<a href='?plug=".$_GET['plug']."&amp;act=edit_cartridge&amp;id=%s'>%s</a>";
     $editdel =  "<a href='?plug=".$_GET['plug']."&amp;act=edit_cartridge&amp;id=%s'><img src='images/edit.png' alt='"._("Edit")."' border=0></a>";
-    $editdel.= "<a href='?plug=".$_GET['plug']."&amp;act=del_cartridge&amp;id=%s'><img src='images/edittrash.png' alt='"._("Delete")."' border=0></a>";
+    $editdel.= "<a href='?plug=".$_GET['plug']."&amp;act=del_cartridge&amp;id=%s'><img src='images/lists/trash.png' alt='"._("Delete")."' border=0></a>";
    
     /* Checkbox for selection of some cartridges */ 
     $useCartridge = "<input type='hidden' name='wasOnPage_%s' value='%s'><input type='checkbox' value='%s' name='useCartridge_%s' %CHECKED%>";
@@ -214,7 +214,7 @@ class glpiPrinterCartridges extends plugin
     $smarty->assign("searchu_image", get_template_path('images/search_user.png'));
     $smarty->assign("tree_image", get_template_path('images/tree.png'));
     $smarty->assign("infoimage", get_template_path('images/info_small.png'));
-    $smarty->assign("launchimage", get_template_path('images/small_filter.png'));
+    $smarty->assign("launchimage", get_template_path('images/lists/action.png'));
     $smarty->assign("apply", apply_filter());
     $smarty->assign("alphabet", generate_alphabet());
     $smarty->assign("cartridge_regex", $filter);
diff --git a/gosa-plugins/glpi/admin/systems/services/glpi/class_glpiSelectUser.inc b/gosa-plugins/glpi/admin/systems/services/glpi/class_glpiSelectUser.inc
index 6f42d8a60..381a31fa6 100644
--- a/gosa-plugins/glpi/admin/systems/services/glpi/class_glpiSelectUser.inc
+++ b/gosa-plugins/glpi/admin/systems/services/glpi/class_glpiSelectUser.inc
@@ -168,13 +168,13 @@ class glpiSelectUser extends plugin
     }
 
     $listhead = "<div style='background:#F0F0F9;padding:5px;'>".
-      " <input class='center' type='image' src='images/list_root.png' 
+      " <input class='center' type='image' src='images/lists/root.png' 
       align='middle' title='"._("Go to root department")."' name='dep_root' alt='"._("Root")."'>&nbsp;".
       " <input class='center' type='image' align='middle' 
-      src='images/list_back.png' title='"._("Go up one department")."' alt='"._("Up")."' name='dep_back'>&nbsp;".
+      src='images/lists/back.png' title='"._("Go up one department")."' alt='"._("Up")."' name='dep_back'>&nbsp;".
       " <input class='center' type='image' align='middle' 
-      src='images/list_home.png' title='"._("Go to users department")."' alt='"._("Home")."' name='dep_home'>&nbsp;".
-      " <input class='center' type='image' src='images/list_reload.png' align='middle' title='"._("Reload list")."' name='submit_department' alt='"._("Submit")."'>&nbsp;".
+      src='images/lists/home.png' title='"._("Go to users department")."' alt='"._("Home")."' name='dep_home'>&nbsp;".
+      " <input class='center' type='image' src='images/lists/reload.png' align='middle' title='"._("Reload list")."' name='submit_department' alt='"._("Submit")."'>&nbsp;".
 " <img class='center' src='images/list_seperator.png' align='middle' alt='' height='16' width='1'>&nbsp;"._("Base")."&nbsp;".
     " <select name='depselect' onChange='mainform.submit()' class='center'>$options</select>".
     " <input class='center' type='image' src='images/list_submit.png' align='middle'
@@ -189,7 +189,7 @@ class glpiSelectUser extends plugin
     $smarty->assign("searchu_image", get_template_path('images/search_user.png'));
     $smarty->assign("tree_image", get_template_path('images/tree.png'));
     $smarty->assign("infoimage", get_template_path('images/info_small.png'));
-    $smarty->assign("launchimage", get_template_path('images/small_filter.png'));
+    $smarty->assign("launchimage", get_template_path('images/lists/action.png'));
     $smarty->assign("apply", apply_filter());
     $smarty->assign("alphabet", generate_alphabet());
     $smarty->assign("users_regex", $filter['users_regex']);
diff --git a/gosa-plugins/gofax/gofax/blocklists/class_divListBlocklists.inc b/gosa-plugins/gofax/gofax/blocklists/class_divListBlocklists.inc
index 41acc0724..15014a814 100644
--- a/gosa-plugins/gofax/gofax/blocklists/class_divListBlocklists.inc
+++ b/gosa-plugins/gofax/gofax/blocklists/class_divListBlocklists.inc
@@ -148,22 +148,22 @@ class divListBlocklist extends MultiSelectWindow
 
     /* Multiple options */
     $s.= "..|---|\n";
-    $s.= "..|<img src='images/edittrash.png' alt='' border='0' class='center'>".
+    $s.= "..|<img src='images/lists/trash.png' alt='' border='0' class='center'>".
       "&nbsp;"._("Remove")."|"."remove_multiple|\n";
 
     /* Add multiple copy & cut icons */
     if(is_object($this->parent->CopyPasteHandler) && preg_match("/(c.*w|w.*c)/",$acl_all)){
       $s.= "..|---|\n";
-      $s.= "..|<img src='images/editcopy.png' alt='' border='0' class='center'>".
+      $s.= "..|<img src='images/lists/copy.png' alt='' border='0' class='center'>".
         "&nbsp;"._("Copy")."|"."multiple_copy_systems|\n";
-      $s.= "..|<img src='images/editcut.png' alt='' border='0' class='center'>".
+      $s.= "..|<img src='images/lists/cut.png' alt='' border='0' class='center'>".
         "&nbsp;"._("Cut")."|"."multiple_cut_systems|\n";
 
       if($this->parent->CopyPasteHandler->entries_queued()){
-        $img = "<img border='0' class='center' src='images/editpaste.png' alt=''>";
+        $img = "<img border='0' class='center' src='images/lists/paste.png' alt=''>";
         $s.="..|".$img."&nbsp;"._("Paste")."|editPaste|\n";
       }else{
-        $img = "<img border='0' class='center' src='images/cant_editpaste.png' alt=''>";
+        $img = "<img border='0' class='center' src='images/cant_lists/paste.png' alt=''>";
         $s.="..|".$img."&nbsp;"._("Paste")."\n";
       }
     }
@@ -218,15 +218,15 @@ class divListBlocklist extends MultiSelectWindow
       /* Add copy & cut icons */
       if(preg_match("/(c.*w|w.*c)/",$acl) && $this->parent->CopyPasteHandler){
         $action .= "<input class='center' type='image'
-          src='images/editcut.png' alt='"._("cut")."' name='cut_%KEY%' title='"._("Cut this entry")."'>&nbsp;";
+          src='images/lists/cut.png' alt='"._("cut")."' name='cut_%KEY%' title='"._("Cut this entry")."'>&nbsp;";
         $action.= "<input class='center' type='image'
-          src='images/editcopy.png' alt='"._("copy")."' name='copy_%KEY%' title='"._("Copy this entry")."'>&nbsp;";
+          src='images/lists/copy.png' alt='"._("copy")."' name='copy_%KEY%' title='"._("Copy this entry")."'>&nbsp;";
       }
 
  
       /* Delete entry ; requires remove access */
       if(preg_match("/d/",$acl)){
-        $action.= "<input class='center' type='image' src='images/edittrash.png' alt='"._("delete")."' name='goFaxBlocklist_del_%KEY%' title='"._("Delete user")."'>";
+        $action.= "<input class='center' type='image' src='images/lists/trash.png' alt='"._("delete")."' name='goFaxBlocklist_del_%KEY%' title='"._("Delete user")."'>";
       }
       
       // Generate Array to Add
diff --git a/gosa-plugins/gofax/gofax/blocklists/main.inc b/gosa-plugins/gofax/gofax/blocklists/main.inc
index 4a0f3c561..e39ced2a9 100644
--- a/gosa-plugins/gofax/gofax/blocklists/main.inc
+++ b/gosa-plugins/gofax/gofax/blocklists/main.inc
@@ -24,7 +24,7 @@ if ($remove_lock){
 
 	/* Page header*/
 	if (session::is_set('objectinfo')){
-	        $display= print_header(get_template_path('images/blocklists.png'), _("Blocklist management"), "<img alt=\"\"align=\"middle\" src=\"".get_template_path('images/closedlock.png')."\"> ".@LDAP::fix(session::get('objectinfo')));
+	        $display= print_header(get_template_path('images/blocklists.png'), _("Blocklist management"), "<img alt=\"\"align=\"middle\" src=\"".get_template_path('images/lists/locked.png')."\"> ".@LDAP::fix(session::get('objectinfo')));
 	} else {
 	        $display= print_header(get_template_path('images/blocklists.png'), _("Blocklist management"));
 	}
diff --git a/gosa-plugins/gofax/gofax/faxaccount/class_gofaxAccount.inc b/gosa-plugins/gofax/gofax/faxaccount/class_gofaxAccount.inc
index d1b14420c..b1283972c 100644
--- a/gosa-plugins/gofax/gofax/faxaccount/class_gofaxAccount.inc
+++ b/gosa-plugins/gofax/gofax/faxaccount/class_gofaxAccount.inc
@@ -383,7 +383,7 @@ class gofaxAccount extends plugin
       $smarty->assign("usearch_image", get_template_path('images/search_user.png'));
       $smarty->assign("tree_image", get_template_path('images/tree.png'));
       $smarty->assign("infoimage", get_template_path('images/info.png'));
-      $smarty->assign("launchimage", get_template_path('images/small_filter.png'));
+      $smarty->assign("launchimage", get_template_path('images/lists/action.png'));
       $smarty->assign("departments", $this->config->idepartments);
       $smarty->assign("list", $list);
       if (isset($_POST['depselect'])){
diff --git a/gosa-plugins/gofax/gofax/faxaccount/main.inc b/gosa-plugins/gofax/gofax/faxaccount/main.inc
index 23147d12d..77e137d8b 100644
--- a/gosa-plugins/gofax/gofax/faxaccount/main.inc
+++ b/gosa-plugins/gofax/gofax/faxaccount/main.inc
@@ -92,9 +92,9 @@ if (!$remove_lock){
 			$display.= "<input type=submit name=\"edit_finish\" style=\"width:80px\" value=\"".msgPool::okButton()."\">\n";
 			$display.= "&nbsp;\n";
 			$display.= "<input type=submit name=\"edit_cancel\" value=\"".msgPool::cancelButton()."\">\n";
-			$info= "<img alt='' align=\"middle\" src=\"".get_template_path('images/closedlock.png')."\"> ".$ui->dn."&nbsp;";
+			$info= "<img alt='' align=\"middle\" src=\"".get_template_path('images/lists/locked.png')."\"> ".$ui->dn."&nbsp;";
 		} else {
-			$info= "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/openlock.png')."\"> ".$ui->dn."&nbsp;";
+			$info= "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/lists/unlocked.png')."\"> ".$ui->dn."&nbsp;";
 
 			if(preg_match("/w/",$ui->get_permissions($ui->dn,"users/gofaxAccount"))){
 				$info.= "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/lamp.png')."\">"._("Click the 'Edit' button below to change informations in this dialog");
diff --git a/gosa-plugins/gofax/gofax/faxreports/class_faxreport.inc b/gosa-plugins/gofax/gofax/faxreports/class_faxreport.inc
index f02aef2ad..42680457e 100644
--- a/gosa-plugins/gofax/gofax/faxreports/class_faxreport.inc
+++ b/gosa-plugins/gofax/gofax/faxreports/class_faxreport.inc
@@ -312,7 +312,7 @@ class faxreport extends plugin
         }
 
         /* Restricted attributes will not be displayed, this will be displayed instead */
-        $no_acl = "<img class='center' src='images/closedlock.png' 
+        $no_acl = "<img class='center' src='images/lists/locked.png' 
                     title='"._("Insufficient permissions to view this attribute")."' alt='"._("Insufficient permissions")."'>";
 
         /* Create date */ 
diff --git a/gosa-plugins/gofon/gofon/conference/class_divListConferences.inc b/gosa-plugins/gofon/gofon/conference/class_divListConferences.inc
index 332b89468..acdd7423c 100644
--- a/gosa-plugins/gofon/gofon/conference/class_divListConferences.inc
+++ b/gosa-plugins/gofon/gofon/conference/class_divListConferences.inc
@@ -145,22 +145,22 @@ class divListConference extends MultiSelectWindow
 
     /* Multiple options */
     $s.= "..|---|\n";
-    $s.= "..|<img src='images/edittrash.png' alt='' border='0' class='center'>".
+    $s.= "..|<img src='images/lists/trash.png' alt='' border='0' class='center'>".
       "&nbsp;"._("Remove")."|"."remove_multiple|\n";
 
     /* Add multiple copy & cut icons */
     if(is_object($this->parent->CopyPasteHandler)){
       $s.= "..|---|\n";
-      $s.= "..|<img src='images/editcopy.png' alt='' border='0' class='center'>".
+      $s.= "..|<img src='images/lists/copy.png' alt='' border='0' class='center'>".
         "&nbsp;"._("Copy")."|"."multiple_copy_systems|\n";
-      $s.= "..|<img src='images/editcut.png' alt='' border='0' class='center'>".
+      $s.= "..|<img src='images/lists/cut.png' alt='' border='0' class='center'>".
         "&nbsp;"._("Cut")."|"."multiple_cut_systems|\n";
 
       if($this->parent->CopyPasteHandler->entries_queued()){
-        $img = "<img border='0' class='center' src='images/editpaste.png' alt=''>";
+        $img = "<img border='0' class='center' src='images/lists/paste.png' alt=''>";
         $s.="..|".$img."&nbsp;"._("Paste")."|editPaste|\n";
       }else{
-        $img = "<img border='0' class='center' src='images/cant_editpaste.png' alt=''>";
+        $img = "<img border='0' class='center' src='images/cant_lists/paste.png' alt=''>";
         $s.="..|".$img."&nbsp;"._("Paste")."\n";
       }
     }
@@ -209,9 +209,9 @@ class divListConference extends MultiSelectWindow
       $actions ="";
       if(($this->parent->CopyPasteHandler) && preg_match("/(c.*w|w.*c)/",$acl_all)){
         $actions.= "<input class='center' type='image'
-          src='images/editcut.png' alt='"._("cut")."' name='cut_%KEY%' title='"._("Cut this entry")."'>&nbsp;";
+          src='images/lists/cut.png' alt='"._("cut")."' name='cut_%KEY%' title='"._("Cut this entry")."'>&nbsp;";
         $actions.= "<input class='center' type='image'
-          src='images/editcopy.png' alt='"._("copy")."' name='copy_%KEY%' title='"._("Copy this entry")."'>&nbsp;";
+          src='images/lists/copy.png' alt='"._("copy")."' name='copy_%KEY%' title='"._("Copy this entry")."'>&nbsp;";
       }
 
       /* Add edit icon - This is allowed when we have at least read access. */
@@ -225,7 +225,7 @@ class divListConference extends MultiSelectWindow
 
       /* Create delete link - Only if we are allowed to delete this entry */
       if(preg_match("/d/",$acl)){
-        $actions.= "<input class='center' type='image' src='images/edittrash.png' 
+        $actions.= "<input class='center' type='image' src='images/lists/trash.png' 
           alt='"._("delete")."'   name='conference_del_%KEY%'  title='"._("Delete this entry")."'>";
       }
 
diff --git a/gosa-plugins/gofon/gofon/conference/main.inc b/gosa-plugins/gofon/gofon/conference/main.inc
index 063624509..e557c1d3d 100644
--- a/gosa-plugins/gofon/gofon/conference/main.inc
+++ b/gosa-plugins/gofon/gofon/conference/main.inc
@@ -36,7 +36,7 @@ if ($remove_lock){
 
 	/* Page header*/
 	if (session::is_set('objectinfo')){
-		$display= print_header(get_template_path('images/conference.png'), _("Conference management"), "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/closedlock.png')."\"> ".@LDAP::fix(session::get('objectinfo')));
+		$display= print_header(get_template_path('images/conference.png'), _("Conference management"), "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/lists/locked.png')."\"> ".@LDAP::fix(session::get('objectinfo')));
 	} else {
 		$display= print_header(get_template_path('images/conference.png'), _("Conference management"));
 	}
diff --git a/gosa-plugins/gofon/gofon/fonreports/class_fonreport.inc b/gosa-plugins/gofon/gofon/fonreports/class_fonreport.inc
index 1beeaed5c..bb6ef6264 100644
--- a/gosa-plugins/gofon/gofon/fonreports/class_fonreport.inc
+++ b/gosa-plugins/gofon/gofon/fonreports/class_fonreport.inc
@@ -205,7 +205,7 @@ class fonreport extends plugin
     $report_list= array();
     
     /* Restricted attributes will not be displayed, this will be displayed instead */
-    $no_acl = "<img class='center' src='images/closedlock.png'
+    $no_acl = "<img class='center' src='images/lists/locked.png'
       title='".msgPool::permView()."' alt='"._("Insufficient permissions")."'>";
 
     $no_acl = "&nbsp;";
diff --git a/gosa-plugins/gofon/gofon/macro/class_divListMacros.inc b/gosa-plugins/gofon/gofon/macro/class_divListMacros.inc
index e46576fe3..bdc551a60 100644
--- a/gosa-plugins/gofon/gofon/macro/class_divListMacros.inc
+++ b/gosa-plugins/gofon/gofon/macro/class_divListMacros.inc
@@ -141,22 +141,22 @@ class divListMacro extends MultiSelectWindow
 
     /* Multiple options */
     $s.= "..|---|\n";
-    $s.= "..|<img src='images/edittrash.png' alt='' border='0' class='center'>".
+    $s.= "..|<img src='images/lists/trash.png' alt='' border='0' class='center'>".
       "&nbsp;"._("Remove")."|"."remove_multiple|\n";
 
     /* Add multiple copy & cut icons */
     if(preg_match("/(c.*w|w.*c)/",$acls) && is_object( $this->parent->CopyPasteHandler)){
       $s.= "..|---|\n";
-      $s.= "..|<img src='images/editcopy.png' alt='' border='0' class='center'>".
+      $s.= "..|<img src='images/lists/copy.png' alt='' border='0' class='center'>".
         "&nbsp;"._("Copy")."|"."multiple_copy_systems|\n";
-      $s.= "..|<img src='images/editcut.png' alt='' border='0' class='center'>".
+      $s.= "..|<img src='images/lists/cut.png' alt='' border='0' class='center'>".
         "&nbsp;"._("Cut")."|"."multiple_cut_systems|\n";
 
       if($this->parent->CopyPasteHandler->entries_queued()){
-        $img = "<img border='0' class='center' src='images/editpaste.png' alt=''>";
+        $img = "<img border='0' class='center' src='images/lists/paste.png' alt=''>";
         $s.="..|".$img."&nbsp;"._("Paste")."|editPaste|\n";
       }else{
-        $img = "<img border='0' class='center' src='images/cant_editpaste.png' alt=''>";
+        $img = "<img border='0' class='center' src='images/cant_lists/paste.png' alt=''>";
         $s.="..|".$img."&nbsp;"._("Paste")."\n";
       }
     }
@@ -209,9 +209,9 @@ class divListMacro extends MultiSelectWindow
 
       if(($this->parent->CopyPasteHandler) && preg_match("/(c.*w|w.*c)/",$sacl)){
         $action.= "<input class='center' type='image'
-          src='images/editcut.png' alt='"._("cut")."' name='cut_%KEY%' title='"._("Cut this entry")."'>&nbsp;";
+          src='images/lists/cut.png' alt='"._("cut")."' name='cut_%KEY%' title='"._("Cut this entry")."'>&nbsp;";
         $action.= "<input class='center' type='image'
-          src='images/editcopy.png' alt='"._("copy")."' name='copy_%KEY%' title='"._("Copy this entry")."'>&nbsp;";
+          src='images/lists/copy.png' alt='"._("copy")."' name='copy_%KEY%' title='"._("Copy this entry")."'>&nbsp;";
       }
 
       $action.= "<input class='center' type='image' src='images/edit.png' alt='"._("edit")."'     
@@ -222,7 +222,7 @@ class divListMacro extends MultiSelectWindow
       }
 
       if(preg_match("/d/",$sacl)){
-        $action.= "<input class='center' type='image' src='images/edittrash.png' alt='"._("delete")."'   
+        $action.= "<input class='center' type='image' src='images/lists/trash.png' alt='"._("delete")."'   
           name='goFonMacro_del_%KEY%' title='"._("Delete macro")."'>";
       }
 
diff --git a/gosa-plugins/gofon/gofon/macro/main.inc b/gosa-plugins/gofon/gofon/macro/main.inc
index 4d438b211..a47cab4ee 100644
--- a/gosa-plugins/gofon/gofon/macro/main.inc
+++ b/gosa-plugins/gofon/gofon/macro/main.inc
@@ -41,7 +41,7 @@ if ($remove_lock){
   if (session::is_set('objectinfo')){
     $display= print_header( get_template_path('images/macros.png'), 
                             _("Phone macro management"), 
-                            "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/closedlock.png')."\"> 
+                            "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/lists/locked.png')."\"> 
                             ".@LDAP::fix(session::get('objectinfo')));
   } else {
     $display= print_header(get_template_path('images/macros.png'), _("Phone macro management"));
diff --git a/gosa-plugins/gofon/gofon/phoneaccount/main.inc b/gosa-plugins/gofon/gofon/phoneaccount/main.inc
index fdce2f7a6..b9fa644e2 100644
--- a/gosa-plugins/gofon/gofon/phoneaccount/main.inc
+++ b/gosa-plugins/gofon/gofon/phoneaccount/main.inc
@@ -105,9 +105,9 @@ if (!$remove_lock){
 			$display.= "<input type=submit name=\"edit_finish\" style=\"width:80px\" value=\"".msgPool::okButton()."\">\n";
 			$display.= "&nbsp;";
 			$display.= "<input type=submit name=\"edit_cancel\" value=\"".msgPool::cancelButton()."\">\n";
-			$info= "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/closedlock.png')."\"> ".$ui->dn."&nbsp;";
+			$info= "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/lists/locked.png')."\"> ".$ui->dn."&nbsp;";
 		} else {
-			$info= "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/openlock.png')."\"> ".$ui->dn."&nbsp;";
+			$info= "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/lists/unlocked.png')."\"> ".$ui->dn."&nbsp;";
 
 			if(preg_match("/w/",$ui->get_permissions($ui->dn,"users/phoneAccount"))){
 				$info.= "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/lamp.png')."\">"._("Click the 'Edit' button below to change informations in this dialog");
diff --git a/gosa-plugins/goto/addons/goto/class_gotomasses.inc b/gosa-plugins/goto/addons/goto/class_gotomasses.inc
index c8ee0da14..643f00d59 100644
--- a/gosa-plugins/goto/addons/goto/class_gotomasses.inc
+++ b/gosa-plugins/goto/addons/goto/class_gotomasses.inc
@@ -300,7 +300,7 @@ class gotomasses extends plugin
     }
     if($this->acl_is_removeable()){
       $s.= "..|---|\n";
-      $s.= "..|<img src='images/edittrash.png' alt='' border='0' class='center'>&nbsp;"._("Remove")."|remove_multiple\n";
+      $s.= "..|<img src='images/lists/trash.png' alt='' border='0' class='center'>&nbsp;"._("Remove")."|remove_multiple\n";
     }
     if(preg_match("/w/",$this->getacl(""))){
       $s.= "..|---|\n";
@@ -324,7 +324,7 @@ class gotomasses extends plugin
     if($this->sort_by == "Action"){ $sort_img_4 = $sort_img; } else { $sort_img_4 = "" ;}
 
     /* Create divlist */
-    $divlist->SetListHeader("<input type='image' src='images/list_reload.png' title='"._("Reload")."'>");
+    $divlist->SetListHeader("<input type='image' src='images/lists/reload.png' title='"._("Reload")."'>");
 
     $plug  = $_GET['plug'];
     $chk = "<input type='checkbox' id='select_all' name='select_all'
@@ -398,11 +398,11 @@ class gotomasses extends plugin
       /* If WAITING or ERROR add remove action
        */  
       if( $this->acl_is_removeable() && in_array($task['STATUS'],array("waiting","error","processed"))){
-        $action.= "<input type='image' src='images/edittrash.png' name='remove_task_".$key."' 
+        $action.= "<input type='image' src='images/lists/trash.png' name='remove_task_".$key."' 
           class='center' alt='"._("Remove")."'>";
       }
       if(in_array($task['STATUS'],array("processing")) && !preg_match("/install/",$task['HEADERTAG'])){
-        $action.= "<input type='image' src='images/edittrash.png' name='remove_task_".$key."' 
+        $action.= "<input type='image' src='images/lists/trash.png' name='remove_task_".$key."' 
           class='center' alt='"._("Remove")."'>";
       }
 
diff --git a/gosa-plugins/goto/addons/goto/events/class_DaemonEvent.inc b/gosa-plugins/goto/addons/goto/events/class_DaemonEvent.inc
index 47cdbf0f0..3bfd30e8f 100644
--- a/gosa-plugins/goto/addons/goto/events/class_DaemonEvent.inc
+++ b/gosa-plugins/goto/addons/goto/events/class_DaemonEvent.inc
@@ -225,7 +225,7 @@ class DaemonEvent
     foreach($this->a_targets as $key => $target){
       $divlist->AddEntry(array(
             array("string"  => $target),
-            array("string"  => "<input type='image' src='images/edittrash.png' title='"._("Remove")."' name='del_target_".$key."'>",
+            array("string"  => "<input type='image' src='images/lists/trash.png' title='"._("Remove")."' name='del_target_".$key."'>",
               "attach"  => "style='width:20px; border-right:0px;'")
             ));
     }
diff --git a/gosa-plugins/goto/addons/goto/events/class_DaemonEvent_activate.inc b/gosa-plugins/goto/addons/goto/events/class_DaemonEvent_activate.inc
index af023a6dd..3a1e384ed 100644
--- a/gosa-plugins/goto/addons/goto/events/class_DaemonEvent_activate.inc
+++ b/gosa-plugins/goto/addons/goto/events/class_DaemonEvent_activate.inc
@@ -31,8 +31,8 @@ class DaemonEvent_activate extends DaemonEvent
     $this->s_Schedule_Action = "job_trigger_action_activate";
     $this->s_Trigger_Action= "gosa_trigger_action_activate";
     $this->s_Queued_Action= "trigger_action_activate";
-    $this->s_Menu_Image = "images/openlock.png";
-    $this->s_List_Image = "images/openlock.png";
+    $this->s_Menu_Image = "images/lists/unlocked.png";
+    $this->s_List_Image = "images/lists/unlocked.png";
   }
 
   public function execute()
diff --git a/gosa-plugins/goto/addons/goto/events/class_DaemonEvent_lock.inc b/gosa-plugins/goto/addons/goto/events/class_DaemonEvent_lock.inc
index 02100e037..8074378c6 100644
--- a/gosa-plugins/goto/addons/goto/events/class_DaemonEvent_lock.inc
+++ b/gosa-plugins/goto/addons/goto/events/class_DaemonEvent_lock.inc
@@ -31,8 +31,8 @@ class DaemonEvent_lock extends DaemonEvent
     $this->s_Schedule_Action = "job_trigger_action_lock";
     $this->s_Trigger_Action= "gosa_trigger_action_lock";
     $this->s_Queued_Action= "trigger_action_lock";
-    $this->s_Menu_Image = "images/closedlock.png";
-    $this->s_List_Image = "images/closedlock.png";
+    $this->s_Menu_Image = "images/lists/locked.png";
+    $this->s_List_Image = "images/lists/locked.png";
   }
 
   public function execute()
diff --git a/gosa-plugins/goto/addons/goto/events/class_DaemonEvent_reboot.inc b/gosa-plugins/goto/addons/goto/events/class_DaemonEvent_reboot.inc
index e0b55999d..b11bd3b4e 100644
--- a/gosa-plugins/goto/addons/goto/events/class_DaemonEvent_reboot.inc
+++ b/gosa-plugins/goto/addons/goto/events/class_DaemonEvent_reboot.inc
@@ -31,8 +31,8 @@ class DaemonEvent_reboot extends DaemonEvent
     $this->s_Schedule_Action = "job_trigger_action_reboot";
     $this->s_Trigger_Action= "gosa_trigger_action_reboot";
     $this->s_Queued_Action= "trigger_action_reboot";
-    $this->s_Menu_Image = "images/list_reload.png";
-    $this->s_List_Image = "images/list_reload.png";
+    $this->s_Menu_Image = "images/lists/reload.png";
+    $this->s_List_Image = "images/lists/reload.png";
   }
 
   public function execute()
diff --git a/gosa-plugins/goto/admin/applications/class_divListApplication.inc b/gosa-plugins/goto/admin/applications/class_divListApplication.inc
index a1e3c31c0..d5271b117 100644
--- a/gosa-plugins/goto/admin/applications/class_divListApplication.inc
+++ b/gosa-plugins/goto/admin/applications/class_divListApplication.inc
@@ -156,22 +156,22 @@ class divListApplication extends MultiSelectWindow
 
     /* Multiple options */
     $s.= "..|---|\n";
-    $s.= "..|<img src='images/edittrash.png' alt='' border='0' class='center'>".
+    $s.= "..|<img src='images/lists/trash.png' alt='' border='0' class='center'>".
       "&nbsp;"._("Remove")."|"."remove_multiple|\n";
 
     /* Add multiple copy & cut icons */
     if(is_object($this->parent->CopyPasteHandler) && preg_match("/(c.*w|w.*c)/",$acl_all)){
       $s.= "..|---|\n";
-      $s.= "..|<img src='images/editcopy.png' alt='' border='0' class='center'>".
+      $s.= "..|<img src='images/lists/copy.png' alt='' border='0' class='center'>".
         "&nbsp;"._("Copy")."|"."multiple_copy_systems|\n";
-      $s.= "..|<img src='images/editcut.png' alt='' border='0' class='center'>".
+      $s.= "..|<img src='images/lists/cut.png' alt='' border='0' class='center'>".
         "&nbsp;"._("Cut")."|"."multiple_cut_systems|\n";
 
       if($this->parent->CopyPasteHandler->entries_queued()){
-        $img = "<img border='0' class='center' src='images/editpaste.png' alt=''>";
+        $img = "<img border='0' class='center' src='images/lists/paste.png' alt=''>";
         $s.="..|".$img."&nbsp;"._("Paste")."|editPaste|\n";
       }else{
-        $img = "<img border='0' class='center' src='images/cant_editpaste.png' alt=''>";
+        $img = "<img border='0' class='center' src='images/cant_lists/paste.png' alt=''>";
         $s.="..|".$img."&nbsp;"._("Paste")."\n";
       }
     }
@@ -233,10 +233,10 @@ class divListApplication extends MultiSelectWindow
         /* Only add cut icon, if we are allowed to move this user */
         if(preg_match("/m/",$acl)){
           $actions.= "<input class='center' type='image'
-            src='images/editcut.png' alt='"._("cut")."' name='cut_%KEY%' title='"._("Cut this entry")."'>&nbsp;";
+            src='images/lists/cut.png' alt='"._("cut")."' name='cut_%KEY%' title='"._("Cut this entry")."'>&nbsp;";
 
           $actions.= "<input class='center' type='image'
-            src='images/editcopy.png' alt='"._("copy")."' name='copy_%KEY%' title='"._("Copy this entry")."'>&nbsp;";
+            src='images/lists/copy.png' alt='"._("copy")."' name='copy_%KEY%' title='"._("Copy this entry")."'>&nbsp;";
         }
       }
 
@@ -252,7 +252,7 @@ class divListApplication extends MultiSelectWindow
       /* If we are allowed to remove the application account, display remove icon */
       if(preg_match("/d/",$acl)){
         $actions.= "<input class='center' type='image'
-          src='images/edittrash.png' alt='"._("delete")."' name='appl_del_%KEY%' title='"._("Delete this entry")."'>";
+          src='images/lists/trash.png' alt='"._("delete")."' name='appl_del_%KEY%' title='"._("Delete this entry")."'>";
       }else{
         $actions.= "<img src='images/empty.png' alt='&nbsp;'>";
       }
diff --git a/gosa-plugins/goto/admin/applications/main.inc b/gosa-plugins/goto/admin/applications/main.inc
index 7b748386a..0dadb0250 100644
--- a/gosa-plugins/goto/admin/applications/main.inc
+++ b/gosa-plugins/goto/admin/applications/main.inc
@@ -36,7 +36,7 @@ if ($remove_lock){
 
 	/* Page header*/
 	if (session::is_set('objectinfo')){
-		$display= print_header(get_template_path('images/application.png'), _("Application management"), "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/closedlock.png')."\"> ".@LDAP::fix(session::get('objectinfo')));
+		$display= print_header(get_template_path('images/application.png'), _("Application management"), "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/lists/locked.png')."\"> ".@LDAP::fix(session::get('objectinfo')));
 	} else {
 		$display= print_header(get_template_path('images/application.png'), _("Application management"));
 	}
diff --git a/gosa-plugins/goto/admin/devices/class_divListDevices.inc b/gosa-plugins/goto/admin/devices/class_divListDevices.inc
index a34d444ee..b9a8a6c6e 100644
--- a/gosa-plugins/goto/admin/devices/class_divListDevices.inc
+++ b/gosa-plugins/goto/admin/devices/class_divListDevices.inc
@@ -144,22 +144,22 @@ class divListDevices extends MultiSelectWindow
 
     /* Multiple options */
     $s.= "..|---|\n";
-    $s.= "..|<img src='images/edittrash.png' alt='' border='0' class='center'>".
+    $s.= "..|<img src='images/lists/trash.png' alt='' border='0' class='center'>".
       "&nbsp;"._("Remove")."|"."remove_multiple|\n";
 
     /* Add multiple copy & cut icons */
     if(is_object($this->parent->CopyPasteHandler) && preg_match("/(c.*w|w.*c)/",$acl_all)){
       $s.= "..|---|\n";
-      $s.= "..|<img src='images/editcopy.png' alt='' border='0' class='center'>".
+      $s.= "..|<img src='images/lists/copy.png' alt='' border='0' class='center'>".
         "&nbsp;"._("Copy")."|"."multiple_copy_systems|\n";
-      $s.= "..|<img src='images/editcut.png' alt='' border='0' class='center'>".
+      $s.= "..|<img src='images/lists/cut.png' alt='' border='0' class='center'>".
         "&nbsp;"._("Cut")."|"."multiple_cut_systems|\n";
 
       if($this->parent->CopyPasteHandler->entries_queued()){
-        $img = "<img border='0' class='center' src='images/editpaste.png' alt=''>";
+        $img = "<img border='0' class='center' src='images/lists/paste.png' alt=''>";
         $s.="..|".$img."&nbsp;"._("Paste")."|editPaste|\n";
       }else{
-        $img = "<img border='0' class='center' src='images/cant_editpaste.png' alt=''>";
+        $img = "<img border='0' class='center' src='images/cant_lists/paste.png' alt=''>";
         $s.="..|".$img."&nbsp;"._("Paste")."\n";
       }
     }
@@ -222,9 +222,9 @@ class divListDevices extends MultiSelectWindow
       /* Get copy Paste icons */
       if(($this->parent->CopyPasteHandler) && preg_match("/(c.*w|w.*c)/",$acl_all)){
         $actions.= "<input class='center' type='image'
-          src='images/editcut.png' alt='"._("cut")."' name='cut_%KEY%' title='"._("Cut this entry")."'>&nbsp;";
+          src='images/lists/cut.png' alt='"._("cut")."' name='cut_%KEY%' title='"._("Cut this entry")."'>&nbsp;";
         $actions.= "<input class='center' type='image'
-          src='images/editcopy.png' alt='"._("copy")."' name='copy_%KEY%' title='"._("Copy this entry")."'>&nbsp;";
+          src='images/lists/copy.png' alt='"._("copy")."' name='copy_%KEY%' title='"._("Copy this entry")."'>&nbsp;";
       }
 
       $actions.= "<input class='center' type='image'
@@ -233,7 +233,7 @@ class divListDevices extends MultiSelectWindow
       /* Add delete button */
       if(preg_match("/d/",$acl)){
         $actions.= "<input class='center' type='image'
-          src='images/edittrash.png' alt='"._("delete")."' name='device_del_%KEY%' title='"._("Delete this entry")."'>";
+          src='images/lists/trash.png' alt='"._("delete")."' name='device_del_%KEY%' title='"._("Delete this entry")."'>";
       }else{
         $actions.= "<img src='images/empty.png' alt='&nbsp;' class='center'>";
       }
diff --git a/gosa-plugins/goto/admin/devices/main.inc b/gosa-plugins/goto/admin/devices/main.inc
index 33f84118a..396ee2233 100644
--- a/gosa-plugins/goto/admin/devices/main.inc
+++ b/gosa-plugins/goto/admin/devices/main.inc
@@ -39,7 +39,7 @@ if ($remove_lock){
 
 		/* Page header*/
 		if (session::is_set('objectinfo')){
-				$display= print_header(get_template_path('images/devices.png'), _("Hotplug device management"), "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/closedlock.png')."\"> ".@LDAP::fix(session::get('objectinfo')));
+				$display= print_header(get_template_path('images/devices.png'), _("Hotplug device management"), "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/lists/locked.png')."\"> ".@LDAP::fix(session::get('objectinfo')));
 		} else {
 				$display= print_header(get_template_path('images/devices.png'), _("Hotplug device management"));
 		}
diff --git a/gosa-plugins/goto/admin/groups/apps/app_list.tpl b/gosa-plugins/goto/admin/groups/apps/app_list.tpl
index feb319bdd..69941fdfe 100644
--- a/gosa-plugins/goto/admin/groups/apps/app_list.tpl
+++ b/gosa-plugins/goto/admin/groups/apps/app_list.tpl
@@ -77,7 +77,7 @@
 				<input title="{t}Move down{/t}" class="center" type='image' 
 					name='down_{$item.UNIQID}' src='images/move_object_down.png'>
 				<input title="{t}Remove{/t}" 	class="center" type='image' 
-					name='del_{$item.UNIQID}' src='images/edittrash.png'>
+					name='del_{$item.UNIQID}' src='images/lists/trash.png'>
 				<input title="{t}Edit{/t}" 	 	class="center" type='image' 
 					name='app_entry_edit{$item.UNIQID}' src='images/edit.png'>
 			</td>
@@ -98,7 +98,7 @@
                 <input title="{t}Move down{/t}" class="center" type='image'
                     name='down_{$item.UNIQID}' src='images/move_object_down.png'>
                 <input title="{t}Remove{/t}"    class="center" type='image'
-                    name='del_{$item.UNIQID}' src='images/edittrash.png'>
+                    name='del_{$item.UNIQID}' src='images/lists/trash.png'>
 				<img src="images/empty.png" style="width:16px;" alt=" ">
             </td>
 		</tr>
@@ -123,7 +123,7 @@
 				<input title="{t}Move down{/t}" class="center" type='image' 
 					name='down_{$item.UNIQID}' src='images/move_object_down.png'>
 				<input title="{t}Remove{/t}" 	class="center" type='image' 
-					name='del_{$item.UNIQID}' src='images/edittrash.png'>
+					name='del_{$item.UNIQID}' src='images/lists/trash.png'>
 				<input title="{t}Edit{/t}" 	 	class="center" type='image' 
 					name='app_entry_edit{$item.UNIQID}' src='images/edit.png'>
 			</td>
diff --git a/gosa-plugins/goto/admin/mimetypes/class_divListMimeTypes.inc b/gosa-plugins/goto/admin/mimetypes/class_divListMimeTypes.inc
index e2620fefc..9dad4165a 100644
--- a/gosa-plugins/goto/admin/mimetypes/class_divListMimeTypes.inc
+++ b/gosa-plugins/goto/admin/mimetypes/class_divListMimeTypes.inc
@@ -177,22 +177,22 @@ class divListMimeTypes extends MultiSelectWindow
 
     /* Multiple options */
     $s.= "..|---|\n";
-    $s.= "..|<img src='images/edittrash.png' alt='' border='0' class='center'>".
+    $s.= "..|<img src='images/lists/trash.png' alt='' border='0' class='center'>".
       "&nbsp;"._("Remove")."|"."remove_multiple|\n";
 
     /* Add multiple copy & cut icons */
     if(is_object($this->parent->CopyPasteHandler) && preg_match("/(c.*w|w.*c)/",$acl_all)){
       $s.= "..|---|\n";
-      $s.= "..|<img src='images/editcopy.png' alt='' border='0' class='center'>".
+      $s.= "..|<img src='images/lists/copy.png' alt='' border='0' class='center'>".
         "&nbsp;"._("Copy")."|"."multiple_copy_systems|\n";
-      $s.= "..|<img src='images/editcut.png' alt='' border='0' class='center'>".
+      $s.= "..|<img src='images/lists/cut.png' alt='' border='0' class='center'>".
         "&nbsp;"._("Cut")."|"."multiple_cut_systems|\n";
 
       if($this->parent->CopyPasteHandler->entries_queued()){
-        $img = "<img border='0' class='center' src='images/editpaste.png' alt=''>";
+        $img = "<img border='0' class='center' src='images/lists/paste.png' alt=''>";
         $s.="..|".$img."&nbsp;"._("Paste")."|editPaste|\n";
       }else{
-        $img = "<img border='0' class='center' src='images/cant_editpaste.png' alt=''>";
+        $img = "<img border='0' class='center' src='images/cant_lists/paste.png' alt=''>";
         $s.="..|".$img."&nbsp;"._("Paste")."\n";
       }
     }
@@ -254,9 +254,9 @@ class divListMimeTypes extends MultiSelectWindow
       /* Get copy Paste icons */
       if(($this->parent->CopyPasteHandler) && preg_match("/(c.*w|w.*c)/",$acl_all)){
         $actions.= "<input class='center' type='image'
-          src='images/editcut.png' alt='"._("cut")."' name='cut_%KEY%' title='"._("Cut this entry")."'>&nbsp;";
+          src='images/lists/cut.png' alt='"._("cut")."' name='cut_%KEY%' title='"._("Cut this entry")."'>&nbsp;";
         $actions.= "<input class='center' type='image'
-          src='images/editcopy.png' alt='"._("copy")."' name='copy_%KEY%' title='"._("Copy this entry")."'>&nbsp;";
+          src='images/lists/copy.png' alt='"._("copy")."' name='copy_%KEY%' title='"._("Copy this entry")."'>&nbsp;";
       }
 
       $actions.= "<input class='center' type='image'
@@ -265,7 +265,7 @@ class divListMimeTypes extends MultiSelectWindow
       /* Add delete button */
       if(preg_match("/d/",$acl)){
         $actions.= "<input class='center' type='image'
-          src='images/edittrash.png' alt='"._("delete")."' name='mime_del_%KEY%' title='"._("Delete this entry")."'>";
+          src='images/lists/trash.png' alt='"._("delete")."' name='mime_del_%KEY%' title='"._("Delete this entry")."'>";
       }else{
         $actions.= "<img src='images/empty.png' alt='&nbsp;' class='center'>";
       }
diff --git a/gosa-plugins/goto/admin/mimetypes/class_mimetypeGeneric.inc b/gosa-plugins/goto/admin/mimetypes/class_mimetypeGeneric.inc
index f5462a3e4..366dd01b2 100644
--- a/gosa-plugins/goto/admin/mimetypes/class_mimetypeGeneric.inc
+++ b/gosa-plugins/goto/admin/mimetypes/class_mimetypeGeneric.inc
@@ -301,7 +301,7 @@ class mimetype extends plugin
     if($this->acl_is_writeable("gotoMimeFilePattern")){
       $Pattern_Actions= " <input type='image' src='images/sort_up.png' 	class='center'	name='Pattern_SortUp_%s' >&nbsp;
       <input type='image' src='images/sort_down.png' 	class='center'  name='Pattern_SortDown_%s'>&nbsp;
-      <input type='image' src='images/edittrash.png'	class='center'  name='Pattern_Remove_%s'>";
+      <input type='image' src='images/lists/trash.png'	class='center'  name='Pattern_Remove_%s'>";
     }else{
       $Pattern_Actions= "";	
     }
@@ -309,7 +309,7 @@ class mimetype extends plugin
     if($this->acl_is_writeable("gotoMimeApplication")){
       $Apps_Actions 	= " <input type='image' src='images/sort_up.png' 	class='center'	name='Apps_SortUp_%s' >&nbsp;
       <input type='image' src='images/sort_down.png' 	class='center'  name='Apps_SortDown_%s'>&nbsp;
-      <input type='image' src='images/edittrash.png'	class='center'  name='Apps_Remove_%s'>";
+      <input type='image' src='images/lists/trash.png'	class='center'  name='Apps_Remove_%s'>";
     }else{
       $Apps_Actions= "";	
     }
@@ -317,7 +317,7 @@ class mimetype extends plugin
     if($this->acl_is_writeable("gotoMimeEmbeddedApplication")){
       $EApps_Actions 	= " <input type='image' src='images/sort_up.png' 	class='center'	name='EApps_SortUp_%s' >&nbsp;
       <input type='image' src='images/sort_down.png' 	class='center'  name='EApps_SortDown_%s'>&nbsp;
-      <input type='image' src='images/edittrash.png'	class='center'  name='EApps_Remove_%s'>";
+      <input type='image' src='images/lists/trash.png'	class='center'  name='EApps_Remove_%s'>";
     }else{
       $EApps_Actions= "";	
     }
diff --git a/gosa-plugins/goto/admin/mimetypes/main.inc b/gosa-plugins/goto/admin/mimetypes/main.inc
index de9214254..29870f130 100644
--- a/gosa-plugins/goto/admin/mimetypes/main.inc
+++ b/gosa-plugins/goto/admin/mimetypes/main.inc
@@ -39,7 +39,7 @@ if ($remove_lock){
 
 		/* Page header*/
 		if (session::is_set('objectinfo')){
-				$display= print_header(get_template_path('images/mimetypes.png'), _("Mimetype management"), "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/closedlock.png')."\"> ".@LDAP::fix(session::get('objectinfo')));
+				$display= print_header(get_template_path('images/mimetypes.png'), _("Mimetype management"), "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/lists/locked.png')."\"> ".@LDAP::fix(session::get('objectinfo')));
 		} else {
 				$display= print_header(get_template_path('images/mimetypes.png'), _("Mimetype management"));
 		}
diff --git a/gosa-plugins/goto/admin/systems/goto/class_selectUserToPrinterDialog.inc b/gosa-plugins/goto/admin/systems/goto/class_selectUserToPrinterDialog.inc
index cdc91d295..67bb9a946 100644
--- a/gosa-plugins/goto/admin/systems/goto/class_selectUserToPrinterDialog.inc
+++ b/gosa-plugins/goto/admin/systems/goto/class_selectUserToPrinterDialog.inc
@@ -123,7 +123,7 @@ class selectUserToPrinterDialog extends plugin
     $smarty->assign("search_image"        , get_template_path('images/search.png'));
     $smarty->assign("tree_image"          , get_template_path('images/tree.png'));
     $smarty->assign("infoimage"           , get_template_path('images/info.png'));
-    $smarty->assign("launchimage"         , get_template_path('images/small_filter.png'));
+    $smarty->assign("launchimage"         , get_template_path('images/lists/action.png'));
     $smarty->assign("deplist"             , $deps);
     $smarty->assign("subtree", $this->subtree?"checked":"");
 
diff --git a/gosa-plugins/goto/admin/systems/goto/class_terminalStartup.inc b/gosa-plugins/goto/admin/systems/goto/class_terminalStartup.inc
index b8269365f..e8d180726 100644
--- a/gosa-plugins/goto/admin/systems/goto/class_terminalStartup.inc
+++ b/gosa-plugins/goto/admin/systems/goto/class_terminalStartup.inc
@@ -282,7 +282,7 @@ class termstartup extends plugin
             array("string" =>
               "<input class='center' type='image' src='images/sort_up.png' name='sort_ldap_up_".$key."'>&nbsp;".
               "<input class='center' type='image' src='images/sort_down.png' name='sort_ldap_down_".$key."'>&nbsp;".
-              "<input class='center' type='image' src='images/edittrash.png' name='gotoLdapRemove_".$key."'>",
+              "<input class='center' type='image' src='images/lists/trash.png' name='gotoLdapRemove_".$key."'>",
               "attach" => "style='text-align:right;width:40px;border-right:0px;'")));
     }
 
diff --git a/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc b/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc
index bcbccbd9b..4bc7db796 100644
--- a/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc
+++ b/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc
@@ -569,7 +569,7 @@ class workstartup extends plugin
             array("string" => 
               "<input class='center' type='image' src='images/sort_up.png' name='sort_ldap_up_".$key."'>&nbsp;".
               "<input class='center' type='image' src='images/sort_down.png' name='sort_ldap_down_".$key."'>&nbsp;".
-              "<input class='center' type='image' src='images/edittrash.png' name='gotoLdapRemove_".$key."'>",
+              "<input class='center' type='image' src='images/lists/trash.png' name='gotoLdapRemove_".$key."'>",
               "attach" => "style='text-align:right;width:40px;border-right:0px;'")));
     }    
 
@@ -629,7 +629,7 @@ class workstartup extends plugin
       $div -> SetHeight("110");
       $str_up     = " &nbsp;<input type='image' src='images/sort_up.png'    name='sort_up_%s'    value='%s'>";
       $str_down   = " &nbsp;<input type='image' src='images/sort_down.png'  name='sort_down_%s'  value='%s'>";
-      $str_remove = " &nbsp;<input type='image' src='images/edittrash.png'  name='fai_remove_%s' value='%s'>";
+      $str_remove = " &nbsp;<input type='image' src='images/lists/trash.png'  name='fai_remove_%s' value='%s'>";
       $str_empty  = " &nbsp;<img src='images/empty.png' alt=\"\" width='7'>"; 
 
       /* Get classes */
diff --git a/gosa-plugins/goto/admin/systems/goto/printer.tpl b/gosa-plugins/goto/admin/systems/goto/printer.tpl
index 344c51af2..206b151e5 100644
--- a/gosa-plugins/goto/admin/systems/goto/printer.tpl
+++ b/gosa-plugins/goto/admin/systems/goto/printer.tpl
@@ -79,7 +79,7 @@
 
 <p class="plugbottom" style="margin-bottom:0px; padding:0px;">&nbsp;</p>
 
-<h2><img class="center" alt="" align="middle" src="images/closedlock.png"> {t}Permissions{/t}</h2>
+<h2><img class="center" alt="" align="middle" src="images/lists/locked.png"> {t}Permissions{/t}</h2>
 <table summary="" width="100%">
  <tr>
   <td style="border-right:1px solid #B0B0B0; width:50%">
diff --git a/gosa-plugins/goto/admin/systems/goto/terminalService.tpl b/gosa-plugins/goto/admin/systems/goto/terminalService.tpl
index 3cf83baaa..5b5fc62a1 100644
--- a/gosa-plugins/goto/admin/systems/goto/terminalService.tpl
+++ b/gosa-plugins/goto/admin/systems/goto/terminalService.tpl
@@ -181,7 +181,7 @@
 			onChange="document.mainform.submit();">
        {html_options options=$XMethods selected=$gotoXMethod_select}
       </select>
-	  <input type="image" src="images/list_reload.png" alt="{t}Reload{/t}" title="{t}Reload{/t}" class="center">
+	  <input type="image" src="images/lists/reload.png" alt="{t}Reload{/t}" title="{t}Reload{/t}" class="center">
 {/render}
      </td>
     </tr>
diff --git a/gosa-plugins/goto/admin/systems/goto/terminalStartup.tpl b/gosa-plugins/goto/admin/systems/goto/terminalStartup.tpl
index 6cd45b5c3..262cee6d3 100644
--- a/gosa-plugins/goto/admin/systems/goto/terminalStartup.tpl
+++ b/gosa-plugins/goto/admin/systems/goto/terminalStartup.tpl
@@ -10,7 +10,7 @@
       onClick="document.mainform.submit();" class='center'>
 &nbsp;{t}inherit from group{/t})
 {if !$JS}
-      <input type='image' src="images/list_reload.png" alt='{t}Reload{/t}' class='center'>
+      <input type='image' src="images/lists/reload.png" alt='{t}Reload{/t}' class='center'>
 {/if}
 {/render}
 {render acl=$gotoLdapServerACL_inherit}
diff --git a/gosa-plugins/goto/admin/systems/goto/workstationStartup.tpl b/gosa-plugins/goto/admin/systems/goto/workstationStartup.tpl
index 6bb8bbc29..60fee23be 100644
--- a/gosa-plugins/goto/admin/systems/goto/workstationStartup.tpl
+++ b/gosa-plugins/goto/admin/systems/goto/workstationStartup.tpl
@@ -31,7 +31,7 @@
 	onClick="document.mainform.submit();" class='center'>
 &nbsp;{t}inherit from group{/t})
 {if !$JS}
-	<input type='image' src="images/list_reload.png" alt='{t}Reload{/t}' class='center'>
+	<input type='image' src="images/lists/reload.png" alt='{t}Reload{/t}' class='center'>
 {/if}
 {/if}
 {/render}
diff --git a/gosa-plugins/goto/admin/systems/ppd/class_printerPPDSelectionDialog.inc b/gosa-plugins/goto/admin/systems/ppd/class_printerPPDSelectionDialog.inc
index 6d724bfdc..deb70f173 100644
--- a/gosa-plugins/goto/admin/systems/ppd/class_printerPPDSelectionDialog.inc
+++ b/gosa-plugins/goto/admin/systems/ppd/class_printerPPDSelectionDialog.inc
@@ -133,7 +133,7 @@ class printerPPDSelectionDialog extends plugin
                  </a>";
     $uselink  = "<a href='?plug=".$_GET['plug']."&amp;act=use&amp;id=%s'>%s</a>";
     $dellink  = "<a href='?plug=".$_GET['plug']."&amp;act=del&amp;id=%s'>
-                  <img src='images/edittrash.png' alt='"._("delete")."' border=0>
+                  <img src='images/lists/trash.png' alt='"._("delete")."' border=0>
                  </a>"; 
 
     if(empty($this->Vendor)){
@@ -166,7 +166,7 @@ class printerPPDSelectionDialog extends plugin
 
     $smarty->assign("List",         $div -> DrawList());
     $smarty->assign("search_image", get_template_path('images/search.png'));
-    $smarty->assign("launchimage",  get_template_path('images/small_filter.png'));
+    $smarty->assign("launchimage",  get_template_path('images/lists/action.png'));
     $smarty->assign("tree_image",   get_template_path('images/tree.png'));
     $smarty->assign("alphabet",     generate_alphabet());
     $smarty->assign("apply",        apply_filter());
diff --git a/gosa-plugins/goto/admin/systems/services/kiosk/class_goKioskService.inc b/gosa-plugins/goto/admin/systems/services/kiosk/class_goKioskService.inc
index a91d6837d..ca1410f82 100644
--- a/gosa-plugins/goto/admin/systems/services/kiosk/class_goKioskService.inc
+++ b/gosa-plugins/goto/admin/systems/services/kiosk/class_goKioskService.inc
@@ -163,7 +163,7 @@ class goKioskService extends goService{
     foreach($this->gotoKioskProfiles as $key => $val ){
       $divlist->AddEntry(array(
             array("string"=>"<a href='?plug=".$_GET['plug']."&getkiosk=".$val['name']."'>".$val['name']."</a>"),
-            array("string"=>"<input type='image' src='images/edittrash.png'
+            array("string"=>"<input type='image' src='images/lists/trash.png'
               class='center' alt='delete' name='delkiosk_".$key."'>" ,
               "attach"=>" style='border-right: 0px;width:24px; text-align:center;' ")
             ));
diff --git a/gosa-plugins/goto/admin/systems/services/repository/class_divListRepositories.inc b/gosa-plugins/goto/admin/systems/services/repository/class_divListRepositories.inc
index 6e43dc18c..baa9c411f 100644
--- a/gosa-plugins/goto/admin/systems/services/repository/class_divListRepositories.inc
+++ b/gosa-plugins/goto/admin/systems/services/repository/class_divListRepositories.inc
@@ -47,7 +47,7 @@ class divListRepository extends MultiSelectWindow
 
     /* Hide delete icon, if delete is not allowed */
     if($this->parent->acl_is_removeable()){
-      $delete = "<input type='image' value='%s' name='delete_%s' src='images/edittrash.png'>";
+      $delete = "<input type='image' value='%s' name='delete_%s' src='images/lists/trash.png'>";
     }else{
       $delete = "<img src='images/empty.png' alt='&nbsp;'>";
     }
diff --git a/gosa-plugins/goto/admin/systems/services/repository/class_servRepository.inc b/gosa-plugins/goto/admin/systems/services/repository/class_servRepository.inc
index a3557c402..265d825fc 100644
--- a/gosa-plugins/goto/admin/systems/services/repository/class_servRepository.inc
+++ b/gosa-plugins/goto/admin/systems/services/repository/class_servRepository.inc
@@ -243,7 +243,7 @@ class servrepository extends goService
    
     /* Hide delete icon, if delete is not allowed */ 
     if($this->acl_is_removeable()){
-      $delete = "<input type='image' value='%s' name='delete_%s' src='images/edittrash.png'>";
+      $delete = "<input type='image' value='%s' name='delete_%s' src='images/lists/trash.png'>";
     }else{
       $delete = "<img src='images/empty.png' alt='&nbsp;'>";
     }
diff --git a/gosa-plugins/goto/admin/systems/services/repository/class_servRepositorySetup.inc b/gosa-plugins/goto/admin/systems/services/repository/class_servRepositorySetup.inc
index 1637b8330..ad7ee735b 100644
--- a/gosa-plugins/goto/admin/systems/services/repository/class_servRepositorySetup.inc
+++ b/gosa-plugins/goto/admin/systems/services/repository/class_servRepositorySetup.inc
@@ -92,7 +92,7 @@ class servRepositorySetup  extends plugin
     $divlist = new divSelectBox("servRepositorySetup");
     $divlist->setHeight("220");
 
-    $dellink = "<input type='image' src='images/edittrash.png' title='delete' alt='delete' name='delete_%s' value='%s'>";
+    $dellink = "<input type='image' src='images/lists/trash.png' title='delete' alt='delete' name='delete_%s' value='%s'>";
 
     foreach($this->Sections as $sec){
       $divlist->AddEntry(array(
diff --git a/gosa-plugins/goto/personal/environment/class_environment.inc b/gosa-plugins/goto/personal/environment/class_environment.inc
index 24ac7a14f..292fc5788 100644
--- a/gosa-plugins/goto/personal/environment/class_environment.inc
+++ b/gosa-plugins/goto/personal/environment/class_environment.inc
@@ -762,7 +762,7 @@ class environment extends plugin
             title='"._("Reset password hash")."'>";
           $img.= "&nbsp;";
         }
-        $img.= "<input type='image' name='gotoShareDel_".base64_encode($key)." 'src='images/edittrash.png' alt='".msgPool::delButton()."' 
+        $img.= "<input type='image' name='gotoShareDel_".base64_encode($key)." 'src='images/lists/trash.png' alt='".msgPool::delButton()."' 
           title='"._("Delete share entry")."'>";
         $field1 = array("string" => $value , "attach" => "style='".$color."'");
         $field2 = array("string" => $img   , "attach" => "style='border-right:0px;'");
diff --git a/gosa-plugins/goto/personal/environment/class_hotplugDialog.inc b/gosa-plugins/goto/personal/environment/class_hotplugDialog.inc
index 4f8b820e3..5a14e4e38 100644
--- a/gosa-plugins/goto/personal/environment/class_hotplugDialog.inc
+++ b/gosa-plugins/goto/personal/environment/class_hotplugDialog.inc
@@ -46,7 +46,7 @@ class hotplugDialog extends plugin
     $smarty->assign("alphabet", generate_alphabet());
     $smarty->assign("search_image", get_template_path('images/search.png'));
     $smarty->assign("tree_image", get_template_path('images/tree.png'));
-    $smarty->assign("launchimage", get_template_path('images/small_filter.png'));
+    $smarty->assign("launchimage", get_template_path('images/lists/action.png'));
     $smarty->assign("deplist", $this->config->idepartments);
 
 
diff --git a/gosa-plugins/goto/personal/environment/class_selectPrinterDialog.inc b/gosa-plugins/goto/personal/environment/class_selectPrinterDialog.inc
index b804ce2fb..025ab8ff4 100644
--- a/gosa-plugins/goto/personal/environment/class_selectPrinterDialog.inc
+++ b/gosa-plugins/goto/personal/environment/class_selectPrinterDialog.inc
@@ -92,7 +92,7 @@ class selectPrinterDialog extends plugin
     $smarty->assign("search_image", get_template_path('images/search.png'));
     $smarty->assign("tree_image", get_template_path('images/tree.png'));
     $smarty->assign("infoimage", get_template_path('images/info.png'));
-    $smarty->assign("launchimage", get_template_path('images/small_filter.png'));
+    $smarty->assign("launchimage", get_template_path('images/lists/action.png'));
     $smarty->assign("deplist", $this->config->idepartments);
 
     $display.= $smarty->fetch(get_template_path('selectPrinterDialog.tpl', TRUE,dirname(__FILE__)));
diff --git a/gosa-plugins/goto/personal/environment/main.inc b/gosa-plugins/goto/personal/environment/main.inc
index 88cbb89a2..cd86705c9 100644
--- a/gosa-plugins/goto/personal/environment/main.inc
+++ b/gosa-plugins/goto/personal/environment/main.inc
@@ -102,10 +102,10 @@ if (!$remove_lock){
       $display.= "<input type=submit name=\"edit_finish\" style=\"width:80px\" value=\"".msgPool::okButton()."\">\n";
       $display.= "&nbsp;";
       $display.= "<input type=submit name=\"edit_cancel\" value=\"".msgPool::cancelButton()."\">\n";
-      $info= "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/closedlock.png').
+      $info= "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/lists/locked.png').
              "\"> ".$ui->dn."&nbsp;";
     } else {
-      $info= "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/openlock.png').
+      $info= "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/lists/unlocked.png').
         "\"> ".$ui->dn."&nbsp;";
       if(preg_match("/w/",$ui->get_permissions($ui->dn,"users/environment"))){
         $info.= "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/lamp.png').
diff --git a/gosa-plugins/kolab/personal/connectivity/kolab/class_kolabAccount.inc b/gosa-plugins/kolab/personal/connectivity/kolab/class_kolabAccount.inc
index 640abf3c3..76f3abd59 100644
--- a/gosa-plugins/kolab/personal/connectivity/kolab/class_kolabAccount.inc
+++ b/gosa-plugins/kolab/personal/connectivity/kolab/class_kolabAccount.inc
@@ -283,7 +283,7 @@ class kolabAccount extends plugin
         $button= "<input type='image' name=\"add_inv_".$nr."\" src='images/list_new.png' id='add".$nr."' ".$dis.">";
       }
       if ($nr != 0) {
-        $button.= "<input type='image' name=\"del_inv_".$nr."\" src='images/edittrash.png' id='remove".$nr."' ".$dis.">";
+        $button.= "<input type='image' name=\"del_inv_".$nr."\" src='images/lists/trash.png' id='remove".$nr."' ".$dis.">";
       }
       
       $invitation.= "</select>&nbsp;</td>
diff --git a/gosa-plugins/mail/addons/mailqueue/contents.tpl b/gosa-plugins/mail/addons/mailqueue/contents.tpl
index 139bcd481..c07ed95ad 100644
--- a/gosa-plugins/mail/addons/mailqueue/contents.tpl
+++ b/gosa-plugins/mail/addons/mailqueue/contents.tpl
@@ -26,13 +26,13 @@
 	<input name="search" value="{t}Search{/t}" type="submit">
 			</td>
 			<td style="border-left:1px solid #A0A0A0; text-align:right;">&nbsp;
-				<input name="del_all"  src="images/edittrash.png"			value="{t}Remove all messages{/t}" 		type="image" 
+				<input name="del_all"  src="images/lists/trash.png"			value="{t}Remove all messages{/t}" 		type="image" 
 					title="{t}Remove all messages from selected servers queue{/t}">
 				<input name="hold_all"    src="images/mailq_hold.png"			value="{t}Hold all messages{/t}" 		type="image"
 					title="{t}Hold all messages in selected servers queue{/t}">
 				<input name="unhold_all"    src="images/mailq_unhold.png"		value="{t}Release all messages{/t}" 	type="image"
 					title="{t}Release all messages in selected servers queue{/t}">
-				<input name="requeue_all" src="images/mailq_requeue.png"		value="{t}Requeue all messages{/t}" 	type="image"
+				<input name="requeue_all" src="images/lists/reload.png"		value="{t}Requeue all messages{/t}" 	type="image"
 					title="{t}Requeue all messages in selected servers queue{/t}">
    			</td>
 		</tr>
@@ -91,7 +91,7 @@
 		<td >{$entries[$key].Error}</td>
 		<td style="text-align:right">
 			<a href="{$plug}&amp;act=del&amp;id={$entries[$key].MailID}&amp;server={$entries[$key].Server}">
-				<img class="center" src="images/edittrash.png" border=0 alt="{t}delete{/t}" title="{t}Delete this message{/t}">
+				<img class="center" src="images/lists/trash.png" border=0 alt="{t}delete{/t}" title="{t}Delete this message{/t}">
 			</a>
 		{if $entries[$key].Hold == true}
 			<a href="{$plug}&amp;act=unhold&amp;id={$entries[$key].MailID}&amp;server={$entries[$key].Server}">
@@ -103,7 +103,7 @@
 			</a>
 		{/if}
 			<a href="{$plug}&amp;act=requeue&amp;id={$entries[$key].MailID}&amp;server={$entries[$key].Server}">
-				<img class="center" src="images/mailq_requeue.png" border=0 alt="{t}requeue{/t}" title="{t}Requeue this message{/t}">
+				<img class="center" src="images/lists/reload.png" border=0 alt="{t}requeue{/t}" title="{t}Requeue this message{/t}">
 			</a>
 			<a href="{$plug}&amp;act=header&amp;id={$entries[$key].MailID}&amp;server={$entries[$key].Server}">
 				<img class="center" src="images/mailq_header.png" border=0 alt="{t}header{/t}" title="{t}Display header from this message{/t}">
diff --git a/gosa-plugins/mail/admin/groups/mail/class_groupMail.inc b/gosa-plugins/mail/admin/groups/mail/class_groupMail.inc
index 81965ab94..2c27cae0b 100644
--- a/gosa-plugins/mail/admin/groups/mail/class_groupMail.inc
+++ b/gosa-plugins/mail/admin/groups/mail/class_groupMail.inc
@@ -548,7 +548,7 @@ class mailgroup extends plugin
       $smarty->assign("usearch_image", get_template_path('images/search_user.png'));
       $smarty->assign("tree_image", get_template_path('images/tree.png'));
       $smarty->assign("infoimage", get_template_path('images/info.png'));
-      $smarty->assign("launchimage", get_template_path('images/small_filter.png'));
+      $smarty->assign("launchimage", get_template_path('images/lists/action.png'));
       $smarty->assign("mailusers", $mailusers);
       $smarty->assign("deplist", $this->config->idepartments);
       $smarty->assign("apply", apply_filter());
diff --git a/gosa-plugins/mail/admin/groups/mail/mail.tpl b/gosa-plugins/mail/admin/groups/mail/mail.tpl
index 75fd19751..5dad64194 100644
--- a/gosa-plugins/mail/admin/groups/mail/mail.tpl
+++ b/gosa-plugins/mail/admin/groups/mail/mail.tpl
@@ -82,7 +82,7 @@
 			</select>
 		{/if}
 			{if !$JS}
-				<input type='image' src='images/list_reload.png' class='center' alt='{t}Reload{/t}'>
+				<input type='image' src='images/lists/reload.png' class='center' alt='{t}Reload{/t}'>
 			{/if}
 		</td>
 	</tr>
diff --git a/gosa-plugins/mail/admin/systems/services/mail/class_goMailServer.inc b/gosa-plugins/mail/admin/systems/services/mail/class_goMailServer.inc
index c01816c59..dd3a3140d 100644
--- a/gosa-plugins/mail/admin/systems/services/mail/class_goMailServer.inc
+++ b/gosa-plugins/mail/admin/systems/services/mail/class_goMailServer.inc
@@ -381,7 +381,7 @@ class goMailServer extends goService{
       }
 
       if($this->acl_is_writeable("postfixTransportTable")){
-        $img.= "<input type='image' src='images/edittrash.png' name='TranslationDel_".$key."' class='center'>&nbsp;";      
+        $img.= "<input type='image' src='images/lists/trash.png' name='TranslationDel_".$key."' class='center'>&nbsp;";      
       }
       $field1 = array("string"=> $entry['src']);
       $field2 = array("string"=> $entry['dst']);
@@ -410,7 +410,7 @@ class goMailServer extends goService{
       }
 
       if($this->acl_is_writeable("postfixSenderRestrictions")){
-        $img.= "<input type='image' src='images/edittrash.png' name='SenderRestrictDel_".$key."' class='center'>&nbsp;";     
+        $img.= "<input type='image' src='images/lists/trash.png' name='SenderRestrictDel_".$key."' class='center'>&nbsp;";     
       }
  
       $field1 = array("string"=> $entry['src']);
@@ -440,7 +440,7 @@ class goMailServer extends goService{
       }
 
       if($this->acl_is_writeable("postfixRecipientRestrictions")){
-        $img.= "<input type='image' src='images/edittrash.png' name='RecipientRestrictDel_".$key."' class='center'>&nbsp;";      
+        $img.= "<input type='image' src='images/lists/trash.png' name='RecipientRestrictDel_".$key."' class='center'>&nbsp;";      
       }
       $field1 = array("string"=> $entry['src']);
       $field2 = array("string"=> $entry['dst']);
diff --git a/gosa-plugins/mail/admin/systems/services/spam/class_goSpamServer.inc b/gosa-plugins/mail/admin/systems/services/spam/class_goSpamServer.inc
index 49fac88ec..350271450 100644
--- a/gosa-plugins/mail/admin/systems/services/spam/class_goSpamServer.inc
+++ b/gosa-plugins/mail/admin/systems/services/spam/class_goSpamServer.inc
@@ -184,7 +184,7 @@ class gospamserver extends goService{
     
       $actions = "<input type='image' src='images/edit.png'      name='editRule_%s'>";
       if($this->acl_is_writeable("saRule")){
-        $actions.= "<input type='image' src='images/edittrash.png' name='delRule_%s'>";
+        $actions.= "<input type='image' src='images/lists/trash.png' name='delRule_%s'>";
       }
     }
 
diff --git a/gosa-plugins/mail/personal/mail/class_mailAccount.inc b/gosa-plugins/mail/personal/mail/class_mailAccount.inc
index 8fd0ab2a8..3f1a07d78 100644
--- a/gosa-plugins/mail/personal/mail/class_mailAccount.inc
+++ b/gosa-plugins/mail/personal/mail/class_mailAccount.inc
@@ -511,7 +511,7 @@ class mailAccount extends plugin
       $smarty->assign("usearch_image", get_template_path('images/search_user.png'));
       $smarty->assign("tree_image", get_template_path('images/tree.png'));
       $smarty->assign("infoimage", get_template_path('images/info.png'));
-      $smarty->assign("launchimage", get_template_path('images/small_filter.png'));
+      $smarty->assign("launchimage", get_template_path('images/lists/action.png'));
       $smarty->assign("mailusers", $mailusers);
       if (isset($_POST['depselect'])){
         $smarty->assign("depselect", $_POST['depselect']);
diff --git a/gosa-plugins/mail/personal/mail/main.inc b/gosa-plugins/mail/personal/mail/main.inc
index 1c559490e..efbaf2212 100644
--- a/gosa-plugins/mail/personal/mail/main.inc
+++ b/gosa-plugins/mail/personal/mail/main.inc
@@ -104,10 +104,10 @@ if (!$remove_lock){
       $display.= "<input type=submit name=\"edit_finish\" style=\"width:80px\" value=\"".msgPool::okButton()."\">\n";
       $display.= "&nbsp;";
       $display.= "<input type=submit name=\"edit_cancel\" value=\"".msgPool::cancelButton()."\">\n";
-      $info= "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/closedlock.png').
+      $info= "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/lists/locked.png').
              "\"> ".$ui->dn."&nbsp;";
     } else {
-      $info= "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/openlock.png').
+      $info= "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/lists/unlocked.png').
              "\"> ".$ui->dn."&nbsp;";
       
         $info.= "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/lamp.png').
diff --git a/gosa-plugins/mail/personal/mail/sieve/class_sieveElement_If.inc b/gosa-plugins/mail/personal/mail/sieve/class_sieveElement_If.inc
index cb33ae5e7..8098eaf6a 100644
--- a/gosa-plugins/mail/personal/mail/sieve/class_sieveElement_If.inc
+++ b/gosa-plugins/mail/personal/mail/sieve/class_sieveElement_If.inc
@@ -830,7 +830,7 @@ class sieve_if
   function execute()
   {
     /* Create title */
-    $name  = "<img alt='' src='images/small_filter.png' class='center'>";
+    $name  = "<img alt='' src='images/lists/action.png' class='center'>";
     $name .= "<b>"._("Condition")."</b>";
     if($this->TYPE == "if"){
       $name .= "&nbsp;-&nbsp;"._("If");
diff --git a/gosa-plugins/mail/personal/mail/sieve/class_sieveManagement.inc b/gosa-plugins/mail/personal/mail/sieve/class_sieveManagement.inc
index f4a3396e0..637c27718 100644
--- a/gosa-plugins/mail/personal/mail/sieve/class_sieveManagement.inc
+++ b/gosa-plugins/mail/personal/mail/sieve/class_sieveManagement.inc
@@ -639,7 +639,7 @@ class sieveManagement extends plugin
       $field4 = array("string" => _("Script length").":&nbsp;".strlen($script['SCRIPT']));
 
       if($this->parent->acl_is_writeable("sieveManagement")){
-        $del = "<input type='image' name='delscript_".$key."' src='images/edittrash.png'
+        $del = "<input type='image' name='delscript_".$key."' src='images/lists/trash.png'
                   title='"._("Remove script")."'>";
       }else{
         $del = "<img src='images/empty.png' alt=' '>";
diff --git a/gosa-plugins/nagios/personal/nagios/main.inc b/gosa-plugins/nagios/personal/nagios/main.inc
index 623442fcd..7a6315db7 100644
--- a/gosa-plugins/nagios/personal/nagios/main.inc
+++ b/gosa-plugins/nagios/personal/nagios/main.inc
@@ -105,10 +105,10 @@ if (!$remove_lock){
       $display.= "<input type=submit name=\"edit_finish\" style=\"width:80px\" value=\"".msgPool::okButton()."\">\n";
       $display.= "&nbsp;";
       $display.= "<input type=submit name=\"edit_cancel\" value=\"".msgPool::cancelButton()."\">\n";
-      $info= "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/closedlock.png').
+      $info= "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/lists/locked.png').
              "\"> ".$ui->dn."&nbsp;";
     } else {
-      $info= "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/openlock.png').
+      $info= "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/lists/unlocked.png').
              "\"> ".$ui->dn."&nbsp;";
 
       if(preg_match("/w/",$ui->get_permissions($ui->dn,"users/nagiosAccount"))){
diff --git a/gosa-plugins/netatalk/personal/netatalk/main.inc b/gosa-plugins/netatalk/personal/netatalk/main.inc
index 4d70ac1db..a4c698a54 100644
--- a/gosa-plugins/netatalk/personal/netatalk/main.inc
+++ b/gosa-plugins/netatalk/personal/netatalk/main.inc
@@ -96,9 +96,9 @@ if (!$remove_lock) {
       $display .= "<input type=submit name=\"edit_finish\" style=\"width:80px\" value=\"".msgPool::okButton()."\">\n";
       $display .= "&nbsp;";
       $display .= "<input type=submit name=\"edit_cancel\" value=\"".msgPool::cancelButton()."\">\n";
-      $info = "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/closedlock.png')."\"> ".$ui->dn."&nbsp;";
+      $info = "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/lists/locked.png')."\"> ".$ui->dn."&nbsp;";
     } else {
-      $info = "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/openlock.png')."\"> ".$ui->dn."&nbsp;";
+      $info = "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/lists/unlocked.png')."\"> ".$ui->dn."&nbsp;";
       if(preg_match("/w/",$ui->get_permissions($ui->dn,"users/netatalk"))){
         $info .= "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/lamp.png')."\"> ".msgPool::clickEditToChange();
         $display .= "<input type=submit name=\"edit\" value=\"".msgPool::editButton()."\">\n";
diff --git a/gosa-plugins/samba/personal/samba/class_sambaAccount.inc b/gosa-plugins/samba/personal/samba/class_sambaAccount.inc
index eb19275f6..593263262 100644
--- a/gosa-plugins/samba/personal/samba/class_sambaAccount.inc
+++ b/gosa-plugins/samba/personal/samba/class_sambaAccount.inc
@@ -415,7 +415,7 @@ class sambaAccount extends plugin
       asort($wslist);
 
       $smarty->assign("search_image", get_template_path('images/search.png'));
-      $smarty->assign("launchimage", get_template_path('images/small_filter.png'));
+      $smarty->assign("launchimage", get_template_path('images/lists/action.png'));
       $smarty->assign("tree_image", get_template_path('images/tree.png'));
       $smarty->assign("deplist", $this->config->idepartments);
       $smarty->assign("alphabet", generate_alphabet());
diff --git a/gosa-plugins/samba/personal/samba/main.inc b/gosa-plugins/samba/personal/samba/main.inc
index 148770353..7ce7e1774 100644
--- a/gosa-plugins/samba/personal/samba/main.inc
+++ b/gosa-plugins/samba/personal/samba/main.inc
@@ -104,10 +104,10 @@ if (!$remove_lock){
       $display.= "<input type=submit name=\"edit_finish\" style=\"width:80px\" value=\"".msgPool::okButton()."\">\n";
       $display.= "&nbsp;";
       $display.= "<input type=submit name=\"edit_cancel\" value=\"".msgPool::cancelButton()."\">\n";
-      $info= "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/closedlock.png').
+      $info= "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/lists/locked.png').
              "\"> ".$ui->dn."&nbsp;";
     } else {
-      $info= "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/openlock.png').
+      $info= "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/lists/unlocked.png').
              "\"> ".$ui->dn."&nbsp;";
 
       if(preg_match("/w/",$ui->get_permissions($ui->dn,"users/sambaAccount"))){
diff --git a/gosa-plugins/samba/personal/samba/samba2.tpl b/gosa-plugins/samba/personal/samba/samba2.tpl
index 11b28d8e2..4234cd0e7 100644
--- a/gosa-plugins/samba/personal/samba/samba2.tpl
+++ b/gosa-plugins/samba/personal/samba/samba2.tpl
@@ -56,7 +56,7 @@
 
 <p class="seperator">&nbsp;</p>
 
-<h2><p class="center"><img class="center" alt="" align="middle" src="images/certs.png" />&nbsp;{t}Access options{/t}</p></h2>
+<h2><p class="center"><img class="center" alt="" align="middle" src="images/lists/key.png" />&nbsp;{t}Access options{/t}</p></h2>
 
 <table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding="4" border="0">
  <tr>
diff --git a/gosa-plugins/samba/personal/samba/samba3.tpl b/gosa-plugins/samba/personal/samba/samba3.tpl
index c05acc0c2..33f86ec4d 100644
--- a/gosa-plugins/samba/personal/samba/samba3.tpl
+++ b/gosa-plugins/samba/personal/samba/samba3.tpl
@@ -300,7 +300,7 @@
 
 <p class="seperator">&nbsp;</p>
 
-<h2><img class="center" alt="" align="middle" src="images/certs.png" />&nbsp;{t}Access options{/t}</h2>
+<h2><img class="center" alt="" align="middle" src="images/lists/key.png" />&nbsp;{t}Access options{/t}</h2>
 
 <table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=4 border=0>
  <tr>
diff --git a/gosa-plugins/scalix/personal/scalix/main.inc b/gosa-plugins/scalix/personal/scalix/main.inc
index 05d390d52..c1403417a 100644
--- a/gosa-plugins/scalix/personal/scalix/main.inc
+++ b/gosa-plugins/scalix/personal/scalix/main.inc
@@ -101,10 +101,10 @@ if (!$remove_lock){
       $display.= "<input type=submit name=\"edit_finish\" value=\"".msgPool::saveButton()."\">\n";
       $display.= "&nbsp;";
       $display.= "<input type=submit name=\"edit_cancel\" value=\"".msgPool::cancelButton()."\">\n";
-      $info= "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/closedlock.png').
+      $info= "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/lists/locked.png').
              "\"> ".$ui->dn."&nbsp;";
     } else {
-      $info= "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/openlock.png').
+      $info= "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/lists/unlocked.png').
              "\"> ".$ui->dn."&nbsp;";
 
       if(preg_match("/w/",$ui->get_permissions($ui->dn,"users/scalix"))){
diff --git a/gosa-plugins/sudo/admin/sudo/class_divListSudo.inc b/gosa-plugins/sudo/admin/sudo/class_divListSudo.inc
index 3a33cec20..3abd3ce49 100644
--- a/gosa-plugins/sudo/admin/sudo/class_divListSudo.inc
+++ b/gosa-plugins/sudo/admin/sudo/class_divListSudo.inc
@@ -118,23 +118,23 @@ class divListSudo extends MultiSelectWindow
     /* Append multiple remove */
     if(preg_match("/d/",$acl)){
       $s.= "..|---|\n";
-      $s.= "..|<img src='images/edittrash.png' alt='' border='0' class='center'>".
+      $s.= "..|<img src='images/lists/trash.png' alt='' border='0' class='center'>".
         "&nbsp;"._("Remove")."|"."del_role|\n";
     }
 
     /* Add multiple copy & cut icons */
     if(is_object($this->parent->CopyPasteHandler) && preg_match("/(c.*w|w.*c)/",$acl)){
       $s.= "..|---|\n";
-      $s.= "..|<img src='images/editcopy.png' alt='' border='0' class='center'>".
+      $s.= "..|<img src='images/lists/copy.png' alt='' border='0' class='center'>".
         "&nbsp;"._("Copy")."|"."multiple_copy_sudo|\n";
-#      $s.= "..|<img src='images/editcut.png' alt='' border='0' class='center'>".
+#      $s.= "..|<img src='images/lists/cut.png' alt='' border='0' class='center'>".
 #        "&nbsp;"._("Cut")."|"."multiple_cut_sudo|\n";
 
       if($this->parent->CopyPasteHandler->entries_queued()){
-        $img = "<img border='0' class='center' src='images/editpaste.png' alt=''>";
+        $img = "<img border='0' class='center' src='images/lists/paste.png' alt=''>";
         $s.="..|".$img."&nbsp;"._("Paste")."|editPaste|\n";
       }else{
-        $img = "<img border='0' class='center' src='images/cant_editpaste.png' alt=''>";
+        $img = "<img border='0' class='center' src='images/cant_lists/paste.png' alt=''>";
         $s.="..|".$img."&nbsp;"._("Paste")."\n";
       }
     }
@@ -191,9 +191,9 @@ class divListSudo extends MultiSelectWindow
       $actions= "";
       if(($this->parent->CopyPasteHandler) && preg_match("/(c.*w|w.*c)/",$acl)){
 #        $actions.= "<input class='center' type='image'
-#          src='images/editcut.png' alt='"._("cut")."' name='cut_%KEY%' title='"._("Cut this entry")."'>&nbsp;";
+#          src='images/lists/cut.png' alt='"._("cut")."' name='cut_%KEY%' title='"._("Cut this entry")."'>&nbsp;";
         $actions.= "<input class='center' type='image'
-          src='images/editcopy.png' alt='"._("copy")."' name='copy_%KEY%' title='"._("Copy this entry")."'>&nbsp;";
+          src='images/lists/copy.png' alt='"._("copy")."' name='copy_%KEY%' title='"._("Copy this entry")."'>&nbsp;";
       }
 
 
@@ -206,7 +206,7 @@ class divListSudo extends MultiSelectWindow
 
       if(preg_match("/d/",$acl)){
         $actions.= "<input class='center' type='image'
-          src='images/edittrash.png' alt='".msgPool::delButton()."' name='sudo_del_%KEY%' title='"._("Delete this entry")."'>";
+          src='images/lists/trash.png' alt='".msgPool::delButton()."' name='sudo_del_%KEY%' title='"._("Delete this entry")."'>";
       }
 
       $title = "title='".preg_replace('/ /', '&nbsp;', @LDAP::fix($val['dn']))."'";
diff --git a/gosa-plugins/sudo/admin/sudo/class_sudoGeneric.inc b/gosa-plugins/sudo/admin/sudo/class_sudoGeneric.inc
index ba8c9e97c..a4ca4c126 100644
--- a/gosa-plugins/sudo/admin/sudo/class_sudoGeneric.inc
+++ b/gosa-plugins/sudo/admin/sudo/class_sudoGeneric.inc
@@ -374,7 +374,7 @@ class sudo extends plugin
      */
     $neg_img= "<img src='images/negate.png' alt='!' class='center'>"; 
     $option = "<input type='image' src='images/negate.png'     name='neg_%ATTR%_%KEY%' class='center'>"; 
-    $option.= "<input type='image' src='images/edittrash.png'  name='del_%ATTR%_%KEY%' class='center'>"; 
+    $option.= "<input type='image' src='images/lists/trash.png'  name='del_%ATTR%_%KEY%' class='center'>"; 
     foreach(array("sudoCommand","sudoHost","sudoRunAs") as $attr){
       if($this->acl_is_readable($attr)){
         foreach($this->$attr as $key => $entry){
@@ -637,7 +637,7 @@ class sudo extends plugin
       $smarty->assign("$type", $sysfilter[$type]);
     }
     $smarty->assign("search_image", get_template_path('images/search.png'));
-    $smarty->assign("launchimage",  get_template_path('images/small_filter.png'));
+    $smarty->assign("launchimage",  get_template_path('images/lists/action.png'));
     $smarty->assign("tree_image",   get_template_path('images/tree.png'));
     $smarty->assign("deplist",      $this->config->idepartments);
     $smarty->assign("alphabet",     generate_alphabet());
diff --git a/gosa-plugins/sudo/admin/sudo/generic.tpl b/gosa-plugins/sudo/admin/sudo/generic.tpl
index 7fda69f48..452ab0a01 100644
--- a/gosa-plugins/sudo/admin/sudo/generic.tpl
+++ b/gosa-plugins/sudo/admin/sudo/generic.tpl
@@ -52,7 +52,7 @@
    </table>
   </td>
   <td style="padding-left:5px;border-left: solid 1px #AAAAAA;">
-   <h2><img alt="" class="center" align="middle" src="images/closedlock.png" />&nbsp; {t}System trust{/t}</h2>
+   <h2><img alt="" class="center" align="middle" src="images/lists/locked.png" />&nbsp; {t}System trust{/t}</h2>
     {t}Trust mode{/t}&nbsp; 
     {render acl=$trustModelACL}
         <select name="trustmode" id="trustmode" size=1
diff --git a/gosa-plugins/sudo/admin/sudo/main.inc b/gosa-plugins/sudo/admin/sudo/main.inc
index fb873a54a..2acf8a62b 100644
--- a/gosa-plugins/sudo/admin/sudo/main.inc
+++ b/gosa-plugins/sudo/admin/sudo/main.inc
@@ -40,7 +40,7 @@ if ($remove_lock){
   if (session::is_set('objectinfo')){
     $display= print_header(get_template_path('images/sudo.png'),
                             _("Sudo role administration"), "<img alt=\"\" align=\"middle\" src=\"".
-                            get_template_path('images/closedlock.png')."\"> ".
+                            get_template_path('images/lists/locked.png')."\"> ".
                             @LDAP::fix(session::get('objectinfo')));
   } else {
     $display= print_header(get_template_path('images/sudo.png'), _("Sudo role administration"));
diff --git a/gosa-plugins/sudo/admin/sudo/options.tpl b/gosa-plugins/sudo/admin/sudo/options.tpl
index 6ab83afa1..035321a68 100644
--- a/gosa-plugins/sudo/admin/sudo/options.tpl
+++ b/gosa-plugins/sudo/admin/sudo/options.tpl
@@ -69,7 +69,7 @@
     </td>
     <td style='width: 40px; text-align:right;'>
      <input type='image' src='images/negate.png'     name='negOption_{$key}_{$entry_key}' class='center'>
-     <input type='image' src='images/edittrash.png'  name='delOption_{$key}_{$entry_key}' class='center'>
+     <input type='image' src='images/lists/trash.png'  name='delOption_{$key}_{$entry_key}' class='center'>
     </td>
    </tr>
   {/foreach}
diff --git a/gosa-plugins/systems/admin/systems/class_baseSelectDialog.inc b/gosa-plugins/systems/admin/systems/class_baseSelectDialog.inc
index 74d3cf24b..c2476640b 100644
--- a/gosa-plugins/systems/admin/systems/class_baseSelectDialog.inc
+++ b/gosa-plugins/systems/admin/systems/class_baseSelectDialog.inc
@@ -43,13 +43,13 @@ class baseSelectDialog extends MultiSelectWindow
     $this->SetTitle("Base");
     $this->SetSummary(_("Choose a base"));
     $this->SetListHeader("<div style='background:#F0F0F9;padding:5px;'>".
-        " <input class='center' type='image' src='images/list_root.png' align='middle'
+        " <input class='center' type='image' src='images/lists/root.png' align='middle'
         title='"._("Go to root department")."' name='dep_root' alt='"._("Root")."'>&nbsp;".
-        " <input class='center' type='image' align='middle' src='images/list_back.png'
+        " <input class='center' type='image' align='middle' src='images/lists/back.png'
         title='"._("Go up one department")."' alt='"._("Up")."' name='dep_back'>&nbsp;".
-        " <input class='center' type='image' align='middle' src='images/list_home.png'
+        " <input class='center' type='image' align='middle' src='images/lists/home.png'
         title='"._("Go to users department")."' alt='"._("Home")."' name='dep_home'>&nbsp;".
-        " <input class='center' type='image' src='images/list_reload.png' align='middle' title='"._("Reload list")."' name='submit_department' alt='"._("Submit")."'>&nbsp;".
+        " <input class='center' type='image' src='images/lists/reload.png' align='middle' title='"._("Reload list")."' name='submit_department' alt='"._("Submit")."'>&nbsp;".
         "</div>");
 
     $this->SetInformation(_("Step in the prefered tree and click save to use the current subtree as base. Or click the image at the end of each entry."));
diff --git a/gosa-plugins/systems/admin/systems/class_divListSystem.inc b/gosa-plugins/systems/admin/systems/class_divListSystem.inc
index 131534595..fc15b7f5c 100644
--- a/gosa-plugins/systems/admin/systems/class_divListSystem.inc
+++ b/gosa-plugins/systems/admin/systems/class_divListSystem.inc
@@ -246,15 +246,15 @@ class divListSystem extends MultiSelectWindow
       $s.= "...|".$event['MenuImage']."&nbsp;".$event['s_Menu_Name']."|schedule_event_".$name."\n";
     }
 
-    $s.= "..|<img src='images/edittrash.png' alt='' border='0' class='center'>".
+    $s.= "..|<img src='images/lists/trash.png' alt='' border='0' class='center'>".
       "&nbsp;"._("Remove")."|"."remove_multiple|\n";
 
     /* Add multiple copy & cut icons */
     if(is_object($this->parent->CopyPasteHandler)){
       $s.= "..|---|\n";
-      $s.= "..|<img src='images/editcopy.png' alt='' border='0' class='center'>".
+      $s.= "..|<img src='images/lists/copy.png' alt='' border='0' class='center'>".
         "&nbsp;"._("Copy")."|"."multiple_copy_systems|\n";
-      $s.= "..|<img src='images/editcut.png' alt='' border='0' class='center'>".
+      $s.= "..|<img src='images/lists/cut.png' alt='' border='0' class='center'>".
         "&nbsp;"._("Cut")."|"."multiple_cut_systems|\n";
     }
 
@@ -263,10 +263,10 @@ class divListSystem extends MultiSelectWindow
     if(preg_match("/(c.*w|w.*c)/",$all_module_acls) &&  $this->parent->CopyPasteHandler){
       $s .= "..|---|\n";
       if($this->parent->CopyPasteHandler->entries_queued()){
-        $img = "<img border='0' class='center' src='images/editpaste.png' alt=''>";
+        $img = "<img border='0' class='center' src='images/lists/paste.png' alt=''>";
         $s.="..|".$img."&nbsp;"._("Paste")."|editPaste|\n";
       }else{
-        $img = "<img border='0' class='center' src='images/cant_editpaste.png' alt=''>";
+        $img = "<img border='0' class='center' src='images/cant_lists/paste.png' alt=''>";
         $s.="..|".$img."&nbsp;"._("Paste")."\n";
       }
     }
@@ -355,9 +355,9 @@ class divListSystem extends MultiSelectWindow
       $action ="";
       if(($this->parent->CopyPasteHandler) && preg_match("/(c.*w|w.*c)/",$acl_all)){
         $action.= "<input class='center' type='image'
-          src='images/editcut.png' alt='"._("cut")."' name='cut_%KEY%' title='"._("Cut this entry")."'>&nbsp;";
+          src='images/lists/cut.png' alt='"._("cut")."' name='cut_%KEY%' title='"._("Cut this entry")."'>&nbsp;";
         $action.= "<input class='center' type='image'
-          src='images/editcopy.png' alt='"._("copy")."' name='copy_%KEY%' title='"._("Copy this entry")."'>&nbsp;";
+          src='images/lists/copy.png' alt='"._("copy")."' name='copy_%KEY%' title='"._("Copy this entry")."'>&nbsp;";
       }
       $action.= "<input class='center' type='image' src='images/edit.png' 
                     alt='"._("edit")."'     name='system_edit_%KEY%' title='"._("Edit system")."'>";
@@ -369,7 +369,7 @@ class divListSystem extends MultiSelectWindow
 
 
       if(preg_match("/d/",$acl)){
-        $action.= "<input class='center' type='image' src='images/edittrash.png' 
+        $action.= "<input class='center' type='image' src='images/lists/trash.png' 
           alt='"._("delete")."'   name='system_del_%KEY%' title='"._("Delete system")."'>";
       }else{
         $action.= $empty;    
@@ -407,7 +407,7 @@ class divListSystem extends MultiSelectWindow
       $display_key_for = array("terminal","workstation","server","component");
       $pwd_acl = $ui->get_permissions($val['dn'],$tabs[$type]['ACL'],"userPassword");
       if(preg_match("/w/",$pwd_acl) && in_array($type,$display_key_for)){
-        $action2 = "<input class='center' type='image' src='images/certs.png' alt='"._("Password")."'   name='system_setpwd_%KEY%' title='"._("Set password")."'>";
+        $action2 = "<input class='center' type='image' src='images/lists/key.png' alt='"._("Password")."'   name='system_setpwd_%KEY%' title='"._("Set password")."'>";
       }else{
         $action2 = $empty;
       }
diff --git a/gosa-plugins/systems/admin/systems/class_divListSystemService.inc b/gosa-plugins/systems/admin/systems/class_divListSystemService.inc
index 2512c9cba..a80170763 100644
--- a/gosa-plugins/systems/admin/systems/class_divListSystemService.inc
+++ b/gosa-plugins/systems/admin/systems/class_divListSystemService.inc
@@ -130,7 +130,7 @@ class divListSystemService extends MultiSelectWindow
         $actions .= "&nbsp;<img src='images/empty.png' width='16' alt=''>";
       }
       if($entry['AllowStart'] && $WasAccount){
-        $actions .= "&nbsp;<input type='image' name='RestartSingleService_".$name."' src='images/status_restart.png'
+        $actions .= "&nbsp;<input type='image' name='RestartSingleService_".$name."' src='images/lists/reload.png'
                             title='"._("Restart service")."'>";
       }else{
         $actions .= "&nbsp;<img src='images/empty.png' width='16' alt=''>";
@@ -146,7 +146,7 @@ class divListSystemService extends MultiSelectWindow
 
       /* Check if remove is enabled and allowed for current service */
       if($entry['AllowRemove'] && preg_match("/d/i",$acl)){
-        $actions .= "&nbsp;<input type='image' name='RemoveSingleService_".$name."' src='images/edittrash.png'
+        $actions .= "&nbsp;<input type='image' name='RemoveSingleService_".$name."' src='images/lists/trash.png'
                             title='"._("Remove service")."'>";
       }else{
         $actions .= "&nbsp;<img src='images/empty.png' width='16' alt=''>";
diff --git a/gosa-plugins/systems/admin/systems/main.inc b/gosa-plugins/systems/admin/systems/main.inc
index 2eaf67921..241c83870 100644
--- a/gosa-plugins/systems/admin/systems/main.inc
+++ b/gosa-plugins/systems/admin/systems/main.inc
@@ -44,7 +44,7 @@ if ($remove_lock){
 
 	/* Page header*/
 	if (session::is_set('objectinfo')){
-		$display= print_header(get_template_path('images/system.png'), _("System management"), "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/closedlock.png')."\"> ".@LDAP::fix(session::get('objectinfo')));
+		$display= print_header(get_template_path('images/system.png'), _("System management"), "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/lists/locked.png')."\"> ".@LDAP::fix(session::get('objectinfo')));
 	} else {
 		$display= print_header(get_template_path('images/system.png'), _("System management"));
 	}
diff --git a/gosa-plugins/systems/admin/systems/network.tpl b/gosa-plugins/systems/admin/systems/network.tpl
index e63735237..23a4001eb 100644
--- a/gosa-plugins/systems/admin/systems/network.tpl
+++ b/gosa-plugins/systems/admin/systems/network.tpl
@@ -14,7 +14,7 @@
           {foreach from=$additionalHostNumbers item=item key=key}
             <br>
             <input size=25 maxlength=80 type='text' name='additionalHostNumbers_{$key}' value='{$item}'>
-            <input type='image' class='center' name='additionalHostNumbers_del_{$key}' src='images/edittrash.png' alt='{msgPool type=delButton}'>
+            <input type='image' class='center' name='additionalHostNumbers_del_{$key}' src='images/lists/trash.png' alt='{msgPool type=delButton}'>
           {/foreach}
           <input type='image' class='center' name='additionalHostNumbers_add}' src='images/list_new.png' alt='{msgPool type=addButton}'>
 
@@ -48,7 +48,7 @@
                 </td>
                 <td>
                   {t}Enable DHCP for this device{/t}
-                  <input type='image' src='images/list_reload.png' class='center'>
+                  <input type='image' src='images/lists/reload.png' class='center'>
                 </td>
               </tr>
               {else}
@@ -56,7 +56,7 @@
                 <td>
                   <input type='checkbox' name='dummy' class='center' disabled>
                   {t}Enable DHCP for this device{/t} ({t}not configured{/t})
-                  <input type='image' src='images/list_reload.png' class='center'>
+                  <input type='image' src='images/lists/reload.png' class='center'>
                 </td>
               </tr>
               {/if}
@@ -103,7 +103,7 @@
         {/if}
 
       {t}Enable DNS for this device{/t}
-      <input type='image' src='images/list_reload.png' class='center' name="reloadThisDNSStuff" >
+      <input type='image' src='images/lists/reload.png' class='center' name="reloadThisDNSStuff" >
       {if $DNS_is_account == true}
       <div style="padding-left:20px;visibility:visible;" id="test2">
       {else}
@@ -143,7 +143,7 @@
     {else}        
       <input type="checkbox" name="dummy" value="1" disabled class='center' {if $DNS_is_account} checked {/if}>
       {t}Enable DNS for this device{/t} ({t}not configured{/t})
-      <input type='image' src='images/list_reload.png' class='center'>
+      <input type='image' src='images/lists/reload.png' class='center'>
     {/if}
 
 		</td>