diff --git a/images/clear.png b/images/clear.png
deleted file mode 100644
index 36e4583..0000000
Binary files a/images/clear.png and /dev/null differ
diff --git a/images/clear_small.png b/images/clear_small.png
deleted file mode 100644
index 05ceb53..0000000
Binary files a/images/clear_small.png and /dev/null differ
diff --git a/images/clear_small_old.png b/images/clear_small_old.png
deleted file mode 100644
index 05ceb53..0000000
Binary files a/images/clear_small_old.png and /dev/null differ
diff --git a/images/everybody.jpg b/images/everybody.jpg
deleted file mode 100644
index 66a4101..0000000
Binary files a/images/everybody.jpg and /dev/null differ
diff --git a/images/everybody.png b/images/everybody.png
new file mode 100644
index 0000000..d44c8a4
Binary files /dev/null and b/images/everybody.png differ
diff --git a/images/everybody_hilite.jpg b/images/everybody_hilite.jpg
deleted file mode 100644
index 090368a..0000000
Binary files a/images/everybody_hilite.jpg and /dev/null differ
diff --git a/images/everybody_hilite.png b/images/everybody_hilite.png
new file mode 100644
index 0000000..50f8720
Binary files /dev/null and b/images/everybody_hilite.png differ
diff --git a/images/search.jpg b/images/search.jpg
deleted file mode 100644
index 315ba45..0000000
Binary files a/images/search.jpg and /dev/null differ
diff --git a/images/search.png b/images/search.png
index f081968..057a9e3 100644
Binary files a/images/search.png and b/images/search.png differ
diff --git a/images/search_hilite.jpg b/images/search_hilite.jpg
deleted file mode 100644
index 0b6e2d9..0000000
Binary files a/images/search_hilite.jpg and /dev/null differ
diff --git a/images/search_hilite.png b/images/search_hilite.png
new file mode 100644
index 0000000..7b6d38d
Binary files /dev/null and b/images/search_hilite.png differ
diff --git a/images/search_small.png b/images/search_small.png
deleted file mode 100644
index f78f9be..0000000
Binary files a/images/search_small.png and /dev/null differ
diff --git a/images/workgroup.jpg b/images/workgroup.jpg
deleted file mode 100644
index 87bfb37..0000000
Binary files a/images/workgroup.jpg and /dev/null differ
diff --git a/images/workgroup.png b/images/workgroup.png
new file mode 100644
index 0000000..711658d
Binary files /dev/null and b/images/workgroup.png differ
diff --git a/images/workgroup_hilite.jpg b/images/workgroup_hilite.jpg
deleted file mode 100644
index 7de0db3..0000000
Binary files a/images/workgroup_hilite.jpg and /dev/null differ
diff --git a/images/workgroup_hilite.png b/images/workgroup_hilite.png
new file mode 100644
index 0000000..30b635e
Binary files /dev/null and b/images/workgroup_hilite.png differ
diff --git a/syntax.php b/syntax.php
index 251618d..2a0fcd4 100644
--- a/syntax.php
+++ b/syntax.php
@@ -35,7 +35,6 @@
 if (!defined('DOKU_LF')) define('DOKU_LF', "\n");
 if (!defined('DOKU_TAB')) define('DOKU_TAB', "\t");
 if (!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN', DOKU_INC . 'lib/plugins/');
-
 if (!defined('GROUPMANAGER_IMAGES')) define('GROUPMANAGER_IMAGES', DOKU_BASE . 'lib/plugins/groupmanager/images/');
 
 require_once DOKU_PLUGIN . 'syntax.php';
@@ -424,9 +423,9 @@ function render($mode, &$renderer, $data)
 
                 $renderer->doc .= "      <tr><td colspan=\"" . $colspan . "\" class=\"centeralign\"  STYLE='border-bottom: 3px solid #ccc'>";
                 $renderer->doc .= "        <span class=\"medialeft\" >";
-                $renderer->doc .= "        <input type=\"image\" src=\"" . GROUPMANAGER_IMAGES . "search.jpg\" onmouseover=\"this.src='" . GROUPMANAGER_IMAGES . "search_hilite.jpg'\" onmouseout=\"this.src='" . GROUPMANAGER_IMAGES . "search.jpg'\" STYLE=\"float: left; padding-right: 5px;\" name=\"fn[search][new]\" title=\"" . $this->lang['search_prompt'] . "\" alt=\"" . $this->lang['search'] . "\" />";
-                $renderer->doc .= "        <input type=\"image\" src=\"" . GROUPMANAGER_IMAGES . "workgroup.jpg\" onmouseover=\"this.src='" . GROUPMANAGER_IMAGES . "workgroup_hilite.jpg'\" onmouseout=\"this.src='" . GROUPMANAGER_IMAGES . "workgroup.jpg'\"  STYLE=\"float: left; padding-right: 5px;\" name=\"fn[search][show_default]\" title=\"" . $this->lang['search_default_group'] . "\" alt=\"" . $this->lang['search_default_group'] . "\" />";
-                $renderer->doc .= "        <input type=\"image\" src=\"" . GROUPMANAGER_IMAGES . "everybody.jpg\" onmouseover=\"this.src='" . GROUPMANAGER_IMAGES . "everybody_hilite.jpg'\" onmouseout=\"this.src='" . GROUPMANAGER_IMAGES . "everybody.jpg'\"  STYLE=\"float: left; padding-right: 5px;\" name=\"fn[search][clear]\" title=\"" . $this->lang['clear'] . "\" alt=\"" . $this->lang['clear'] . "\" />";
+                $renderer->doc .= "        <input type=\"image\" src=\"" . GROUPMANAGER_IMAGES . "search.png\" onmouseover=\"this.src='" . GROUPMANAGER_IMAGES . "search_hilite.png'\" onmouseout=\"this.src='" . GROUPMANAGER_IMAGES . "search.png'\" STYLE=\"float: left; padding-right: 5px;\" name=\"fn[search][new]\" title=\"" . $this->lang['search_prompt'] . "\" alt=\"" . $this->lang['search'] . "\" />";
+                $renderer->doc .= "        <input type=\"image\" src=\"" . GROUPMANAGER_IMAGES . "workgroup.png\" onmouseover=\"this.src='" . GROUPMANAGER_IMAGES . "workgroup_hilite.png'\" onmouseout=\"this.src='" . GROUPMANAGER_IMAGES . "workgroup.png'\"  STYLE=\"float: left; padding-right: 5px;\" name=\"fn[search][show_default]\" title=\"" . $this->lang['search_default_group'] . "\" alt=\"" . $this->lang['search_default_group'] . "\" />";
+                $renderer->doc .= "        <input type=\"image\" src=\"" . GROUPMANAGER_IMAGES . "everybody.png\" onmouseover=\"this.src='" . GROUPMANAGER_IMAGES . "everybody_hilite.png'\" onmouseout=\"this.src='" . GROUPMANAGER_IMAGES . "everybody.png'\"  STYLE=\"float: left; padding-right: 5px;\" name=\"fn[search][clear]\" title=\"" . $this->lang['clear'] . "\" alt=\"" . $this->lang['clear'] . "\" />";
                 $renderer->doc .= "        </span>";
                 $renderer->doc .= "        <span class=\"mediaright\">";
                 $renderer->doc .= "          <input type=\"submit\" name=\"fn[start]\" " . $page_buttons['start'] . " class=\"button\" value=\"" . $this->lang['start'] . "\" />";
@@ -548,9 +547,9 @@ function render($mode, &$renderer, $data)
                 $renderer->doc .= "    <tbody>";
                 $renderer->doc .= "      <tr><td colspan=\"" . $colspan . "\" class=\"centeralign\" STYLE='border-top: 3px solid #ccc'>";
                 $renderer->doc .= "        <span class=\"medialeft\">";
-                $renderer->doc .= "        <input type=\"image\" src=\"" . GROUPMANAGER_IMAGES . "search.jpg\" onmouseover=\"this.src='" . GROUPMANAGER_IMAGES . "search_hilite.jpg'\" onmouseout=\"this.src='" . GROUPMANAGER_IMAGES . "search.jpg'\" STYLE=\"float: left; padding-right: 5px;\" name=\"fn[search][new]\" title=\"" . $this->lang['search_prompt'] . "\" alt=\"" . $this->lang['search'] . "\" />";
-                $renderer->doc .= "        <input type=\"image\" src=\"" . GROUPMANAGER_IMAGES . "workgroup.jpg\" onmouseover=\"this.src='" . GROUPMANAGER_IMAGES . "workgroup_hilite.jpg'\" onmouseout=\"this.src='" . GROUPMANAGER_IMAGES . "workgroup.jpg'\"  STYLE=\"float: left; padding-right: 5px;\" name=\"fn[search][show_default]\" title=\"" . $this->lang['search_default_group'] . "\" alt=\"" . $this->lang['search_default_group'] . "\" />";
-                $renderer->doc .= "        <input type=\"image\" src=\"" . GROUPMANAGER_IMAGES . "everybody.jpg\" onmouseover=\"this.src='" . GROUPMANAGER_IMAGES . "everybody_hilite.jpg'\" onmouseout=\"this.src='" . GROUPMANAGER_IMAGES . "everybody.jpg'\"  STYLE=\"float: left; padding-right: 5px;\" name=\"fn[search][clear]\" title=\"" . $this->lang['clear'] . "\" alt=\"" . $this->lang['clear'] . "\" />";
+                $renderer->doc .= "        <input type=\"image\" src=\"" . GROUPMANAGER_IMAGES . "search.png\" onmouseover=\"this.src='" . GROUPMANAGER_IMAGES . "search_hilite.png'\" onmouseout=\"this.src='" . GROUPMANAGER_IMAGES . "search.png'\" STYLE=\"float: left; padding-right: 5px;\" name=\"fn[search][new]\" title=\"" . $this->lang['search_prompt'] . "\" alt=\"" . $this->lang['search'] . "\" />";
+                $renderer->doc .= "        <input type=\"image\" src=\"" . GROUPMANAGER_IMAGES . "workgroup.png\" onmouseover=\"this.src='" . GROUPMANAGER_IMAGES . "workgroup_hilite.png'\" onmouseout=\"this.src='" . GROUPMANAGER_IMAGES . "workgroup.png'\"  STYLE=\"float: left; padding-right: 5px;\" name=\"fn[search][show_default]\" title=\"" . $this->lang['search_default_group'] . "\" alt=\"" . $this->lang['search_default_group'] . "\" />";
+                $renderer->doc .= "        <input type=\"image\" src=\"" . GROUPMANAGER_IMAGES . "everybody.png\" onmouseover=\"this.src='" . GROUPMANAGER_IMAGES . "everybody_hilite.png'\" onmouseout=\"this.src='" . GROUPMANAGER_IMAGES . "everybody.png'\"  STYLE=\"float: left; padding-right: 5px;\" name=\"fn[search][clear]\" title=\"" . $this->lang['clear'] . "\" alt=\"" . $this->lang['clear'] . "\" />";
                 $renderer->doc .= "        </span>";
                 $renderer->doc .= "        <span class=\"mediaright\">";
                 $renderer->doc .= "          <input type=\"submit\" name=\"fn[start]\" " . $page_buttons['start'] . " class=\"button\" value=\"" . $this->lang['start'] . "\" />";