diff --git a/html/images/dtree.png b/html/images/dtree.png
deleted file mode 100644
index 7eb7909962febca801ae5ff4a82e8ffa16badd09..0000000000000000000000000000000000000000
Binary files a/html/images/dtree.png and /dev/null differ
diff --git a/html/images/launch.png b/html/images/launch.png
deleted file mode 100644
index da97aef509bd6411185eb093c79581b870c21161..0000000000000000000000000000000000000000
Binary files a/html/images/launch.png and /dev/null differ
diff --git a/html/images/lists/action.png b/html/images/lists/action.png
deleted file mode 100644
index 120f2ff738b49341bb51cd91e639a2730187adad..0000000000000000000000000000000000000000
Binary files a/html/images/lists/action.png and /dev/null differ
diff --git a/html/images/rightarrow.png b/html/images/rightarrow.png
deleted file mode 100644
index dfac4c15d262b5c5367196be35796c0b9e391a45..0000000000000000000000000000000000000000
Binary files a/html/images/rightarrow.png and /dev/null differ
diff --git a/html/images/lists/submit.png b/html/themes/default/icons/16/actions/submit.png
similarity index 100%
rename from html/images/lists/submit.png
rename to html/themes/default/icons/16/actions/submit.png
diff --git a/html/images/lists/search-subtree.png b/html/themes/default/icons/16/apps/ldap.png
similarity index 100%
rename from html/images/lists/search-subtree.png
rename to html/themes/default/icons/16/apps/ldap.png
diff --git a/html/images/rocket.png b/html/themes/default/icons/16/types/action.png
similarity index 100%
rename from html/images/rocket.png
rename to html/themes/default/icons/16/types/action.png
diff --git a/ihtml/themes/default/simple-filter.tpl b/ihtml/themes/default/simple-filter.tpl
index 20f991908141fd3ffed7dac3b304a6b21bd0ea3c..643f1cd2076a8fc27b1d26a65c05885a6ffd975b 100644
--- a/ihtml/themes/default/simple-filter.tpl
+++ b/ihtml/themes/default/simple-filter.tpl
@@ -1,6 +1,6 @@
<div class="contentboxh">
<p class="contentboxh">
- <img src="images/launch.png" class="center" alt="[F]"> {t}Filter{/t}
+ {t}Filter{/t}
</p>
</div>
diff --git a/include/class_IconTheme.inc b/include/class_IconTheme.inc
index 7879e58daab2d0374ff705747b315cb62320c9f5..2c78a1cc4ef5ca0e2213ea4680fa6a4bc801e679 100644
--- a/include/class_IconTheme.inc
+++ b/include/class_IconTheme.inc
@@ -240,13 +240,13 @@ class IconTheme
'applications/office-calendar' => array(
array('mimetypes','x-office-calendar'),
),
- 'applications/os-linux' => array(
+ 'applications/os-linux' => array(
array('applications','linux'),
),
- 'applications/os-windows' => array(
+ 'applications/os-windows' => array(
array('applications','windows'),
),
- 'applications/samba' => array(
+ 'applications/samba' => array(
array('applications','os-windows'),
array('applications','windows'),
),
@@ -264,79 +264,82 @@ class IconTheme
'actions/application-exit' => array(
array('actions','system-log-out'),
),
- 'actions/document-export' => array(
+ 'actions/document-export' => array(
array('actions','document-send'),
),
- 'actions/download' => array(
+ 'actions/download' => array(
array('actions','document-save'),
),
'actions/document-restore' => array(
array('actions','document-import'),
array('actions','document-open'),
),
- 'actions/document-edit' => array(
+ 'actions/document-edit' => array(
array('actions','edit'),
array('applications','text-editor'),
array('applications','accessories-text-editor'),
array('actions','document-open'),
),
- 'actions/snapshot' => array(
+ 'actions/snapshot' => array(
array('actions','document-save'),
),
- 'actions/system-reboot' => array(
+ 'actions/system-reboot' => array(
array('actions','view-refresh'),
),
- 'actions/system-update' => array(
+ 'actions/system-update' => array(
array('applications','system-software-update'),
),
- 'actions/system-reinstall' => array(
+ 'actions/system-reinstall' => array(
array('applications','system-installer'),
),
- 'actions/up' => array(
+ 'actions/up' => array(
array('actions','go-up'),
array('actions','arrow-up'),
),
- 'actions/down' => array(
+ 'actions/down' => array(
array('actions','go-down'),
array('actions','arrow-down'),
),
- 'actions/previous' => array(
+ 'actions/previous' => array(
array('actions','go-previous'),
array('actions','arrow-left'),
),
- 'actions/next' => array(
+ 'actions/next' => array(
array('actions','go-next'),
array('actions','arrow-right'),
),
- 'categories/settings' => array(
+ 'actions/submit' => array(
+ array('actions','go-jump'),
+ ),
+ 'categories/settings' => array(
array('categories','gnome-settings'),
array('categories','preferences-other'),
array('categories','preferences-system'),
),
- 'categories/checks' => array(
+ 'categories/checks' => array(
array('actions','view-task'),
array('actions','view-calendar-tasks'),
array('actions','checkbox'),
array('status','task-complete'),
),
- 'devices/server' => array(
+ 'devices/server' => array(
array('places','server'),
array('places','network-server'),
),
- 'devices/media-cdrom' => array(
+ 'devices/media-cdrom' => array(
array('devices','media-optical'),
),
- 'devices/terminal' => array(
+ 'devices/terminal' => array(
array('applications','utilities-terminal'),
),
'devices/computer-windows' => array(
array('applications','os-windows'),
array('applications','windows'),
),
- 'status/object-locked' => array(
+ 'status/object-locked' => array(
array('status','changes-prevent'),
),
- 'status/object-unlocked' => array(
+ 'status/object-unlocked' => array(
array('status','changes-allow'),
),
);
diff --git a/include/class_baseSelector.inc b/include/class_baseSelector.inc
index d3e779cc3cd4bb9d1deaf78a39037d36fc966ffa..c2e8ed3e8033945d802fbf5c9a28ffe1aca872bb 100644
--- a/include/class_baseSelector.inc
+++ b/include/class_baseSelector.inc
@@ -254,7 +254,7 @@ class baseSelector {
// Draw submitter if required
if ($this->submitButton) {
- $this->tree .= " <input class='center' type='image' src='images/lists/submit.png' title='"._("Submit")."' name='submit_base_".$this->pid."' id='submit_base_".$this->pid."' alt='"._("Submit")."'>";
+ $this->tree .= " <input class='center' type='image' src='geticon.php?context=actions&icon=submit&size=16' title='"._("Submit")."' name='submit_base_".$this->pid."' id='submit_base_".$this->pid."' alt='"._("Submit")."'>";
}
$this->tree .= "<input type='submit' style='display:none' name='submit_tree_base_".$this->pid."' id='submit_tree_base_".$this->pid."'>";
$this->tree .= "<input type='hidden' name='bs_rebase_".$this->pid."' id='bs_rebase_".$this->pid."'>";
diff --git a/include/select/groupSelect/group-filter.tpl b/include/select/groupSelect/group-filter.tpl
index af5fdd80bdae75e09131791b2f96787d8f1dfcd6..3b17067c9f5c174ce1ba4aab7908eb341dcb743d 100644
--- a/include/select/groupSelect/group-filter.tpl
+++ b/include/select/groupSelect/group-filter.tpl
@@ -1,6 +1,6 @@
<div class="contentboxh">
<p class="contentboxh">
- <img src="images/launch.png" align="right" alt="[F]">{t}Filter{/t}
+ {t}Filter{/t}
</p>
</div>
diff --git a/plugins/admin/ogroups/ogroup-filter.tpl b/plugins/admin/ogroups/ogroup-filter.tpl
index 33fcea42019ea08d5715297c01847c14fa61ef4a..85ca566bc269447af7d721ac6629aba964afca30 100644
--- a/plugins/admin/ogroups/ogroup-filter.tpl
+++ b/plugins/admin/ogroups/ogroup-filter.tpl
@@ -1,6 +1,6 @@
<div class="contentboxh">
<p class="contentboxh">
- <img src="images/launch.png" alt="[F]"/>{t}Filter{/t}
+ {t}Filter{/t}
</p>
</div>
diff --git a/plugins/admin/users/user-filter.tpl b/plugins/admin/users/user-filter.tpl
index 308323e48817844603b2facd4aeea1e436fecc15..172871e1446e6eea5a7933d676375b4f583c1431 100644
--- a/plugins/admin/users/user-filter.tpl
+++ b/plugins/admin/users/user-filter.tpl
@@ -1,6 +1,6 @@
<div class="contentboxh">
<p class="contentboxh">
- <img src="images/launch.png" alt="[F]"/>{t}Filter{/t}
+ {t}Filter{/t}
</p>
</div>
diff --git a/plugins/personal/generic/class_user.inc b/plugins/personal/generic/class_user.inc
index c6fad35e4da7ac425e63dd9c1725e165c211ff04..c9ed07d35fb1ad27739f2a43b1a02e587cafb44c 100644
--- a/plugins/personal/generic/class_user.inc
+++ b/plugins/personal/generic/class_user.inc
@@ -262,7 +262,7 @@ class user extends simplePlugin
),
'account' => array(
'name' => _('Account information'),
- 'icon' => 'images/lists/search-subtree.png',
+ 'icon' => 'geticon.php?context=applications&icon=ldap&size=16',
'attrs' => array(
new BaseSelectorAttribute (get_ou("userRDN")),
new UidAttribute (