From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 14 Apr 2008 10:37:47 +0000 (+0000)
Subject: List image migration for core
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7692f34a23250aa815f368cc9cd17064cf0af141;p=gosa.git

List image migration for core


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

diff --git a/gosa-core/html/images/certs.png b/gosa-core/html/images/certs.png
deleted file mode 100644
index ca93f0d14..000000000
Binary files a/gosa-core/html/images/certs.png and /dev/null differ
diff --git a/gosa-core/html/images/closedlock.png b/gosa-core/html/images/closedlock.png
deleted file mode 100644
index 04a05c1cb..000000000
Binary files a/gosa-core/html/images/closedlock.png and /dev/null differ
diff --git a/gosa-core/html/images/editcopy.png b/gosa-core/html/images/editcopy.png
deleted file mode 100644
index c3ff243b8..000000000
Binary files a/gosa-core/html/images/editcopy.png and /dev/null differ
diff --git a/gosa-core/html/images/editcut.png b/gosa-core/html/images/editcut.png
deleted file mode 100644
index 7ec355a0d..000000000
Binary files a/gosa-core/html/images/editcut.png and /dev/null differ
diff --git a/gosa-core/html/images/editdelete.png b/gosa-core/html/images/editdelete.png
deleted file mode 100644
index 6d0d29d76..000000000
Binary files a/gosa-core/html/images/editdelete.png and /dev/null differ
diff --git a/gosa-core/html/images/editpaste.png b/gosa-core/html/images/editpaste.png
deleted file mode 100644
index 636a4c5a0..000000000
Binary files a/gosa-core/html/images/editpaste.png and /dev/null differ
diff --git a/gosa-core/html/images/edittrash.png b/gosa-core/html/images/edittrash.png
deleted file mode 100644
index f5cb2b8b9..000000000
Binary files a/gosa-core/html/images/edittrash.png and /dev/null differ
diff --git a/gosa-core/html/images/list_back.png b/gosa-core/html/images/list_back.png
deleted file mode 100644
index f258c112f..000000000
Binary files a/gosa-core/html/images/list_back.png and /dev/null differ
diff --git a/gosa-core/html/images/list_home.png b/gosa-core/html/images/list_home.png
deleted file mode 100644
index e897341f1..000000000
Binary files a/gosa-core/html/images/list_home.png and /dev/null differ
diff --git a/gosa-core/html/images/list_reload.png b/gosa-core/html/images/list_reload.png
deleted file mode 100644
index 5c6a26dd3..000000000
Binary files a/gosa-core/html/images/list_reload.png and /dev/null differ
diff --git a/gosa-core/html/images/list_root.png b/gosa-core/html/images/list_root.png
deleted file mode 100644
index 56a6a5d3a..000000000
Binary files a/gosa-core/html/images/list_root.png and /dev/null differ
diff --git a/gosa-core/html/images/list_up.png b/gosa-core/html/images/list_up.png
deleted file mode 100644
index f258c112f..000000000
Binary files a/gosa-core/html/images/list_up.png and /dev/null differ
diff --git a/gosa-core/html/images/lists/action.png b/gosa-core/html/images/lists/action.png
new file mode 100644
index 000000000..120f2ff73
Binary files /dev/null and b/gosa-core/html/images/lists/action.png differ
diff --git a/gosa-core/html/images/lists/back.png b/gosa-core/html/images/lists/back.png
new file mode 100644
index 000000000..f258c112f
Binary files /dev/null and b/gosa-core/html/images/lists/back.png differ
diff --git a/gosa-core/html/images/lists/copy.png b/gosa-core/html/images/lists/copy.png
new file mode 100644
index 000000000..c3ff243b8
Binary files /dev/null and b/gosa-core/html/images/lists/copy.png differ
diff --git a/gosa-core/html/images/lists/cut.png b/gosa-core/html/images/lists/cut.png
new file mode 100644
index 000000000..7ec355a0d
Binary files /dev/null and b/gosa-core/html/images/lists/cut.png differ
diff --git a/gosa-core/html/images/lists/cutpaste.png b/gosa-core/html/images/lists/cutpaste.png
new file mode 100644
index 000000000..e51443824
Binary files /dev/null and b/gosa-core/html/images/lists/cutpaste.png differ
diff --git a/gosa-core/html/images/lists/delete.png b/gosa-core/html/images/lists/delete.png
new file mode 100644
index 000000000..6d0d29d76
Binary files /dev/null and b/gosa-core/html/images/lists/delete.png differ
diff --git a/gosa-core/html/images/lists/edit.png b/gosa-core/html/images/lists/edit.png
new file mode 100644
index 000000000..a8b69f73f
Binary files /dev/null and b/gosa-core/html/images/lists/edit.png differ
diff --git a/gosa-core/html/images/lists/home.png b/gosa-core/html/images/lists/home.png
new file mode 100644
index 000000000..e897341f1
Binary files /dev/null and b/gosa-core/html/images/lists/home.png differ
diff --git a/gosa-core/html/images/lists/key.png b/gosa-core/html/images/lists/key.png
new file mode 100644
index 000000000..ca93f0d14
Binary files /dev/null and b/gosa-core/html/images/lists/key.png differ
diff --git a/gosa-core/html/images/lists/locked.png b/gosa-core/html/images/lists/locked.png
new file mode 100644
index 000000000..04a05c1cb
Binary files /dev/null and b/gosa-core/html/images/lists/locked.png differ
diff --git a/gosa-core/html/images/lists/paste.png b/gosa-core/html/images/lists/paste.png
new file mode 100644
index 000000000..636a4c5a0
Binary files /dev/null and b/gosa-core/html/images/lists/paste.png differ
diff --git a/gosa-core/html/images/lists/reload.png b/gosa-core/html/images/lists/reload.png
new file mode 100644
index 000000000..99fd4d7c1
Binary files /dev/null and b/gosa-core/html/images/lists/reload.png differ
diff --git a/gosa-core/html/images/lists/root.png b/gosa-core/html/images/lists/root.png
new file mode 100644
index 000000000..56a6a5d3a
Binary files /dev/null and b/gosa-core/html/images/lists/root.png differ
diff --git a/gosa-core/html/images/lists/trash.png b/gosa-core/html/images/lists/trash.png
new file mode 100644
index 000000000..f5cb2b8b9
Binary files /dev/null and b/gosa-core/html/images/lists/trash.png differ
diff --git a/gosa-core/html/images/lists/unlocked.png b/gosa-core/html/images/lists/unlocked.png
new file mode 100644
index 000000000..3a1a0d34e
Binary files /dev/null and b/gosa-core/html/images/lists/unlocked.png differ
diff --git a/gosa-core/html/images/lists/up.png b/gosa-core/html/images/lists/up.png
new file mode 100644
index 000000000..f258c112f
Binary files /dev/null and b/gosa-core/html/images/lists/up.png differ
diff --git a/gosa-core/html/images/mailq_requeue.png b/gosa-core/html/images/mailq_requeue.png
deleted file mode 100644
index 5c6a26dd3..000000000
Binary files a/gosa-core/html/images/mailq_requeue.png and /dev/null differ
diff --git a/gosa-core/html/images/openlock.png b/gosa-core/html/images/openlock.png
deleted file mode 100644
index 3a1a0d34e..000000000
Binary files a/gosa-core/html/images/openlock.png and /dev/null differ
diff --git a/gosa-core/html/images/small_filter.png b/gosa-core/html/images/small_filter.png
deleted file mode 100644
index 120f2ff73..000000000
Binary files a/gosa-core/html/images/small_filter.png and /dev/null differ
diff --git a/gosa-core/html/images/status_restart.png b/gosa-core/html/images/status_restart.png
deleted file mode 100644
index 99fd4d7c1..000000000
Binary files a/gosa-core/html/images/status_restart.png and /dev/null differ
diff --git a/gosa-core/include/class_MultiSelectWindow.inc b/gosa-core/include/class_MultiSelectWindow.inc
index f258f944b..cc8b4c565 100644
--- a/gosa-core/include/class_MultiSelectWindow.inc
+++ b/gosa-core/include/class_MultiSelectWindow.inc
@@ -236,7 +236,7 @@ class MultiSelectWindow{
 
     /* Draw root button */
     if($enable_root){
-      $listhead .= " <input class='center' type='image' src='images/list_root.png' align='middle'
+      $listhead .= " <input class='center' type='image' src='images/lists/root.png' align='middle'
         title='"._("Go to root department")."' name='dep_root' alt='"._("Root")."'>&nbsp;";
     }else{
       $listhead .= " <img src='images/list_root_gray.png' class='center' alt='"._("Root")."'>&nbsp;";
@@ -244,7 +244,7 @@ class MultiSelectWindow{
 
     /* Draw back button */
     if($enable_back){
-      $listhead .= " <input class='center' type='image' align='middle' src='images/list_back.png'
+      $listhead .= " <input class='center' type='image' align='middle' src='images/lists/back.png'
         title='"._("Go up one department")."' alt='"._("Up")."'                name='dep_back'>&nbsp;";
     }else{
       $listhead .= " <img src='images/list_back_gray.png' class='center' alt='"._("Up")."'>&nbsp;";
@@ -252,14 +252,14 @@ class MultiSelectWindow{
 
     /* Draw home button */
     if($enable_home){
-      $listhead .= " <input class='center' type='image' align='middle' src='images/list_home.png'
+      $listhead .= " <input class='center' type='image' align='middle' src='images/lists/home.png'
         title='"._("Go to users department")."' alt='"._("Home")."'            name='dep_home'>&nbsp;";
     }else{
       $listhead .= " <img src='images/list_home_gray.png' class='center' alt='"._("Home")."'>&nbsp;";
     }
    
     /* And at least draw reload button, this button is enabled everytime */ 
-    $listhead .=  " <input class='center' type='image' src='images/list_reload.png' align='middle'
+    $listhead .=  " <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;";
 
diff --git a/gosa-core/include/class_SnapShotDialog.inc b/gosa-core/include/class_SnapShotDialog.inc
index bdaac544f..507832f07 100644
--- a/gosa-core/include/class_SnapShotDialog.inc
+++ b/gosa-core/include/class_SnapShotDialog.inc
@@ -131,7 +131,7 @@ class SnapShotDialog extends plugin
 
 				$actions= "<input type='image' src='images/restore.png' name='RestoreSnapShot_%KEY' 
 								class='center' title='"._("Restore snapshot")."'>&nbsp;";
-				$actions.= "<input type='image' src='images/edittrash.png' name='RemoveSnapShot_%KEY' 
+				$actions.= "<input type='image' src='images/lists/trash.png' name='RemoveSnapShot_%KEY' 
 								class='center' title='"._("Remove snapshot")."'>&nbsp;";
 
 				$time_stamp 	= date(_("Y-m-d, H:i:s"),preg_replace("/\-.*$/","",$entry['gosaSnapshotTimestamp'][0]));
diff --git a/gosa-core/include/class_acl.inc b/gosa-core/include/class_acl.inc
index afcbb96fd..f8b36d20f 100644
--- a/gosa-core/include/class_acl.inc
+++ b/gosa-core/include/class_acl.inc
@@ -427,7 +427,7 @@ class acl extends plugin
         $action= "<input type='image' name='sortup_$key' alt='up' title='"._("Up")."' src='images/sort_up.png' align='top'>";
         $action.= "<input type='image' name='sortdown_$key' alt='down' title='"._("Down")."' src='images/sort_down.png'>";
         $action.= "<input class='center' type='image' src='images/edit.png' alt='"._("Edit")."' name='acl_edit_$key' title='".msgPool::editButton(_("ACL"))."'>";
-        $action.= "<input class='center' type='image' src='images/edittrash.png' alt='"._("Delete")."' name='acl_del_$key' title='".msgPool::delButton(_("ACL"))."'>";
+        $action.= "<input class='center' type='image' src='images/lists/trash.png' alt='"._("Delete")."' name='acl_del_$key' title='".msgPool::delButton(_("ACL"))."'>";
 
         $field3= array("string" => $action, "attach" => "style='border-right:0px;width:50px;text-align:right;'");
         $aclList->AddEntry(array($field1, $field2, $field3));
@@ -470,7 +470,7 @@ class acl extends plugin
         $field1= array("string" => $dsc, "attach" => "style='width:100px'");
         $field2= array("string" => $summary);
         $action= "<input class='center' type='image' src='images/edit.png' alt='"._("Edit")."' name='cat_edit_$section' title='".msgPool::editButton(_("category ACL"))."'>";
-        $action.= "<input class='center' type='image' src='images/edittrash.png' alt='"._("Delete")."' name='cat_del_$section' title='".msgPool::delButton(_("category ACL"))."'>";
+        $action.= "<input class='center' type='image' src='images/lists/trash.png' alt='"._("Delete")."' name='cat_del_$section' title='".msgPool::delButton(_("category ACL"))."'>";
         $field3= array("string" => $action, "attach" => "style='border-right:0px;width:50px'");
         $aclList->AddEntry(array($field1, $field2, $field3));
       }
diff --git a/gosa-core/plugins/admin/acl/class_aclRole.inc b/gosa-core/plugins/admin/acl/class_aclRole.inc
index 45462de8f..e9831c136 100644
--- a/gosa-core/plugins/admin/acl/class_aclRole.inc
+++ b/gosa-core/plugins/admin/acl/class_aclRole.inc
@@ -358,7 +358,7 @@ class aclrole extends acl
         $action= "<input type='image' name='sortup_$key' alt='up' title='"._("Up")."' src='images/sort_up.png' align='top'>";
         $action.= "<input type='image' name='sortdown_$key' alt='down' title='"._("Down")."' src='images/sort_down.png'>";
         $action.= "<input class='center' type='image' src='images/edit.png' alt='"._("Edit")."' name='acl_edit_$key' title='".msgPool::editButton(_("ACL"))."'>";
-        $action.= "<input class='center' type='image' src='images/edittrash.png' alt='"._("Delete")."' name='acl_del_$key' title='".msgPool::delButton(_("ACL"))."'>";
+        $action.= "<input class='center' type='image' src='images/lists/trash.png' alt='"._("Delete")."' name='acl_del_$key' title='".msgPool::delButton(_("ACL"))."'>";
 
         $field3= array("string" => $action, "attach" => "style='border-right:0px;width:50px;text-align:right;'");
         $aclList->AddEntry(array($field1, $field2, $field3));
@@ -403,7 +403,7 @@ class aclrole extends acl
         $field1= array("string" => $dsc, "attach" => "style='width:140px'");
         $field2= array("string" => $summary);
         $action= "<input class='center' type='image' src='images/edit.png' alt='"._("Edit")."' name='cat_edit_$section' title='"._("Edit category ACL")."'>";
-        $action.= "<input class='center' type='image' src='images/edittrash.png' alt='"._("Delete")."' name='cat_del_$section' title='"._("Reset category ACL")."'>";
+        $action.= "<input class='center' type='image' src='images/lists/trash.png' alt='"._("Delete")."' name='cat_del_$section' title='"._("Reset category ACL")."'>";
         $field3= array("string" => $action, "attach" => "style='border-right:0px;width:50px'");
         $aclList->AddEntry(array($field1, $field2, $field3));
       }
diff --git a/gosa-core/plugins/admin/acl/class_divListACL.inc b/gosa-core/plugins/admin/acl/class_divListACL.inc
index 8f90ddb48..f536025aa 100644
--- a/gosa-core/plugins/admin/acl/class_divListACL.inc
+++ b/gosa-core/plugins/admin/acl/class_divListACL.inc
@@ -168,22 +168,22 @@ class divListACL 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";
       }
     }
@@ -232,9 +232,9 @@ class divListACL extends MultiSelectWindow
         /* Add copy & paste handler */
         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;";
         }
 
         /* Add actions depending on acls */
