From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 18 Apr 2008 13:36:43 +0000 (+0000)
Subject: Moved search images
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5c175d7d7d49a74eadb375979bc60dac021a69c2;p=gosa.git

Moved search images


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

diff --git a/gosa-core/html/images/lists/search-user.png b/gosa-core/html/images/lists/search-user.png
new file mode 100644
index 000000000..1c164f4c5
Binary files /dev/null and b/gosa-core/html/images/lists/search-user.png differ
diff --git a/gosa-core/html/images/lists/search.png b/gosa-core/html/images/lists/search.png
new file mode 100644
index 000000000..593a56634
Binary files /dev/null and b/gosa-core/html/images/lists/search.png differ
diff --git a/gosa-core/html/images/search.png b/gosa-core/html/images/search.png
deleted file mode 100644
index 593a56634..000000000
Binary files a/gosa-core/html/images/search.png and /dev/null differ
diff --git a/gosa-core/html/images/search_user.png b/gosa-core/html/images/search_user.png
deleted file mode 100644
index 1c164f4c5..000000000
Binary files a/gosa-core/html/images/search_user.png and /dev/null differ
diff --git a/gosa-core/html/plugins/groups/images/asterisk.png b/gosa-core/html/plugins/groups/images/asterisk.png
new file mode 100644
index 000000000..b9bc82e02
Binary files /dev/null and b/gosa-core/html/plugins/groups/images/asterisk.png differ
diff --git a/gosa-core/html/plugins/groups/images/environment.png b/gosa-core/html/plugins/groups/images/environment.png
new file mode 100644
index 000000000..f4ef81c60
Binary files /dev/null and b/gosa-core/html/plugins/groups/images/environment.png differ
diff --git a/gosa-core/html/plugins/groups/images/menu.png b/gosa-core/html/plugins/groups/images/menu.png
new file mode 100644
index 000000000..dd6de2f62
Binary files /dev/null and b/gosa-core/html/plugins/groups/images/menu.png differ
diff --git a/gosa-core/html/plugins/groups/images/samba.png b/gosa-core/html/plugins/groups/images/samba.png
new file mode 100644
index 000000000..ec747e570
Binary files /dev/null and b/gosa-core/html/plugins/groups/images/samba.png differ
diff --git a/gosa-core/include/class_MultiSelectWindow.inc b/gosa-core/include/class_MultiSelectWindow.inc
index 898916456..adcb53ef3 100644
--- a/gosa-core/include/class_MultiSelectWindow.inc
+++ b/gosa-core/include/class_MultiSelectWindow.inc
@@ -77,7 +77,7 @@ class MultiSelectWindow{
   }
 
 	/* Adds a regex input field to the current dialog */
-	function AddRegex($name,$string,$value,$conn,$image="images/search.png")
+	function AddRegex($name,$string,$value,$conn,$image="images/lists/search.png")
 	{
 		$arr = array();
 
diff --git a/gosa-core/plugins/admin/groups/class_divListGroup.inc b/gosa-core/plugins/admin/groups/class_divListGroup.inc
index 4459ee926..b557de966 100644
--- a/gosa-core/plugins/admin/groups/class_divListGroup.inc
+++ b/gosa-core/plugins/admin/groups/class_divListGroup.inc
@@ -98,7 +98,7 @@ class divListGroup extends MultiSelectWindow
 
     /*                  Name                 ,Text                              ,Default  , Connect with alphabet  */
     $this->AddRegex   ("Regex",     _("Regular expression for matching group names"), "*" , true);
-    $this->AddRegex   ("UserRegex", _("User name of which groups are shown"),         "*" , false, "images/search_user.png");
+    $this->AddRegex   ("UserRegex", _("User name of which groups are shown"),         "*" , false, "images/lists/search-user.png");
   }
 
 
@@ -261,13 +261,13 @@ class divListGroup extends MultiSelectWindow
                  name='group_group_edit_%KEY%' alt='P'  title='"._("Posix")  ."'>";
     $mailimg  = "<input type='image' class='center' src='images/mailto.png'
                  name='mailgroup_group_edit_%KEY%' alt='M'  title='"._("Mail")   ."'>";
-    $sambaimg = "<input type='image'  class='center' src='images/select_winstation.png'
+    $sambaimg = "<input type='image'  class='center' src='plugins/groups/images/samba.png'
                  name='group_group_edit_%KEY%' alt='S'  title='"._("Samba")  ."'>";
-    $applimg  = "<input type='image'  class='center' src='images/select_application.png'
+    $applimg  = "<input type='image'  class='center' src='plugins/groups/images/menu.png'
                  name='appgroup_group_edit_%KEY%' alt='A'  title='"._("Application")."'>";
-    $phoneimg = "<input type='image'  class='center' src='images/select_phone.png'
+    $phoneimg = "<input type='image'  class='center' src='plugins/groups/images/asterisk.png'
                  name='group_group_edit_%KEY%' alt='Ph' title='"._("Phone")  ."'>";
-    $envimg   = "<input type='image'  class='center' src='images/smallenv.png'
+    $envimg   = "<input type='image'  class='center' src='plugins/groups/images/environment.png'
                  name='environment_group_edit_%KEY%' alt='E' title='"._("Environment")  ."'>";
 
     // Space
diff --git a/gosa-core/plugins/admin/groups/class_groupGeneric.inc b/gosa-core/plugins/admin/groups/class_groupGeneric.inc
index 1e78305ba..b9e30839a 100644
--- a/gosa-core/plugins/admin/groups/class_groupGeneric.inc
+++ b/gosa-core/plugins/admin/groups/class_groupGeneric.inc
@@ -369,7 +369,7 @@ class group extends plugin
         $wslist[]= preg_replace('/\$/', '', $attrs['cn'][0]);
       }
       asort($wslist);