@@ -249,7 +249,7 @@ class divListACL extends MultiSelectWindow
         }
 
         if(preg_match("/d/", $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='list_acl_role_del_%KEY%' title='"._("Delete acl role")."'>";
         }
       }else{
@@ -265,7 +265,7 @@ class divListACL extends MultiSelectWindow
             name='list_acl_edit_%KEY%' title='"._("Edit acl")."'>";
         }
         if(preg_match("/d/", $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='list_acl_del_%KEY%' title='"._("Delete acl")."'>";
         }
       }
diff --git a/gosa-core/plugins/admin/acl/main.inc b/gosa-core/plugins/admin/acl/main.inc
index d0f0266c8..3a19c9459 100644
--- a/gosa-core/plugins/admin/acl/main.inc
+++ b/gosa-core/plugins/admin/acl/main.inc
@@ -42,7 +42,7 @@ if (!session::is_set('macl') || (isset($_GET['reset']) && $_GET['reset'] == 1)){
 
 	/* Page header*/
 	if (session::is_set('objectinfo')){
-		$display= print_header(get_template_path('images/acl.png'), _("ACL management"), "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/closedlock.png')."\"> ".@LDAP::fix(session::get('objectinfo')));
+		$display= print_header(get_template_path('images/acl.png'), _("ACL 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/acl.png'), _("ACL management"));
 	}
diff --git a/gosa-core/plugins/admin/departments/class_divListDepartment.inc b/gosa-core/plugins/admin/departments/class_divListDepartment.inc
index 1ab2aaa62..dde837056 100644
--- a/gosa-core/plugins/admin/departments/class_divListDepartment.inc
+++ b/gosa-core/plugins/admin/departments/class_divListDepartment.inc
@@ -156,7 +156,7 @@ class divListDepartment extends MultiSelectWindow
         "&nbsp;"._("Department")."|dep_new|\n";
     }
     $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";
 
 
@@ -186,7 +186,7 @@ class divListDepartment extends MultiSelectWindow
       }
 
       if(preg_match("/c/",$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='dep_del_%KEY%' title='"._("Delete this entry")."'>";
       }
 
diff --git a/gosa-core/plugins/admin/departments/generic.tpl b/gosa-core/plugins/admin/departments/generic.tpl
index a743aeb34..3bf8877ba 100644
--- a/gosa-core/plugins/admin/departments/generic.tpl
+++ b/gosa-core/plugins/admin/departments/generic.tpl
@@ -106,7 +106,7 @@
 <table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=4>
  <tr>
    <td style="vertical-align:top; width:100%">
-     <h2><img class="center" alt="" align="middle" src="images/closedlock.png"> {t}Administrative settings{/t}</h2>
+     <h2><img class="center" alt="" align="middle" src="images/lists/locked.png"> {t}Administrative settings{/t}</h2>
 {render acl=$gosaUnitTagACL}
      <input id="unitTag" type=checkbox name="unitTag" value="1" {$unitTag}><label for="unitTag">{t}Tag department as an independent administrative unit{/t}</label>
 {/render}
diff --git a/gosa-core/plugins/admin/departments/main.inc b/gosa-core/plugins/admin/departments/main.inc
index 79cf19e5a..2d8a82dcb 100644
--- a/gosa-core/plugins/admin/departments/main.inc
+++ b/gosa-core/plugins/admin/departments/main.inc
@@ -40,7 +40,7 @@ if ($remove_lock){
 
 	/* Page header*/
 	if (session::is_set('objectinfo')){
-		$display= print_header(get_template_path('images/department.png'), _("Department management"), "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/closedlock.png')."\"> ".@LDAP::fix(session::get('objectinfo')));
+		$display= print_header(get_template_path('images/department.png'), _("Department 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/department.png'), _("Department management"));
 	}
diff --git a/gosa-core/plugins/admin/groups/class_divListGroup.inc b/gosa-core/plugins/admin/groups/class_divListGroup.inc
index 9b9430f6c..977565e0c 100644
--- a/gosa-core/plugins/admin/groups/class_divListGroup.inc
+++ b/gosa-core/plugins/admin/groups/class_divListGroup.inc
@@ -193,7 +193,7 @@ class divListGroup extends MultiSelectWindow
     $s.= "..|---|\n";
     $s.= "..|<img src='images/edit.png' alt='' border='0' class='center'>".
       "&nbsp;"._("Edit")."|"."multiple_edit|\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 event tag */
@@ -210,16 +210,16 @@ class divListGroup extends MultiSelectWindow
     /* 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";
       }
     }
@@ -288,9 +288,9 @@ class divListGroup 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 */
@@ -304,7 +304,7 @@ class divListGroup extends MultiSelectWindow
 
       if(preg_match("/d/",$acl)){
         $actions.= "<input class='center' type='image'
-          src='images/edittrash.png' alt='"._("delete")."' name='group_del_%KEY%' title='"._("Delete this entry")."'>";
+          src='images/lists/trash.png' alt='"._("delete")."' name='group_del_%KEY%' title='"._("Delete this entry")."'>";
       }
 
 
diff --git a/gosa-core/plugins/admin/groups/class_groupGeneric.inc b/gosa-core/plugins/admin/groups/class_groupGeneric.inc
index bd2062125..612021f49 100644
--- a/gosa-core/plugins/admin/groups/class_groupGeneric.inc
+++ b/gosa-core/plugins/admin/groups/class_groupGeneric.inc
@@ -366,7 +366,7 @@ class group 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());
@@ -429,7 +429,7 @@ class group extends plugin
 
       /* Show dialog */
       $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->get_allowed_bases("users/user"));
@@ -545,7 +545,7 @@ class group extends plugin
     /* Show main page */
     $smarty->assign("alphabet", generate_alphabet(10));
     $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);
 
diff --git a/gosa-core/plugins/admin/groups/main.inc b/gosa-core/plugins/admin/groups/main.inc
index a8b3e882d..64fa02156 100644
--- a/gosa-core/plugins/admin/groups/main.inc
+++ b/gosa-core/plugins/admin/groups/main.inc
@@ -40,7 +40,7 @@ if ($remove_lock){
   if (session::is_set('objectinfo')){
     $display= print_header(get_template_path('images/group.png'),
                            _("Group 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/group.png'), _("Group administration"));
diff --git a/gosa-core/plugins/admin/ogroups/class_divListOGroup.inc b/gosa-core/plugins/admin/ogroups/class_divListOGroup.inc
index 626982607..8e7189110 100644
--- a/gosa-core/plugins/admin/ogroups/class_divListOGroup.inc
+++ b/gosa-core/plugins/admin/ogroups/class_divListOGroup.inc
@@ -211,7 +211,7 @@ class divListOGroup extends MultiSelectWindow
 #    $s.= "..|<img src='images/edit.png' alt='' border='0' class='center'>".
 #      "&nbsp;"._("Edit")."|"."multiple_edit|\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_ogroups/|\n";
 
     /* Add event tag */
@@ -228,16 +228,16 @@ class divListOGroup extends MultiSelectWindow
     /* 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";
       }
     }
@@ -285,9 +285,9 @@ class divListOGroup extends MultiSelectWindow
       $acl_all= $ui->has_complete_category_acls($val['dn'],"ogroups");
       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'
@@ -299,7 +299,7 @@ class divListOGroup extends MultiSelectWindow
 
       if(preg_match("/d/",$ui->get_permissions($val['dn'],"ogroups/ogroup"))) {
         $actions.= "<input class='center' type='image'
-          src='images/edittrash.png' alt='"._("delete")."' name='group_del_%KEY%' title='"._("Delete this entry")."'>";
+          src='images/lists/trash.png' alt='"._("delete")."' name='group_del_%KEY%' title='"._("Delete this entry")."'>";
       }else{
         $actions.= "<img class='center' src='images/empty.png' alt='&nbsp;'
           title='".msgPool::permDelete()."'>";
diff --git a/gosa-core/plugins/admin/ogroups/class_ogroup.inc b/gosa-core/plugins/admin/ogroups/class_ogroup.inc
index b833a9186..ea6abd637 100644
--- a/gosa-core/plugins/admin/ogroups/class_ogroup.inc
+++ b/gosa-core/plugins/admin/ogroups/class_ogroup.inc
@@ -279,7 +279,7 @@ class ogroup extends plugin
 
       /* Show dialog */
       $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-core/plugins/admin/ogroups/main.inc b/gosa-core/plugins/admin/ogroups/main.inc
index 7e50efeb1..c6263fd51 100644
--- a/gosa-core/plugins/admin/ogroups/main.inc
+++ b/gosa-core/plugins/admin/ogroups/main.inc
@@ -36,7 +36,7 @@ if (!$remove_lock){
     $display= print_header(get_template_path('images/ogroup.png'),
                           _("Object groups"),
                           "<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/ogroup.png'), _("Object groups"));
diff --git a/gosa-core/plugins/admin/users/class_divListUsers.inc b/gosa-core/plugins/admin/users/class_divListUsers.inc
index 33bb37809..1897e1ad4 100644
--- a/gosa-core/plugins/admin/users/class_divListUsers.inc
+++ b/gosa-core/plugins/admin/users/class_divListUsers.inc
@@ -183,7 +183,7 @@ class divListUsers extends MultiSelectWindow
       "&nbsp;"._("Edit")."|"."multiple_edit|\n";
     $s.= "..|<img src='images/list_password.png' alt='' border='0' class='center'>".
       "&nbsp;"._("Change password")."|"."multiple_password_change|\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";
     $s.= "..|<img src='images/wizard.png' alt='' border='0' class='center'>".
       "&nbsp;"._("Apply template")."|"."templatize_multiple|\n";
@@ -202,16 +202,16 @@ class divListUsers extends MultiSelectWindow
     /* 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";
       }
     }
@@ -306,9 +306,9 @@ class divListUsers extends MultiSelectWindow
       $acl      = $ui->get_permissions($val['dn'],"users/user");
       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;";
       }
 
       /* Add deactivate status */
@@ -316,10 +316,10 @@ class divListUsers extends MultiSelectWindow
 
       if(isset($val['userPassword'][0]) && preg_match("/^\{[^\}]/",$val['userPassword'][0])){
         if(preg_match("/^[^\}]*+\}!/",$val['userPassword'][0])){
-          $lock_status = "<input class='center' type='image' src='images/closedlock.png'
+          $lock_status = "<input class='center' type='image' src='images/lists/locked.png'
             alt='"._("inactive")."' name='toggle_lock_status_%KEY%'>";
         }else{
-          $lock_status = "<input class='center' type='image' src='images/openlock.png'
+          $lock_status = "<input class='center' type='image' src='images/lists/unlocked.png'
             alt='"._("active")."' name='toggle_lock_status_%KEY%'>";
         }
       }else{
@@ -351,7 +351,7 @@ class divListUsers extends MultiSelectWindow
 
       /* Add remove icon, if we are allowed to remove the current user */
       if(preg_match("/d/",$ui->get_permissions($val['dn'],"users/user"))) {
-        $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='user_del_%KEY%' title='"._("Delete user")."'>";
       }else{
         $action.= "<img class='center' src='images/empty.png' alt='&nbsp;'  
diff --git a/gosa-core/plugins/admin/users/main.inc b/gosa-core/plugins/admin/users/main.inc
index f54272c9b..46489c894 100644
--- a/gosa-core/plugins/admin/users/main.inc
+++ b/gosa-core/plugins/admin/users/main.inc
@@ -44,7 +44,7 @@ if ($remove_lock){
     $display= print_header(get_template_path('images/user.png'),
                            _("User administration"),
                            "<img alt=\"\" class=\"center\" 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/user.png'),
diff --git a/gosa-core/plugins/personal/generic/generic_certs.tpl b/gosa-core/plugins/personal/generic/generic_certs.tpl
index f59538980..ae85df37c 100644
--- a/gosa-core/plugins/personal/generic/generic_certs.tpl
+++ b/gosa-core/plugins/personal/generic/generic_certs.tpl
@@ -1,6 +1,6 @@
 <input type="hidden" name="MAX_FILE_SIZE" value="2000000">
  <!-- Headline container -->
-<h2><img alt="" class="center" align="middle" src="images/certs.png"> {t}Certificates{/t}</h2>
+<h2><img alt="" class="center" align="middle" src="images/lists/key.png"> {t}Certificates{/t}</h2>
 
 <table summary="" style="vertical-align:top; text-align:left;border-top: 1px solid rgb(176,176,176);" width="100%" cellpadding=4 border=0>
  <tr>
diff --git a/gosa-core/plugins/personal/generic/main.inc b/gosa-core/plugins/personal/generic/main.inc
index eba6b8f50..0b6dcdcc2 100644
--- a/gosa-core/plugins/personal/generic/main.inc
+++ b/gosa-core/plugins/personal/generic/main.inc
@@ -161,7 +161,7 @@ if (!$remove_lock){
       $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 {
       /* 'viewid' may be set by i.e. the phonelist plugin. This
@@ -172,7 +172,7 @@ if (!$remove_lock){
       } else {
         $str= msgPool::editButton();
         $fn = "edit";
-        $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;";
       }
 
diff --git a/gosa-core/plugins/personal/posix/class_posixAccount.inc b/gosa-core/plugins/personal/posix/class_posixAccount.inc
index 596f519df..6fb52cc3e 100644
--- a/gosa-core/plugins/personal/posix/class_posixAccount.inc
+++ b/gosa-core/plugins/personal/posix/class_posixAccount.inc
@@ -401,7 +401,7 @@ class posixAccount 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());
@@ -439,7 +439,7 @@ class posixAccount extends plugin
       $smarty->assign("guser",$this->GroupUserRegex);
       $smarty->assign("groups", $glist);
       $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-core/plugins/personal/posix/generic.tpl b/gosa-core/plugins/personal/posix/generic.tpl
index 8e27c39a1..18c69ad97 100644
--- a/gosa-core/plugins/personal/posix/generic.tpl
+++ b/gosa-core/plugins/personal/posix/generic.tpl
@@ -122,7 +122,7 @@
     &nbsp;
   </td>
   <td style="vertical-align:top;">
-   <h2><img alt="" class="center" align="middle" src="images/closedlock.png" /> {t}System trust{/t}</h2>
+   <h2><img alt="" class="center" align="middle" src="images/lists/locked.png" /> {t}System trust{/t}</h2>
 {if !$multiple_support}
 	{t}Trust mode{/t}&nbsp;
 	{render acl=$trustmodeACL}
diff --git a/gosa-core/plugins/personal/posix/main.inc b/gosa-core/plugins/personal/posix/main.inc
index 73396471e..5199eb73c 100644
--- a/gosa-core/plugins/personal/posix/main.inc
+++ b/gosa-core/plugins/personal/posix/main.inc
@@ -108,10 +108,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;";
 
       /* Only display edit button if there is at least one attribute editable */
diff --git a/gosa-core/setup/setup_ldap.tpl b/gosa-core/setup/setup_ldap.tpl
index b1ef46ee1..69cd1f0dd 100644
--- a/gosa-core/setup/setup_ldap.tpl
+++ b/gosa-core/setup/setup_ldap.tpl
@@ -62,7 +62,7 @@
 			{else}
 				<input type='text' name='base' maxlength='80' size='40' value='{$base}'>
 			{/if}
-			<input type='image' class='center' src='images/list_reload.png' title='{t}Reload{/t}' name='reload' alt='{t}Reload{/t}'>
+			<input type='image' class='center' src='images/lists/reload.png' title='{t}Reload{/t}' name='reload' alt='{t}Reload{/t}'>
 		</div>
 	</div>
 	<p style="margin-top:20px">