-      $smarty->assign("search_image", get_template_path('images/search.png'));
+      $smarty->assign("search_image", get_template_path('images/lists/search.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);
@@ -432,7 +432,7 @@ class group extends plugin
       $this->reload();
 
       /* Show dialog */
-      $smarty->assign("search_image", get_template_path('images/search.png'));
+      $smarty->assign("search_image", get_template_path('images/lists/search.png'));
       $smarty->assign("launchimage", get_template_path('images/lists/action.png'));
       $smarty->assign("tree_image", get_template_path('images/tree.png'));
 
@@ -548,7 +548,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("search_image", get_template_path('images/lists/search.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/ogroups/class_ogroup.inc b/gosa-core/plugins/admin/ogroups/class_ogroup.inc
index fa0c66ca1..39f744d73 100644
--- a/gosa-core/plugins/admin/ogroups/class_ogroup.inc
+++ b/gosa-core/plugins/admin/ogroups/class_ogroup.inc
@@ -278,7 +278,7 @@ class ogroup extends plugin
       $smarty->assign("objects", $this->convert_list($this->objects));
 
       /* Show dialog */
-      $smarty->assign("search_image", get_template_path('images/search.png'));
+      $smarty->assign("search_image", get_template_path('images/lists/search.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/personal/posix/class_posixAccount.inc b/gosa-core/plugins/personal/posix/class_posixAccount.inc
index cf1dae04f..799629ad4 100644
--- a/gosa-core/plugins/personal/posix/class_posixAccount.inc
+++ b/gosa-core/plugins/personal/posix/class_posixAccount.inc
@@ -400,7 +400,7 @@ class posixAccount extends plugin
         $wslist[]= preg_replace('/\$/', '', $attrs['cn'][0]);
       }
       asort($wslist);
-      $smarty->assign("search_image", get_template_path('images/search.png'));
+      $smarty->assign("search_image", get_template_path('images/lists/search.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);
@@ -438,7 +438,7 @@ class posixAccount extends plugin
       $smarty->assign("regex",$this->GroupRegex);
       $smarty->assign("guser",$this->GroupUserRegex);
       $smarty->assign("groups", $glist);
-      $smarty->assign("search_image", get_template_path('images/search.png'));
+      $smarty->assign("search_image", get_template_path('images/lists/search.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-plugins/addressbook/addons/addressbook/class_addressbook.inc b/gosa-plugins/addressbook/addons/addressbook/class_addressbook.inc
index 273289588..0506dbf7c 100644
--- a/gosa-plugins/addressbook/addons/addressbook/class_addressbook.inc
+++ b/gosa-plugins/addressbook/addons/addressbook/class_addressbook.inc
@@ -490,7 +490,7 @@ class addressbook extends plugin
     $smarty->assign("depselect", $this->search_base);
     $smarty->assign("global", $phonefilter['global']);
     $smarty->assign("organizational", $phonefilter['organizational']);
-    $smarty->assign("search_image", get_template_path('images/search.png'));
+    $smarty->assign("search_image", get_template_path('images/lists/search.png'));
     $smarty->assign("obj_image", get_template_path('images/list_ogroup.png'));
     $smarty->assign("tree_image", get_template_path('images/tree.png'));
     $smarty->assign("infoimage", get_template_path('images/info.png'));
diff --git a/gosa-plugins/dfs/addons/godfs/class_dfsManagment.inc b/gosa-plugins/dfs/addons/godfs/class_dfsManagment.inc
index 06409a633..c3d32e5b9 100644
--- a/gosa-plugins/dfs/addons/godfs/class_dfsManagment.inc
+++ b/gosa-plugins/dfs/addons/godfs/class_dfsManagment.inc
@@ -220,7 +220,7 @@ class dfsManagment extends plugin {
       /* Use the smarty templating engine here... */
 
       $smarty->assign('tree', $tree_html);
-      $smarty->assign('search_image', get_template_path('images/search.png'));
+      $smarty->assign('search_image', get_template_path('images/lists/search.png'));
       $smarty->assign('infoimage', get_template_path('images/info.png'));
       $smarty->assign('launchimage', get_template_path('images/launch.png'));
       $smarty->assign('alphabet', generate_alphabet());
diff --git a/gosa-plugins/fai/admin/fai/class_faiPackageEntry.inc b/gosa-plugins/fai/admin/fai/class_faiPackageEntry.inc
index e9697009d..e184c7f82 100644
--- a/gosa-plugins/fai/admin/fai/class_faiPackageEntry.inc
+++ b/gosa-plugins/fai/admin/fai/class_faiPackageEntry.inc
@@ -130,7 +130,7 @@ class faiPackageEntry extends plugin
     $smarty->assign("launchimage"   , get_template_path('images/launch.png'));
     $smarty->assign("alphabet"      , generate_alphabet());
     $smarty->assign("apply"         , apply_filter(TRUE));
-    $smarty->assign("search_image"  , get_template_path('images/search.png'));
+    $smarty->assign("search_image"  , get_template_path('images/lists/search.png'));
 
     $display.= $smarty->fetch(get_template_path('faiPackageEntry.tpl', TRUE));
     return($display);
diff --git a/gosa-plugins/fai/admin/fai/class_faiProfileEntry.inc b/gosa-plugins/fai/admin/fai/class_faiProfileEntry.inc
index fe7decf65..4b9ff1868 100644
--- a/gosa-plugins/fai/admin/fai/class_faiProfileEntry.inc
+++ b/gosa-plugins/fai/admin/fai/class_faiProfileEntry.inc
@@ -233,7 +233,7 @@ class faiProfileEntry extends plugin
     $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'));
+    $smarty->assign("search_image"  , get_template_path('images/lists/search.png'));
 
     $display.= $smarty->fetch(get_template_path('faiProfileEntry.tpl', TRUE));
     return($display);
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 6f7f6bc15..53f8960c8 100644
--- a/gosa-plugins/glpi/admin/systems/services/glpi/class_glpiAttachmentPool.inc
+++ b/gosa-plugins/glpi/admin/systems/services/glpi/class_glpiAttachmentPool.inc
@@ -260,8 +260,8 @@ class glpiAttachmentPool extends plugin
   
     $smarty->assign("attachments",      $divlist->DrawList());
     $smarty->assign("attachmenthead",   $listhead);
-    $smarty->assign("search_image",     get_template_path('images/search.png'));
-    $smarty->assign("searchu_image",    get_template_path('images/search_user.png'));
+    $smarty->assign("search_image",     get_template_path('images/lists/search.png'));
+    $smarty->assign("searchu_image",    get_template_path('images/lists/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/lists/action.png'));
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 0d994fdeb..326f02441 100644
--- a/gosa-plugins/glpi/admin/systems/services/glpi/class_glpiDeviceManagement.inc
+++ b/gosa-plugins/glpi/admin/systems/services/glpi/class_glpiDeviceManagement.inc
@@ -248,8 +248,8 @@ class glpiDeviceManagement extends plugin
     $filter = session::get('glpiDeviceRegex');
     $smarty->assign("devicehead", $listhead);
     $smarty->assign("devices", $divlist->DrawList());
-    $smarty->assign("search_image", get_template_path('images/search.png'));
-    $smarty->assign("searchu_image", get_template_path('images/search_user.png'));
+    $smarty->assign("search_image", get_template_path('images/lists/search.png'));
+    $smarty->assign("searchu_image", get_template_path('images/lists/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/lists/action.png'));
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 4e3134b93..ca3926689 100644
--- a/gosa-plugins/glpi/admin/systems/services/glpi/class_glpiPrinterCartridges.inc
+++ b/gosa-plugins/glpi/admin/systems/services/glpi/class_glpiPrinterCartridges.inc
@@ -210,8 +210,8 @@ class glpiPrinterCartridges extends plugin
     $filter = session::get('glpiCartridgeRegex');
     $smarty->assign("devicehead", $listhead);
     $smarty->assign("devices", $divlist->DrawList());
-    $smarty->assign("search_image", get_template_path('images/search.png'));
-    $smarty->assign("searchu_image", get_template_path('images/search_user.png'));
+    $smarty->assign("search_image", get_template_path('images/lists/search.png'));
+    $smarty->assign("searchu_image", get_template_path('images/lists/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/lists/action.png'));
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 8baf3a5d5..654624cb8 100644
--- a/gosa-plugins/glpi/admin/systems/services/glpi/class_glpiSelectUser.inc
+++ b/gosa-plugins/glpi/admin/systems/services/glpi/class_glpiSelectUser.inc
@@ -185,8 +185,8 @@ class glpiSelectUser extends plugin
     $filter = session::get('glpi_user_filter');
     $smarty->assign("usershead", $listhead);
     $smarty->assign("users", $divlist->DrawList());
-    $smarty->assign("search_image", get_template_path('images/search.png'));
-    $smarty->assign("searchu_image", get_template_path('images/search_user.png'));
+    $smarty->assign("search_image", get_template_path('images/lists/search.png'));
+    $smarty->assign("searchu_image", get_template_path('images/lists/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/lists/action.png'));
diff --git a/gosa-plugins/gofax/gofax/faxaccount/class_gofaxAccount.inc b/gosa-plugins/gofax/gofax/faxaccount/class_gofaxAccount.inc
index a743f0aa4..6974ae6f4 100644
--- a/gosa-plugins/gofax/gofax/faxaccount/class_gofaxAccount.inc
+++ b/gosa-plugins/gofax/gofax/faxaccount/class_gofaxAccount.inc
@@ -379,8 +379,8 @@ class gofaxAccount extends plugin
       }
 
       /* Show dialog */
-      $smarty->assign("search_image", get_template_path('images/search.png'));
-      $smarty->assign("usearch_image", get_template_path('images/search_user.png'));
+      $smarty->assign("search_image", get_template_path('images/lists/search.png'));
+      $smarty->assign("usearch_image", get_template_path('images/lists/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/lists/action.png'));
diff --git a/gosa-plugins/gofax/gofax/faxreports/class_faxreport.inc b/gosa-plugins/gofax/gofax/faxreports/class_faxreport.inc
index 42680457e..006a1ad77 100644
--- a/gosa-plugins/gofax/gofax/faxreports/class_faxreport.inc
+++ b/gosa-plugins/gofax/gofax/faxreports/class_faxreport.inc
@@ -95,7 +95,7 @@ class faxreport extends plugin
 
     $smarty= get_smarty();
     $smarty->assign("launchimage"		, get_template_path('images/launch.png'));
-    $smarty->assign("search_image"  , get_template_path('images/search.png'));
+    $smarty->assign("search_image"  , get_template_path('images/lists/search.png'));
     $smarty->assign("search_for"		, $this->search_for);
     $smarty->assign("bases"				  , $this->config->idepartments);
     $smarty->assign("base_select"		, $this->search_base);
diff --git a/gosa-plugins/gofon/gofon/fonreports/class_fonreport.inc b/gosa-plugins/gofon/gofon/fonreports/class_fonreport.inc
index bb6ef6264..488567efd 100644
--- a/gosa-plugins/gofon/gofon/fonreports/class_fonreport.inc
+++ b/gosa-plugins/gofon/gofon/fonreports/class_fonreport.inc
@@ -145,7 +145,7 @@ class fonreport extends plugin
 
     $smarty->assign("plug",           "?plug=".validate($_GET['plug']));
     $smarty->assign("launchimage",    get_template_path('images/launch.png'));
-    $smarty->assign("search_image",   get_template_path('images/search.png'));
+    $smarty->assign("search_image",   get_template_path('images/lists/search.png'));
     $smarty->assign("search_for",     $this->search_for);
     $smarty->assign("bases",          $bases);
     $smarty->assign("base_select",    $this->search_base);
diff --git a/gosa-plugins/goto/addons/goto/events/class_EventTargetAddList.inc b/gosa-plugins/goto/addons/goto/events/class_EventTargetAddList.inc
index e8837d720..9b7ee83ab 100644
--- a/gosa-plugins/goto/addons/goto/events/class_EventTargetAddList.inc
+++ b/gosa-plugins/goto/addons/goto/events/class_EventTargetAddList.inc
@@ -65,7 +65,7 @@ class EventTargetAddList extends MultiSelectWindow
     $this->AddHeader(array("string"=>"&nbsp;","attach"=>"style='width:20px;'"));
     $this->AddHeader(array("string"=>_("System / Department")));
 
-    //$name,$string,$value,$conn,$image="images/search.png")
+    //$name,$string,$value,$conn,$image="images/lists/search.png")
     $this->AddRegex("regex" ,"regex"  ,"*"                , TRUE);
     $this->AddRegex("ipfrom","ipfrom" ,"0.0.0.0"          , FALSE);
     $this->AddRegex("ipto"  ,"ipto"   ,"255.255.255.255"  , FALSE);
diff --git a/gosa-plugins/goto/addons/goto/events/class_EventTargetAddUsersList.inc b/gosa-plugins/goto/addons/goto/events/class_EventTargetAddUsersList.inc
index 951976a75..8e9db1a19 100644
--- a/gosa-plugins/goto/addons/goto/events/class_EventTargetAddUsersList.inc
+++ b/gosa-plugins/goto/addons/goto/events/class_EventTargetAddUsersList.inc
@@ -59,7 +59,7 @@ class EventTargetAddUserList extends MultiSelectWindow
     $this->AddHeader(array("string"=>"&nbsp;","attach"=>"style='width:20px;'"));
     $this->AddHeader(array("string"=>_("System / Department")));
 
-    //$name,$string,$value,$conn,$image="images/search.png")
+    //$name,$string,$value,$conn,$image="images/lists/search.png")
     $this->AddRegex("regex" ,"regex"  ,"*"                , TRUE);
 
     $this->AddCheckBox("display_users"  ,"1", _("Display users"),TRUE);
diff --git a/gosa-plugins/goto/admin/systems/goto/class_selectUserToPrinterDialog.inc b/gosa-plugins/goto/admin/systems/goto/class_selectUserToPrinterDialog.inc
index 67bb9a946..b5d564e20 100644
--- a/gosa-plugins/goto/admin/systems/goto/class_selectUserToPrinterDialog.inc
+++ b/gosa-plugins/goto/admin/systems/goto/class_selectUserToPrinterDialog.inc
@@ -120,7 +120,7 @@ class selectUserToPrinterDialog extends plugin
     $smarty->assign("gotoPrinterKeys"     , array_flip($tmp_printers));
     $smarty->assign("apply"               , apply_filter());
     $smarty->assign("alphabet"            , generate_alphabet());
-    $smarty->assign("search_image"        , get_template_path('images/search.png'));
+    $smarty->assign("search_image"        , get_template_path('images/lists/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/lists/action.png'));
diff --git a/gosa-plugins/goto/admin/systems/ppd/class_printerPPDSelectionDialog.inc b/gosa-plugins/goto/admin/systems/ppd/class_printerPPDSelectionDialog.inc
index 2935eafa4..868ae10ba 100644
--- a/gosa-plugins/goto/admin/systems/ppd/class_printerPPDSelectionDialog.inc
+++ b/gosa-plugins/goto/admin/systems/ppd/class_printerPPDSelectionDialog.inc
@@ -165,7 +165,7 @@ class printerPPDSelectionDialog extends plugin
     }
 
     $smarty->assign("List",         $div -> DrawList());
-    $smarty->assign("search_image", get_template_path('images/search.png'));
+    $smarty->assign("search_image", get_template_path('images/lists/search.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());
diff --git a/gosa-plugins/goto/personal/environment/class_hotplugDialog.inc b/gosa-plugins/goto/personal/environment/class_hotplugDialog.inc
index 24f5a2cfe..c5dde6003 100644
--- a/gosa-plugins/goto/personal/environment/class_hotplugDialog.inc
+++ b/gosa-plugins/goto/personal/environment/class_hotplugDialog.inc
@@ -44,7 +44,7 @@ class hotplugDialog extends plugin
     $smarty->assign("depselectHot",$this->depselect);
     $smarty->assign("apply", apply_filter());
     $smarty->assign("alphabet", generate_alphabet());
-    $smarty->assign("search_image", get_template_path('images/search.png'));
+    $smarty->assign("search_image", get_template_path('images/lists/search.png'));
     $smarty->assign("tree_image", get_template_path('images/tree.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 025ab8ff4..78e937b9e 100644
--- a/gosa-plugins/goto/personal/environment/class_selectPrinterDialog.inc
+++ b/gosa-plugins/goto/personal/environment/class_selectPrinterDialog.inc
@@ -89,7 +89,7 @@ class selectPrinterDialog extends plugin
     $smarty->assign("apply", apply_filter());
     $smarty->assign("alphabet", generate_alphabet());
     $smarty->assign("subtrees", $this->subtreesearch?"checked":"");
-    $smarty->assign("search_image", get_template_path('images/search.png'));
+    $smarty->assign("search_image", get_template_path('images/lists/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/lists/action.png'));
diff --git a/gosa-plugins/log/addons/logview/class_gosa_logview.inc b/gosa-plugins/log/addons/logview/class_gosa_logview.inc
index 296082f13..a25efe596 100644
--- a/gosa-plugins/log/addons/logview/class_gosa_logview.inc
+++ b/gosa-plugins/log/addons/logview/class_gosa_logview.inc
@@ -88,7 +88,7 @@ class gosa_logview extends plugin
     $smarty= get_smarty();
     $smarty->assign("search_result", "");
     $smarty->assign("plug", "?plug=".validate($_GET['plug']));
-    $smarty->assign("search_image", get_template_path('images/search.png'));
+    $smarty->assign("search_image", get_template_path('images/lists/search.png'));
     $smarty->assign("time_image", get_template_path('images/time.png'));
     $smarty->assign("server_image", get_template_path('images/server.png'));
     $smarty->assign("log_image", get_template_path('images/log_warning.png'));
diff --git a/gosa-plugins/log/addons/logview/class_logview.inc b/gosa-plugins/log/addons/logview/class_logview.inc
index d25d98a00..12fd1d61a 100644
--- a/gosa-plugins/log/addons/logview/class_logview.inc
+++ b/gosa-plugins/log/addons/logview/class_logview.inc
@@ -54,7 +54,7 @@ class logview extends plugin
     $smarty= get_smarty();
     $smarty->assign("search_result", "");
     $smarty->assign("plug", "?plug=".validate($_GET['plug']));
-    $smarty->assign("search_image", get_template_path('images/search.png'));
+    $smarty->assign("search_image", get_template_path('images/lists/search.png'));
     $smarty->assign("time_image", get_template_path('images/time.png'));
     $smarty->assign("server_image", get_template_path('images/server.png'));
     $smarty->assign("log_image", get_template_path('images/log_warning.png'));
diff --git a/gosa-plugins/mail/addons/mailqueue/contents.tpl b/gosa-plugins/mail/addons/mailqueue/contents.tpl
index c07ed95ad..acc0d4871 100644
--- a/gosa-plugins/mail/addons/mailqueue/contents.tpl
+++ b/gosa-plugins/mail/addons/mailqueue/contents.tpl
@@ -7,7 +7,7 @@
 	<table width="100%" summary="">
 		<tr>
 			<td>
-	<img class="center" alt="{t}Search{/t}" src="images/search.png" align="middle" border="0">
+	<img class="center" alt="{t}Search{/t}" src="images/lists/search.png" align="middle" border="0">
 	 &nbsp;{t}Search for{/t}
     <input name="search_for" size="12" maxlength="60" value="{$search_for}" title="{t}Please enter a search string here.{/t}" onchange="mainform.submit()">
  	 &nbsp;in 
diff --git a/gosa-plugins/mail/admin/groups/mail/class_groupMail.inc b/gosa-plugins/mail/admin/groups/mail/class_groupMail.inc
index 375dc9042..811c39ba3 100644
--- a/gosa-plugins/mail/admin/groups/mail/class_groupMail.inc
+++ b/gosa-plugins/mail/admin/groups/mail/class_groupMail.inc
@@ -544,8 +544,8 @@ class mailgroup extends plugin
       reset ($mailusers);
 
       /* Show dialog */
-      $smarty->assign("search_image", get_template_path('images/search.png'));
-      $smarty->assign("usearch_image", get_template_path('images/search_user.png'));
+      $smarty->assign("search_image", get_template_path('images/lists/search.png'));
+      $smarty->assign("usearch_image", get_template_path('images/lists/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/lists/action.png'));
diff --git a/gosa-plugins/mail/personal/mail/class_mailAccount.inc b/gosa-plugins/mail/personal/mail/class_mailAccount.inc
index 318d83a8d..877860439 100644
--- a/gosa-plugins/mail/personal/mail/class_mailAccount.inc
+++ b/gosa-plugins/mail/personal/mail/class_mailAccount.inc
@@ -507,8 +507,8 @@ class mailAccount extends plugin
       reset ($mailusers);
 
       /* Show dialog */
-      $smarty->assign("search_image", get_template_path('images/search.png'));
-      $smarty->assign("usearch_image", get_template_path('images/search_user.png'));
+      $smarty->assign("search_image", get_template_path('images/lists/search.png'));
+      $smarty->assign("usearch_image", get_template_path('images/lists/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/lists/action.png'));
diff --git a/gosa-plugins/samba/personal/samba/class_sambaAccount.inc b/gosa-plugins/samba/personal/samba/class_sambaAccount.inc
index 3082335e8..25ce09629 100644
--- a/gosa-plugins/samba/personal/samba/class_sambaAccount.inc
+++ b/gosa-plugins/samba/personal/samba/class_sambaAccount.inc
@@ -414,7 +414,7 @@ class sambaAccount extends plugin
       }
       asort($wslist);
 
-      $smarty->assign("search_image", get_template_path('images/search.png'));
+      $smarty->assign("search_image", get_template_path('images/lists/search.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-plugins/sudo/admin/sudo/class_divListSudo.inc b/gosa-plugins/sudo/admin/sudo/class_divListSudo.inc
index e1746a987..6ec0abeca 100644
--- a/gosa-plugins/sudo/admin/sudo/class_divListSudo.inc
+++ b/gosa-plugins/sudo/admin/sudo/class_divListSudo.inc
@@ -87,7 +87,7 @@ class divListSudo extends MultiSelectWindow
     $this->AddRegex   ("Regex"    , _("Regular expression for matching role names")       , 
       "*" , true);
     $this->AddRegex   ("UserRegex", _("Regular expression for matching role member names"),
-      "*" , FALSE,"images/search_user.png");
+      "*" , FALSE,"images/lists/search-user.png");
   }
 
 
diff --git a/gosa-plugins/sudo/admin/sudo/class_sudoGeneric.inc b/gosa-plugins/sudo/admin/sudo/class_sudoGeneric.inc
index eb9fcf017..9ebab2233 100644
--- a/gosa-plugins/sudo/admin/sudo/class_sudoGeneric.inc
+++ b/gosa-plugins/sudo/admin/sudo/class_sudoGeneric.inc
@@ -636,7 +636,7 @@ class sudo extends plugin
     foreach( array("depselect","regex") as $type){
       $smarty->assign("$type", $sysfilter[$type]);
     }
-    $smarty->assign("search_image", get_template_path('images/search.png'));
+    $smarty->assign("search_image", get_template_path('images/lists/search.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-plugins/systems/admin/systems/class_divListSystem.inc b/gosa-plugins/systems/admin/systems/class_divListSystem.inc
index 48299a140..dc5823c55 100644
--- a/gosa-plugins/systems/admin/systems/class_divListSystem.inc
+++ b/gosa-plugins/systems/admin/systems/class_divListSystem.inc
@@ -116,7 +116,7 @@ class divListSystem extends MultiSelectWindow
 
     /*                  Name                 ,Text                              ,Default  , Connect with alphabet  */
     $this->AddRegex   ("Regex",     _("Display systems matching"),"*" , true);
-    $this->AddRegex   ("UserRegex", _("Display systems of user"), "*" , false, "images/search_user.png");
+    $this->AddRegex   ("UserRegex", _("Display systems of user"), "*" , false, "images/lists/search-user.png");
   }
 
   function GenHeader()