From: Michael M Slusarz <slusarz@curecanti.org>
Date: Wed, 17 Nov 2010 05:51:30 +0000 (-0700)
Subject: Clean up some Horde_Themes:: usage
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=464c49cf51f8f91f978528885133e47780b4690f;p=horde.git

Clean up some Horde_Themes:: usage
---

diff --git a/agora/lib/Application.php b/agora/lib/Application.php
index 60dc0919d..a32f30ac0 100644
--- a/agora/lib/Application.php
+++ b/agora/lib/Application.php
@@ -84,38 +84,37 @@ class Agora_Application extends Horde_Registry_Application
      */
     public function menu($menu)
     {
-        $img_dir = Horde_Themes::img();
         $scope = Horde_Util::getGet('scope', 'agora');
 
         /* Agora Home. */
         $url = Horde::url('forums.php')->add('scope', $scope);
-        $menu->add($url, _("_Forums"), 'forums.png', $img_dir, null, null,
+        $menu->add($url, _("_Forums"), 'forums.png', null, null, null,
                    dirname($_SERVER['PHP_SELF']) == $GLOBALS['registry']->get('webroot') && basename($_SERVER['PHP_SELF']) == 'index.php' ? 'current' : null);
 
         /* Thread list, if applicable. */
         if (isset($GLOBALS['forum_id'])) {
-            $menu->add(Agora::setAgoraId($GLOBALS['forum_id'], null, Horde::url('threads.php')), _("_Threads"), 'threads.png', Horde_Themes::img());
+            $menu->add(Agora::setAgoraId($GLOBALS['forum_id'], null, Horde::url('threads.php')), _("_Threads"), 'threads.png');
             if ($scope == 'agora' && $GLOBALS['registry']->getAuth()) {
-                $menu->add(Agora::setAgoraId($GLOBALS['forum_id'], null, Horde::url('messages/edit.php')), _("New Thread"), 'newmessage.png', Horde_Themes::img());
+                $menu->add(Agora::setAgoraId($GLOBALS['forum_id'], null, Horde::url('messages/edit.php')), _("New Thread"), 'newmessage.png');
             }
         }
 
         if ($scope == 'agora' &&
             Agora_Messages::hasPermission(Horde_Perms::DELETE, 0, $scope)) {
-            $menu->add(Horde::url('editforum.php'), _("_New Forum"), 'newforum.png', $img_dir, null, null, Horde_Util::getFormData('agora') ? '__noselection' : null);
+            $menu->add(Horde::url('editforum.php'), _("_New Forum"), 'newforum.png', null, null, null, Horde_Util::getFormData('agora') ? '__noselection' : null);
         }
 
         if (Agora_Messages::hasPermission(Horde_Perms::DELETE, 0, $scope)) {
             $url = Horde::url('moderate.php')->add('scope', $scope);
-            $menu->add($url, _("_Moderate"), 'moderate.png', $img_dir);
+            $menu->add($url, _("_Moderate"), 'moderate.png');
         }
 
         if ($GLOBALS['registry']->isAdmin()) {
-            $menu->add(Horde::url('moderators.php'), _("_Moderators"), 'hot.png', $img_dir);
+            $menu->add(Horde::url('moderators.php'), _("_Moderators"), 'hot.png');
         }
 
         $url = Horde::url('search.php')->add('scope', $scope);
-        $menu->add($url, _("_Search"), 'search.png', Horde_Themes::img(null, 'horde'));
+        $menu->add($url, _("_Search"), 'search.png');
     }
 
     /**
diff --git a/ansel/faces/image.php b/ansel/faces/image.php
index fbf144282..d8100a283 100644
--- a/ansel/faces/image.php
+++ b/ansel/faces/image.php
@@ -35,7 +35,6 @@ if (($reload || empty($result))) {
 }
 
 if (!empty($result)) {
-    $imgdir = Horde_Themes::img(null, 'horde');
     $customurl = Horde::url('faces/custom.php');
     require_once ANSEL_TEMPLATES . '/faces/image.inc';
 } else {
diff --git a/ansel/lib/Ajax/Imple/EditGalleryFaces.php b/ansel/lib/Ajax/Imple/EditGalleryFaces.php
index a2dcec02b..fb3773a32 100644
--- a/ansel/lib/Ajax/Imple/EditGalleryFaces.php
+++ b/ansel/lib/Ajax/Imple/EditGalleryFaces.php
@@ -72,7 +72,6 @@ class Ansel_Ajax_Imple_EditGalleryFaces extends Horde_Ajax_Imple_Base
                     $result = $faces->getFromPicture($image_id, $autocreate);
                 }
                 if (!empty($result)) {
-                    $imgdir = Horde_Themes::img(null, 'horde');
                     $customurl = Horde::url('faces/custom.php');
                     $url = (!empty($args['url']) ? urldecode($args['url']) : '');
                     Horde::startBuffer();
diff --git a/ansel/lib/Application.php b/ansel/lib/Application.php
index 79c66c0ba..04ec2e908 100644
--- a/ansel/lib/Application.php
+++ b/ansel/lib/Application.php
@@ -149,14 +149,14 @@ class Ansel_Application extends Horde_Registry_Application
         }
 
         if ($conf['faces']['driver'] && $registry->isAuthenticated()) {
-            $menu->add(Horde::url('faces/search/all.php'), _("_Faces"), 'user.png', Horde_Themes::img(null, 'horde'));
+            $menu->add(Horde::url('faces/search/all.php'), _("_Faces"), 'user.png');
         }
 
         /* Print. */
         if ($conf['menu']['print'] &&
             ($pl = Horde_Util::nonInputVar('print_link'))) {
             $menu->add($pl, _("_Print"), 'print.png',
-                       Horde_Themes::img(null, 'horde'), '_blank',
+                       null, '_blank',
                        Horde::popupJs($pl, array('urlencode' => true)) . 'return false;');
         }
     }
diff --git a/ansel/lib/View/EmbeddedRenderer/Mini.php b/ansel/lib/View/EmbeddedRenderer/Mini.php
index 0c030f258..ec0766974 100644
--- a/ansel/lib/View/EmbeddedRenderer/Mini.php
+++ b/ansel/lib/View/EmbeddedRenderer/Mini.php
@@ -130,7 +130,8 @@ class Ansel_View_EmbeddedRenderer_Mini extends Ansel_View_Gallery
 EOT;
             /* Special requirements for lightbox */
             if (!empty($lbjsurl)) {
-                $graphic_dir = Horde::url(Horde_Themes::img(), true, -1);
+                $loading_img = Horde_Themes::img('lightbox/loading.gif');
+                $close_img = Horde_Themes::img('lightbox/closelabel.gif');
                 $imageText = _("Photo");
                 $labelOf = _("of");
                 $html .= <<<EOT
@@ -145,8 +146,8 @@ EOT;
                     document.write('<link type="text/css" rel="stylesheet" href="$lbcssurl" />');
 
                     lbOptions = {
-                        fileLoadingImage: '$graphic_dir/lightbox/loading.gif',
-                        fileBottomNavCloseImage: '$graphic_dir/lightbox/closelabel.gif',
+                        fileLoadingImage: '$loading_img',
+                        fileBottomNavCloseImage: '$close_img',
                         overlayOpacity: 0.8,
                         animate: true,
                         resizeSpeed: 7,
diff --git a/ansel/lib/Widget/Actions.php b/ansel/lib/Widget/Actions.php
index 000b8daed..88ab52031 100644
--- a/ansel/lib/Widget/Actions.php
+++ b/ansel/lib/Widget/Actions.php
@@ -131,7 +131,7 @@ class Ansel_Widget_Actions extends Ansel_Widget_Base
 
             try {
                 $url = new Horde_Url($registry->bookmarks->getAddUrl($api_params));
-                $html .= '<li>' . $url->link(array('class' => 'widget')) . Horde::img(Horde_Themes::img('trean.png', 'trean')) . ' ' . _("Add to bookmarks") . '</a></li>';
+                $html .= '<li>' . $url->link(array('class' => 'widget')) . Horde::img('trean.png') . ' ' . _("Add to bookmarks") . '</a></li>';
             } catch (Horde_Exception $e) {}
         }
 
diff --git a/ansel/templates/image/upload.inc b/ansel/templates/image/upload.inc
index 8a2d33c59..59eb9f840 100644
--- a/ansel/templates/image/upload.inc
+++ b/ansel/templates/image/upload.inc
@@ -3,5 +3,4 @@ $form->renderActive(null, null, 'upload.php', 'post', 'multipart/form-data');
 if ($browser->getPlatform() == 'win' && Horde_Menu::showService('help')) {
     echo '<div class="box" style="margin:8px; padding:8px"><h3>' . Horde_Help::link('ansel', 'xppublish') . ' ' . _("Learn how to publish photos directly from Windows.") . '</h3></div>';
 }
-$graphic_dir = Horde_Themes::img();
-$lbcssurl = Horde::url($GLOBALS['registry']->get('themesuri', 'ansel') . '/lightbox.css', true);
\ No newline at end of file
+$lbcssurl = Horde::url($GLOBALS['registry']->get('themesuri', 'ansel') . '/lightbox.css', true);
diff --git a/ansel/templates/view/image.inc b/ansel/templates/view/image.inc
index 171d6daef..860f0d4b2 100644
--- a/ansel/templates/view/image.inc
+++ b/ansel/templates/view/image.inc
@@ -84,7 +84,7 @@ function arrowHandler(e)
         }
 ?>
     <div class="slideControls">
-     <?php echo Horde::fullSrcImg(Horde_Themes::img('loading.gif', array('app' => 'horde')), array('attr' => 'class="imgloading"'));?>
+     <?php echo Horde::fullSrcImg('loading.gif', array('attr' => 'class="imgloading"'));?>
      <?php
      if (empty($this->_params['hide_slideshow'])) {
          echo '<a style="display:none;" href="' . $this->_urls['slideshow'] . '" class="ssPlay" title="' . _("Start Slideshow") . '">' .
@@ -111,7 +111,7 @@ function arrowHandler(e)
      </div>
     </div>
     <div class="slideControls">
-     <?php echo Horde::fullSrcImg(Horde_Themes::img('loading.gif', array('app' => 'horde')), array('attr' => 'class="imgloading"'));?>
+     <?php echo Horde::fullSrcImg('loading.gif', array('attr' => 'class="imgloading"'));?>
      <?php
      if (empty($this->_params['hide_slideshow'])) {
          echo '<a style="display:none;" href="' . $this->_urls['slideshow'] . '" class="ssPlay" title="' . _("Start Slideshow") . '">' .
diff --git a/beatnik/lib/Beatnik.php b/beatnik/lib/Beatnik.php
index 825d00e53..9ff718d02 100644
--- a/beatnik/lib/Beatnik.php
+++ b/beatnik/lib/Beatnik.php
@@ -21,23 +21,21 @@ class Beatnik {
         $editing = Horde_Util::getFormData('id');
         $editing = !empty($editing);
 
-        $hordeImgDir = Horde_Themes::img(null, 'horde');
-        $beatnikImgDir = Horde_Themes::img();
         $menu = new Horde_Menu();
 
-        $menu->add(Horde::url('listzones.php'), _('List Domains'), 'website.png', $hordeImgDir);
+        $menu->add(Horde::url('listzones.php'), _('List Domains'), 'website.png');
         if (!empty($_SESSION['beatnik']['curdomain'])) {
-            $menu->add(Horde_Util::addParameter(Horde::url('editrec.php'), 'curdomain', $_SESSION['beatnik']['curdomain']['zonename']), ($editing) ? _("Edit Record") : _("Add Record"), 'edit.png', $hordeImgDir);
+            $menu->add(Horde_Util::addParameter(Horde::url('editrec.php'), 'curdomain', $_SESSION['beatnik']['curdomain']['zonename']), ($editing) ? _("Edit Record") : _("Add Record"), 'edit.png');
         } else {
-            $menu->add(Horde::url('editrec.php?rectype=soa'), _("Add Zone"), 'edit.png', $hordeImgDir);
+            $menu->add(Horde::url('editrec.php?rectype=soa'), _("Add Zone"), 'edit.png');
         }
 
         $url = Horde_Util::addParameter(Horde::selfUrl(true), array('expertmode' => 'toggle'));
-        $menu->add($url, _('Expert Mode'), 'hide_panel.png', $hordeImgDir, '', null, ($_SESSION['beatnik']['expertmode']) ? 'current' : '');
+        $menu->add($url, _('Expert Mode'), 'hide_panel.png', null, '', null, ($_SESSION['beatnik']['expertmode']) ? 'current' : '');
 
         if (count(Beatnik::needCommit())) {
             $url = Horde_Util::addParameter(Horde::url('commit.php'), array('domain' => 'all'));
-            $menu->add($url, _('Commit All'), 'commit-all.png', $beatnikImgDir);
+            $menu->add($url, _('Commit All'), 'commit-all.png');
         }
 
         if ($returnType == 'object') {
diff --git a/beatnik/listzones.php b/beatnik/listzones.php
index de9979b7f..dfaaad591 100644
--- a/beatnik/listzones.php
+++ b/beatnik/listzones.php
@@ -36,8 +36,6 @@ $pager = new Horde_Core_Ui_Pager('page', $pager_vars,
 // Limit the domain list to the current page
 $domains = array_slice($beatnik->domains, $page*$perpage, $perpage);
 
-$img_dir = Horde_Themes::img();
-
 // Hide fields that the user does not want to see
 $fields = Beatnik::getRecFields('soa');
 foreach ($fields as $field_id => $field) {
diff --git a/beatnik/templates/listzones/row.inc b/beatnik/templates/listzones/row.inc
index 518b1fa5b..786f478aa 100644
--- a/beatnik/templates/listzones/row.inc
+++ b/beatnik/templates/listzones/row.inc
@@ -11,11 +11,11 @@
 <td>
     <?php
         echo Horde::link($autourl) .
-             Horde::img('devel.png', _("Autogenerate"), '', $img_dir) . '</a> ' .
+             Horde::img('devel.png', _("Autogenerate")) . '</a> ' .
              Horde::link($deleteurl) .
-             Horde::img('delete.png', _("Delete"), '', $img_dir) . '</a> ' .
+             Horde::img('delete.png', _("Delete")) . '</a> ' .
              Horde::link($editurl) .
-             Horde::img('edit.png', _("Edit"), '', $img_dir) . '</a>';
+             Horde::img('edit.png', _("Edit")) . '</a>';
     ?>
 </td>
 <?php
diff --git a/beatnik/templates/view/header.inc b/beatnik/templates/view/header.inc
index 165c51ba0..c241d1c6a 100644
--- a/beatnik/templates/view/header.inc
+++ b/beatnik/templates/view/header.inc
@@ -18,11 +18,11 @@ $params = array('id' => $_SESSION['beatnik']['curdomain']['id'],
                 'rectype' => 'soa');
 echo $_SESSION['beatnik']['curdomain']['zonename'] . '&nbsp;'
      . Horde::link(Horde_Util::addParameter($edit, $params))
-     . Horde::img('edit.png', _("Edit"), '', $img_dir) . '</a> '
+     . Horde::img('edit.png', _("Edit")) . '</a> '
      . Horde::link(Horde_Util::addParameter($autogen, $params))
-     . Horde::img('devel.png', _("Autogenerate"), '', $img_dir) . '</a> '
+     . Horde::img('devel.png', _("Autogenerate")) . '</a> '
      . Horde::link(Horde_Util::addParameter($delete, $params))
-     . Horde::img('delete.png', _("Delete"), '', $img_dir) . '</a></td>';
+     . Horde::img('delete.png', _("Delete")) . '</a></td>';
 ?>
 </div>
 
diff --git a/beatnik/templates/view/record.inc b/beatnik/templates/view/record.inc
index c15a931d7..394ee2eb3 100644
--- a/beatnik/templates/view/record.inc
+++ b/beatnik/templates/view/record.inc
@@ -11,9 +11,9 @@ foreach ($zonedata[$type] as $record) {
     $params = array('id' => $record['id'], 'rectype' => $type);
     echo '<tr>' . "\n";
     echo '<td>' . Horde::link(Horde_Util::addParameter($edit, $params))
-                . Horde::img('edit.png', _("Edit"), '', $img_dir) . '</a> '
+                . Horde::img('edit.png', _("Edit")) . '</a> '
                 . Horde::link(Horde_Util::addParameter($delete, $params))
-                . Horde::img('delete.png', _("Delete"), '', $img_dir) . '</a></td>';
+                . Horde::img('delete.png', _("Delete")) . '</a></td>';
     echo '<td>' . $rectypes[$type] . '</td>';
 
     foreach ($fields as $field => $fdata) {
diff --git a/beatnik/viewzone.php b/beatnik/viewzone.php
index aa6b8b393..bae137c37 100644
--- a/beatnik/viewzone.php
+++ b/beatnik/viewzone.php
@@ -35,7 +35,6 @@ foreach ($fields as $field_id => $field) {
     }
 }
 
-$img_dir = Horde_Themes::img(null, 'horde');
 $delete = Horde_Util::addParameter(Horde::url('delete.php'), 'curdomain', $_SESSION['beatnik']['curdomain']['zonename']);
 $edit = Horde_Util::addParameter(Horde::url('editrec.php'), 'curdomain', $_SESSION['beatnik']['curdomain']['zonename']);
 $autogen = Horde_Util::addParameter(Horde::url('autogenerate.php'), 'curdomain', $_SESSION['beatnik']['curdomain']['zonename']);
diff --git a/folks/lib/Folks.php b/folks/lib/Folks.php
index 022527922..a63e27f89 100644
--- a/folks/lib/Folks.php
+++ b/folks/lib/Folks.php
@@ -290,14 +290,13 @@ class Folks {
      */
     static function getMenu()
     {
-        $img = Horde_Themes::img(null, 'horde');
         $menu = new Horde_Menu(Horde_Menu::MASK_ALL);
-        $menu->add(self::getUrlFor('user', $GLOBALS['registry']->getAuth()), _("My profile"), 'myaccount.png', $img);
-        $menu->add(self::getUrlFor('list', 'friends'), _("Friends"), 'group.png', $img);
-        $menu->add(Horde::url('edit/edit.php'), _("Edit profile"), 'edit.png', $img);
-        $menu->add(Horde::url('services.php'), _("Services"), 'horde.png', $img);
-        $menu->add(Horde::url('search.php'), _("Search"), 'search.png', $img);
-        $menu->add(self::getUrlFor('list', 'online'), _("List"), 'group.png', $img);
+        $menu->add(self::getUrlFor('user', $GLOBALS['registry']->getAuth()), _("My profile"), 'myaccount.png');
+        $menu->add(self::getUrlFor('list', 'friends'), _("Friends"), 'group.png');
+        $menu->add(Horde::url('edit/edit.php'), _("Edit profile"), 'edit.png');
+        $menu->add(Horde::url('services.php'), _("Services"), 'horde.png');
+        $menu->add(Horde::url('search.php'), _("Search"), 'search.png');
+        $menu->add(self::getUrlFor('list', 'online'), _("List"), 'group.png');
 
         return $menu;
     }
diff --git a/folks/templates/edit/activity.php b/folks/templates/edit/activity.php
index e234ae09d..a6fb503c1 100644
--- a/folks/templates/edit/activity.php
+++ b/folks/templates/edit/activity.php
@@ -23,7 +23,7 @@ if (empty($activities)) {
 <?php foreach ($activities as $activity) { ?>
 <tr>
     <td><a href="<?php echo $registry->get('webroot', $activity['activity_scope']) ?>" />
-        <img src="<?php echo Horde_Themes::img($activitiy['activity_scope'] . 'png', $activity['activity_scope']) ?>" />
+        <?php echo Horde::img(Horde_Themes::img($activitiy['activity_scope'] . 'png', $activity['activity_scope'])) ?>
         <?php echo $registry->get('name', $activity['activity_scope']) ?></a>
     </td>
     <td><?php echo Folks::format_datetime($activity['activity_date']) ?></td>
diff --git a/folks/templates/services/services.php b/folks/templates/services/services.php
index ce859396b..4065403b8 100644
--- a/folks/templates/services/services.php
+++ b/folks/templates/services/services.php
@@ -7,7 +7,7 @@ foreach ($apps as $app => $name) {
         $page = $registry->getInitialPage($app);
         echo '<div class="appService">' .
                 '<a href="' . $page . '">' .
-                '<img src="' . Horde_Themes::img($app . '.png', $app). '" /> ' .
+                Horde::img(Horde_Themes::img($app . '.png', $app)) . ' ' .
                     $name .
                     '</a></div>';
     } catch (Horde_Exception $e) {}
diff --git a/folks/templates/user/actions.php b/folks/templates/user/actions.php
index 97d31097b..14629c299 100644
--- a/folks/templates/user/actions.php
+++ b/folks/templates/user/actions.php
@@ -4,27 +4,27 @@
 
 <?php if ($registry->hasInterface('letter')): ?>
 <a href="<?php echo $registry->callByPackage('letter', 'compose', array($user)) ?>" title="<?php echo _("Send private message") ?>">
-<img src="<?php echo Horde_Themes::img('letter.png') ?>"> <?php echo _("Send message") ?></a>
+<?php echo Horde::img('letter.png') ?> <?php echo _("Send message") ?></a>
 
 <a href="<?php echo $registry->get('webroot', 'letter') ?>/compose.php?title=<?php echo _("Look at this profile") ?>&content=<?php echo Folks::getUrlFor('user', $user, true, -1) ?>"  title="<?php echo _("Send this profile to a friend") ?>">
-<img src="<?php echo Horde_Themes::img('/nav/right.png') ?>"> <?php echo _("Forward") ?></a>
+<?php echo Horde::img('/nav/right.png') ?> <?php echo _("Forward") ?></a>
 
 <?php endif; ?>
 
 <a href="javascript: document.getElementById('message_body').focus()" title="<?php echo _("Add a comment") ?>">
-<img src="<?php echo Horde_Themes::img('agora.png', 'agora') ?>"> <?php echo _("Add a comment") ?></a>
+<?php echo Horde::img('agora.png', 'agora') ?> <?php echo _("Add a comment") ?></a>
 
 <a href="<?php echo Horde_Util::addParameter(Horde::url('edit/friends/add.php'), 'user', $user); ?>" title="<?php echo sprintf(_("Add %s as a friend?"), $user) ?>" onclick="return confirm('<?php echo sprintf(_("Add %s as a friend?"), $user) ?>')">
-<img src="<?php echo Horde_Themes::img('user.png') ?>"> <?php echo _("Friend") ?></a>
+<?php echo Horde::img('user.png') ?> <?php echo _("Friend") ?></a>
 
 <a href="<?php echo Horde_Util::addParameter(Horde::url('edit/friends/blacklist.php'), 'user', $user); ?>" title="<?php echo sprintf(_("Add %s to you blacklist?"), $user) ?>" onclick="return confirm('<?php echo sprintf(_("Add %s to you blacklist?"), $user) ?>')">
-<img src="<?php echo Horde_Themes::img('locked.png') ?>"> <?php echo _("Blacklist") ?></a>
+<?php echo Horde::img('locked.png') ?> <?php echo _("Blacklist") ?></a>
 
 <a href="<?php echo Horde_Util::addParameter(Horde::url('report.php'), 'user', $user); ?>" title="<?php echo _("Report user") ?>">
-<img src="<?php echo Horde_Themes::img('problem.png') ?>"> <?php echo _("Report") ?></a>
+<?php echo Horde::img('problem.png') ?> <?php echo _("Report") ?></a>
 
 <a href="<?php echo Folks::getUrlFor('list', 'list') ?>" title="<?php echo _("User list") ?>">
-<img src="<?php echo Horde_Themes::img('group.png') ?>"> <?php echo _("Users") ?></a>
+<?php echo Horde::img('group.png') ?> <?php echo _("Users") ?></a>
 
 </div>
 
diff --git a/folks/templates/user/authenticated.php b/folks/templates/user/authenticated.php
index fd5cd3457..0aac1c142 100644
--- a/folks/templates/user/authenticated.php
+++ b/folks/templates/user/authenticated.php
@@ -1,11 +1,10 @@
 <h1><?php echo $title ?></h1>
 
 <ul class="notices">
-<li><img src="<?php echo Horde_Themes::img('alerts/warning.png') ?>"><?php echo sprintf(_("User %s would like to his profile remains visible only to authenticated users."), $user) ?></li>
-<?php
-echo '<li><img src="' . Horde_Themes::img('alerts/success.png') ?>">'
-                . _("Click here to login.")
-                . ' <a href="' . Hode::getServiceLink('login', 'folks')  . '">' . _("Click here to login.") . '</a>'
-                    . '</li>';
-?>
+ <li>
+  <?php echo Horde::img('alerts/warning.png') . sprintf(_("User %s would like to his profile remains visible only to authenticated users."), $user) ?>
+ </li>
+ <li>
+  <?php echo Horde::img('alerts/success.png') . _("Click here to login.") ?> <a href="<?php echo Hode::getServiceLink('login', 'folks') ?>"><?php echo _("Click here to login.") ?></a>
+ </li>
 </ul>
diff --git a/folks/templates/user/deleted.php b/folks/templates/user/deleted.php
index 5ccdcc799..170d334c0 100644
--- a/folks/templates/user/deleted.php
+++ b/folks/templates/user/deleted.php
@@ -1,5 +1,7 @@
 <h1><?php echo $title ?></h1>
 
 <ul class="notices">
-<li><img src="<?php echo Horde_Themes::img('alerts/warning.png')"><?php echo sprintf(_("User %s has been disabled."), $user) ?></li>
+ <li>
+  <?php echo Horde::img('alerts/warning.png') . sprintf(_("User %s has been disabled."), $user) ?>
+ </li>
 </ul>
diff --git a/folks/templates/user/friends.php b/folks/templates/user/friends.php
index 08d5f189c..793989d02 100644
--- a/folks/templates/user/friends.php
+++ b/folks/templates/user/friends.php
@@ -1,10 +1,11 @@
 <h1><?php echo $title ?></h1>
 
 <ul class="notices">
-<li><img src="<?php echo Horde_Themes::img('alerts/warning.png') ?>"><?php echo sprintf(_("User %s would like to his profile remains visible only to his friends."), $user) ?></li>
+ <li>
+  <?php echo Horde_::img('alerts/warning.png') . sprintf(_("User %s would like to his profile remains visible only to his friends."), $user) ?></li>
 <?php
 if ($registry->hasMethod('letter/compose')) {
-    echo '<li><img src="' . Horde_Themes::img('letter.png') . ">'
+    echo '<li>' . Horde::img('letter.png')
                     . sprintf(_("You can still send a private message to user %s."), $user)
                     . ' <a href="' . $registry->callByPackage('letter', 'compose', array(array('user_to' => $user)))  . '">' . _("Click here") . '</a>'
                      . '</li>';
diff --git a/folks/templates/user/inactive.php b/folks/templates/user/inactive.php
index 1a089ed64..588f83f6c 100644
--- a/folks/templates/user/inactive.php
+++ b/folks/templates/user/inactive.php
@@ -1,5 +1,7 @@
 <h1><?php echo $title ?></h1>
 
 <ul class="notices">
-<li><img src="<?php echo Horde_Themes::img('alerts/warning.png') ?>"><?php echo sprintf(_("User %s is inactive."), $user) ?></li>
+ <li>
+  <?php echo Horde::img('alerts/warning.png') . sprintf(_("User %s is inactive."), $user) ?>
+ </li>
 </ul>
diff --git a/folks/templates/user/private.php b/folks/templates/user/private.php
index 9a711149f..13ba7be30 100644
--- a/folks/templates/user/private.php
+++ b/folks/templates/user/private.php
@@ -1,10 +1,12 @@
 <h1><?php echo $title ?></h1>
 
 <ul class="notices">
-<li><img src="<?php echo Horde_Themes::img('alerts/warning.png') ?>"><?php echo sprintf(_("User %s would like to remain private."), $user) ?></li>
+ <li>
+  <?php echo Horde::img('alerts/warning.png') . sprintf(_("User %s would like to remain private."), $user) ?>
+ </li>
 <?php
 if ($registry->hasMethod('letter/compose')) {
-    echo '<li><img src="' . Horde_Themes::img('letter.png') . '">'
+    echo '<li>' . Horde::img('letter.png')
                     . sprintf(_("You can still send a private message to user %s."), $user)
                     . ' <a href="' . $registry->callByPackage('letter', 'compose', array(array('user_to' => $user)))  . '">' . _("Click here") . '</a>'
                      . '</li>';
diff --git a/folks/templates/user/user.php b/folks/templates/user/user.php
index 0b0b174b8..1f54f5ef9 100644
--- a/folks/templates/user/user.php
+++ b/folks/templates/user/user.php
@@ -16,18 +16,15 @@ if ($user == $GLOBALS['registry']->getAuth()) {
 <?php
 
 if ($profile['user_video']) {
-
     echo $registry->call('video/getEmbedCode', array($profile['user_video']));
-
 } elseif ($profile['user_picture']) {
-
     echo '<img src="' . Folks::getImageUrl($user, 'big') . '" alt="' . $user . '" />';
 
 } else {
-
-    echo '<img src="' . Horde_Themes::img('guest.png') . '" alt="'
-                . $user . '" title="' . _("Has no picture"). '" style="border: 2px solid #eeeeee; padding: 100px"/>';
-
+    echo Horde::img('guest.png', $user, array(
+        'title' => _("Has no picture"),
+        'style' => 'border: 2px solid #eeeeee; padding: 100px'
+    ));
 }
 
 echo '<br />';
@@ -119,8 +116,8 @@ if (!empty($friends)):
 <tr>
 <td class="header" colspan="2">
 <span style="float: right">
-<a href="<?php echo Horde::url('edit/friends/index.php') ?>" title="<?php echo _("Edit my firends") ?>"><img src="<?php Horde_Themes::img('plus.png') ?>" /></a>
-<a href="<?php echo Horde_Util::addParameter(Horde::url('edit/friends/index.php'), 'user', $user) ?>" title="<?php echo sprintf(_("Add %s as a friend?"), $user) ?>"><img src="<?php echo Horde_Themes::img('nav/right.png') ?>" /></a>
+<a href="<?php echo Horde::url('edit/friends/index.php') ?>" title="<?php echo _("Edit my firends") ?>"><?php Horde::img('plus.png') ?></a>
+<a href="<?php echo Horde_Util::addParameter(Horde::url('edit/friends/index.php'), 'user', $user) ?>" title="<?php echo sprintf(_("Add %s as a friend?"), $user) ?>"><?php echo Horde::img('nav/right.png') ?></a>
 </span>
 <?php echo _("Friends") ?> (<?php echo count($friends) ?>)
 </td>
@@ -145,8 +142,8 @@ $path = $registry->get('webroot', 'classifieds');
 <tr>
 <td class="header" colspan="2">
 <span style="float: right">
-<a href="<?php echo $path ?>/ads/index.php" title="<?php echo _("Add your content") ?>"><img src="<?php echo Horde_Themes::img('plus.png') ?>" /></a>
-<a href="<?php echo $path ?>" title="<?php echo _("Preview") ?>"><img src="<?php echo Horde_Themes::img('nav/right.png') ?>" /></a>
+<a href="<?php echo $path ?>/ads/index.php" title="<?php echo _("Add your content") ?>"><?php echo Horde::img('plus.png') ?></a>
+<a href="<?php echo $path ?>" title="<?php echo _("Preview") ?>"><?php echo Horde::img('nav/right.png') ?></a>
 </span>
 <a href="<?php echo $path ?>/list.php?user_uid=<?php echo $user ?>" title="<?php echo _("Others user content") ?>" ><?php echo $registry->get('name', 'classified') ?> (<?php echo $profile['count_classifieds'] ?>)</a>
 </td>
@@ -170,8 +167,8 @@ $path = $registry->get('webroot', 'news');
 <tr>
 <td class="header" colspan="2">
 <span style="float: right">
-<a href="<?php echo $path ?>/add.php" title="<?php echo _("Add your content") ?>"><img src="<?php echo Horde_Themes::img('plus.png') ?>" /></a>
-<a href="<?php echo $path ?>" title="<?php echo _("Preview") ?>"><img src="<?php echo Horde_Themes::img('nav/right.png') ?>" /></a>
+<a href="<?php echo $path ?>/add.php" title="<?php echo _("Add your content") ?>"><?php echo Horde::img('plus.png') ?></a>
+<a href="<?php echo $path ?>" title="<?php echo _("Preview") ?>"><?php echo Horde::img('nav/right.png') ?></a>
 </span>
 <a href="<?php echo $path ?>/search.php?user=<?php echo $user ?>" title="<?php echo _("Others user content") ?>" ><?php echo $registry->get('name', 'news') ?> (<?php echo $profile['count_news'] ?>)</a>
 </td>
@@ -195,8 +192,8 @@ $path = $registry->get('webroot', 'oscar');
 <tr>
 <td class="header" colspan="2">
 <span style="float: right">
-<a href="<?php echo $path ?>/videos/index.php" title="<?php echo _("Add your content") ?>"><img src="<?php echo Horde_Themes::img('plus.png') ?>" /></a>
-<a href="<?php echo $path ?>" title="<?php echo _("Preview") ?>"><img src="<?php echo Horde_Themes::img('nav/right.png') ?>" /></a>
+<a href="<?php echo $path ?>/videos/index.php" title="<?php echo _("Add your content") ?>"><?php echo Horde::img('plus.png') ?></a>
+<a href="<?php echo $path ?>" title="<?php echo _("Preview") ?>"><?php echo Horde::img('nav/right.png') ?></a>
 </span>
 <a href="<?php echo $path ?>/search.php?author=<?php echo $user ?>" title="<?php echo _("Others user content") ?>" ><?php echo $registry->get('name', 'oscar') ?> (<?php echo $profile['count_videos'] ?>)</a>
 </a>
@@ -222,8 +219,8 @@ $path = $registry->get('webroot', 'genie');
 <tr>
 <td class="header" colspan="2">
 <span style="float: right">
-<a href="<?php echo $path ?>/wishlist.php?wishlist=<?php echo $GLOBALS['registry']->getAuth() ?>" title="<?php echo _("Add your content") ?>"><img src="<?php echo Horde_Themes::img('plus.png') ?>" /></a>
-<a href="<?php echo $path ?>" title="<?php echo _("Preview") ?>"><img src="<?php echo Horde_Themes::img('nav/right.png') ?>" /></a>
+<a href="<?php echo $path ?>/wishlist.php?wishlist=<?php echo $GLOBALS['registry']->getAuth() ?>" title="<?php echo _("Add your content") ?>"><?php echo Horde::img('plus.png') ?></a>
+<a href="<?php echo $path ?>" title="<?php echo _("Preview") ?>"><?php echo Horde::img('nav/right.png') ?></a>
 </span>
 <a href="<?php echo $path ?>/wishlist.php?wishlist=<?php echo $user ?>" title="<?php echo _("Others user content") ?>" ><?php echo $registry->get('name', 'genie') ?> (<?php echo $profile['count_wishes'] ?>)</a>
 </td>
@@ -248,8 +245,8 @@ $path = $registry->get('webroot', 'ansel');
 <tr>
 <td class="header" colspan="2">
 <span style="float: right">
-<a href="<?php echo $path ?>/view.php?groupby=owner&view=List&owner=<?php echo $GLOBALS['registry']->getAuth() ?>" title="<?php echo _("Add your content") ?>"><img src="<?php echo Horde_Themes::img('plus.png') ?>" /></a>
-<a href="<?php echo $path ?>" title="<?php echo _("Preview") ?>"><img src="<?php echo Horde_Themes::img('nav/right.png') ?>" /></a>
+<a href="<?php echo $path ?>/view.php?groupby=owner&view=List&owner=<?php echo $GLOBALS['registry']->getAuth() ?>" title="<?php echo _("Add your content") ?>"><?php echo Horde::img('plus.png') ?></a>
+<a href="<?php echo $path ?>" title="<?php echo _("Preview") ?>"><?php echo Horde::img('nav/right.png') ?></a>
 </span>
 <a href="<?php echo $path ?>/view.php?groupby=owner&view=List&owner=<?php echo $user ?>" title="<?php echo _("Others user content") ?>" ><?php echo $registry->get('name', 'ansel') ?> (<?php echo $profile['count_galleries'] ?>)</a> |
 <a href="<?php echo $path ?>/faces/search/owner.php?owner=<?php echo $user ?>" title="<?php echo _("Faces in user galleries") ?>"><?php echo _("Faces") ?></a>
@@ -276,8 +273,8 @@ $path = $registry->get('webroot', 'thomas');
 <tr>
 <td class="header" colspan="2">
 <span style="float: right">
-<a href="<?php echo $path ?>/edit.php" title="<?php echo _("Add your content") ?>"><img src="<?php echo Horde_Themes::img('plus.png') ?>" /></a>
-<a href="<?php echo $path ?>" title="<?php echo _("Preview") ?>"><img src="<?php echo Horde_Themes::img('nav/right.png') ?>" /></a>
+<a href="<?php echo $path ?>/edit.php" title="<?php echo _("Add your content") ?>"><?php echo Horde::img('plus.png') ?></a>
+<a href="<?php echo $path ?>" title="<?php echo _("Preview") ?>"><?php echo Horde::img('nav/right.png') ?></a>
 </span>
 <a href="<?php echo $path ?>/user.php?user=<?php echo $user ?>" title="<?php echo _("Others user content") ?>" ><?php echo $registry->get('name', 'thomas') ?> (<?php echo $profile['count_blogs'] ?>)</a>
 </td>
@@ -302,8 +299,8 @@ $path = $registry->get('webroot', 'schedul');
 <tr>
 <td class="header" colspan="2">
 <span style="float: right">
-<a href="<?php echo $path ?>/add.php" title="<?php echo _("Add your content") ?>"><img src="<?php echo Horde_Themes::img('plus.png') ?>" /></a>
-<a href="<?php echo $path ?>" title="<?php echo _("Preview") ?>"><img src="<?php echo Horde_Themes::img('nav/right.png') ?>" /></a>
+<a href="<?php echo $path ?>/add.php" title="<?php echo _("Add your content") ?>"><?php echo Horde::img('plus.png') ?></a>
+<a href="<?php echo $path ?>" title="<?php echo _("Preview") ?>"><?php echo Horde::img('nav/right.png') ?></a>
 </span>
 <a href="<?php echo $path ?>/user.php?user=<?php echo $user ?>" title="<?php echo _("Others user content") ?>" ><?php echo $registry->get('name', 'schedul') ?> (<?php echo $profile['count_attendances'] ?>)</a>
 </td>
@@ -335,8 +332,8 @@ $path = $registry->get('webroot', 'schedul');
 <tr>
 <td class="header" colspan="2">
 <span style="float: right">
-<a href="/uporabniki/edit/activity.php" title="<?php echo _("Add your content") ?>"><img src="<?php echo Horde_Themes::img('plus.png') ?>" /></a>
-<a href="/uporabniki/friends/index.php" title="<?php echo _("Preview") ?>"><img src="<?php echo Horde_Themes::img('nav/right.png') ?>" /></a>
+<a href="/uporabniki/edit/activity.php" title="<?php echo _("Add your content") ?>"><?php echo Horde::img('plus.png') ?></a>
+<a href="/uporabniki/friends/index.php" title="<?php echo _("Preview") ?>"><?php echo Horde::img('nav/right.png') ?></a>
 </span>
 <?php echo _("Activity") ?>
 </td>
diff --git a/framework/Alarm/lib/Horde/Alarm/Handler/Desktop.php b/framework/Alarm/lib/Horde/Alarm/Handler/Desktop.php
index e5a867d2b..bd444367e 100644
--- a/framework/Alarm/lib/Horde/Alarm/Handler/Desktop.php
+++ b/framework/Alarm/lib/Horde/Alarm/Handler/Desktop.php
@@ -58,7 +58,9 @@ class Horde_Alarm_Handler_Desktop extends Horde_Alarm_Handler
         $this->_jsNotify = isset($params['js_notify'])
             ? $params['js_notify']
             : array('Horde', 'addInlineScript');
-        $this->_icon = isset($params['icon']) ? $params['icon'] : (string)Horde_Themes::img('alerts/alarm.png');
+        $this->_icon = isset($params['icon'])
+            ? $params['icon']
+            : (string)Horde_Themes::img('alerts/alarm.png');
     }
 
     /**
diff --git a/framework/Core/lib/Horde/Core/Ajax/Imple/AutoCompleter.php b/framework/Core/lib/Horde/Core/Ajax/Imple/AutoCompleter.php
index 931fff5bb..7ad56c4ff 100644
--- a/framework/Core/lib/Horde/Core/Ajax/Imple/AutoCompleter.php
+++ b/framework/Core/lib/Horde/Core/Ajax/Imple/AutoCompleter.php
@@ -69,7 +69,7 @@ abstract class Horde_Core_Ajax_Imple_AutoCompleter extends Horde_Core_Ajax_Imple
                 'trigger' => $this->_params['triggerId'],
                 'triggerContainer' => $this->_params['triggerContainer'],
                 'uri' => (string)$this->_getUrl($config['pretty'], $GLOBALS['registry']->getApp()),
-                'deleteIcon' => (string)Horde_Themes::img('delete-small.png', 'horde'),
+                'deleteIcon' => (string)Horde_Themes::img('delete-small.png'),
                 'box' => !empty($this->_params['box']) ? $this->_params['box'] : ''
             ), $config['params']);
 
diff --git a/framework/Core/lib/Horde/Core/Text/Filter/Emoticons.php b/framework/Core/lib/Horde/Core/Text/Filter/Emoticons.php
index c3694c98c..55d4d6861 100644
--- a/framework/Core/lib/Horde/Core/Text/Filter/Emoticons.php
+++ b/framework/Core/lib/Horde/Core/Text/Filter/Emoticons.php
@@ -24,7 +24,7 @@ class Horde_Core_Text_Filter_Emoticons extends Horde_Text_Filter_Emoticons
      */
     public function getIcon($icon)
     {
-        return Horde::img(Horde_Themes::img('emoticons/' . $this->getIcons($icon) . '.png'), $icon, array('align' => 'middle', 'title' => $icon));
+        return Horde::img('emoticons/' . $this->getIcons($icon) . '.png', $icon, array('align' => 'middle', 'title' => $icon));
     }
 
 }
diff --git a/hermes/lib/Hermes.php b/hermes/lib/Hermes.php
index 6ce80d03c..12bd3aa99 100644
--- a/hermes/lib/Hermes.php
+++ b/hermes/lib/Hermes.php
@@ -60,7 +60,7 @@ class Hermes {
         $menu = new Horde_Menu();
         $menu->add(Horde::url('time.php'), _("My _Time"), 'hermes.png', null, null, null, basename($_SERVER['PHP_SELF']) == 'index.php' ? 'current' : null);
         $menu->add(Horde::url('entry.php'), _("_New Time"), 'hermes.png', null, null, null, Horde_Util::getFormData('id') ? '__noselection' : null);
-        $menu->add(Horde::url('search.php'), _("_Search"), Horde_Themes::img('search.png'));
+        $menu->add(Horde::url('search.php'), _("_Search"), 'search.png');
 
         if ($conf['time']['deliverables'] && $registry->isAdmin('hermes:deliverables')) {
             $menu->add(Horde::url('deliverables.php'), _("_Deliverables"), 'hermes.png');
@@ -72,7 +72,7 @@ class Hermes {
 
         /* Print. */
         if ($conf['menu']['print'] && isset($print_link)) {
-            $menu->add($print_link, _("_Print"), Horde_Themes::img('print.png'), '_blank', 'popup(this.href); return false;', '__noselection');
+            $menu->add($print_link, _("_Print"), 'print.png', '', '_blank', 'popup(this.href); return false;', '__noselection');
         }
 
         /* Administration. */
diff --git a/horde/admin/groups.php b/horde/admin/groups.php
index 309a8a589..ce3c72a17 100644
--- a/horde/admin/groups.php
+++ b/horde/admin/groups.php
@@ -231,13 +231,16 @@ if ($cid > 0) {
     $cid_parents = $groups->getGroupParentList($cid);
 }
 
+$base_node_params = array(
+    'icon' => strval(Horde_Themes::img('administration.png'))
+);
+
 foreach ($nodes as $id => $node) {
     $node_params = ($cid == $id) ? array('class' => 'selected') : array();
 
     if ($id == Horde_Group::ROOT) {
         $add_link = Horde::link($add->copy()->add('cid', $id), _("Add a new group")) . $add_img . '</a>';
 
-        $base_node_params = array('icon' => strval(Horde_Themes::img('administration.png')));
         $tree->addNode(
             $id,
             null,
diff --git a/hylax/lib/Hylax.php b/hylax/lib/Hylax.php
index 7d0b070c1..0c2f7a236 100644
--- a/hylax/lib/Hylax.php
+++ b/hylax/lib/Hylax.php
@@ -131,18 +131,15 @@ class Hylax {
 
         $menu->addArray(array('url' => Horde::url('summary.php'),
                               'text' => _("Summary"),
-                              'icon' => 'fax.png',
-                              'icon_path' => Horde_Themes::img()));
+                              'icon' => 'fax.png'));
 
         $menu->addArray(array('url' => Horde::url('folder.php'),
                               'text' => _("Folders"),
-                              'icon' => 'folder.png',
-                              'icon_path' => Horde_Themes::img()));
+                              'icon' => 'folder.png'));
 
         $menu->addArray(array('url' => Horde::url('compose.php'),
                               'text' => _("Compose"),
-                              'icon' => 'compose.png',
-                              'icon_path' => Horde_Themes::img()));
+                              'icon' => 'compose.png'));
 
         if ($returnType == 'object') {
             return $menu;
diff --git a/imp/lib/IMP.php b/imp/lib/IMP.php
index 257e46e3f..eb7b32199 100644
--- a/imp/lib/IMP.php
+++ b/imp/lib/IMP.php
@@ -941,7 +941,7 @@ class IMP
         }
 
         if ($sound = $GLOBALS['prefs']->getValue('nav_audio')) {
-            $GLOBALS['notification']->push(Horde_Themes::img('audio/' . $sound), 'audio');
+            $GLOBALS['notification']->push(Horde_Themes::sounde($sound), 'audio');
         }
     }
 
diff --git a/ingo/lib/Application.php b/ingo/lib/Application.php
index 1e7f00164..109f241b6 100644
--- a/ingo/lib/Application.php
+++ b/ingo/lib/Application.php
@@ -148,7 +148,7 @@ class Ingo_Application extends Horde_Registry_Application
         }
 
         if (!empty($GLOBALS['ingo_shares']) && empty($GLOBALS['conf']['share']['no_sharing'])) {
-            $menu->add('#', _("_Permissions"), 'perms.png', Horde_Themes::img(null, 'horde'), '', Horde::popupJs(Horde::url($GLOBALS['registry']->get('webroot', 'horde') . '/services/shares/edit.php', true), array('params' => array('app' => 'ingo', 'share' => $GLOBALS['session']->get('ingo', 'backend/id') . ':' . $GLOBALS['registry']->getAuth()), 'urlencode' => true)) . 'return false;');
+            $menu->add('#', _("_Permissions"), 'perms.png', null, '', Horde::popupJs(Horde::url($GLOBALS['registry']->get('webroot', 'horde') . '/services/shares/edit.php', true), array('params' => array('app' => 'ingo', 'share' => $GLOBALS['session']->get('ingo', 'backend/id') . ':' . $GLOBALS['registry']->getAuth()), 'urlencode' => true)) . 'return false;');
         }
     }
 
diff --git a/jonah/lib/Application.php b/jonah/lib/Application.php
index bbbf30960..4df785b2f 100644
--- a/jonah/lib/Application.php
+++ b/jonah/lib/Application.php
@@ -138,6 +138,8 @@ class Jonah_Application extends Horde_Registry_Application
         }
 
         $channels = Jonah::checkPermissions('channels', Horde_Perms::SHOW, $channels);
+        $story_img = Horde_Themes::img('editstory.png');
+
         foreach ($channels as $channel) {
             $tree->addNode(
                 $parent . $channel['channel_id'],
@@ -146,7 +148,7 @@ class Jonah_Application extends Horde_Registry_Application
                 1,
                 false,
                 array(
-                    'icon' => Horde_Themes::img('editstory.png'),
+                    'icon' => $story_img,
                     'url' => $url->add('channel_id', $channel['channel_id'])
                 )
             );
diff --git a/koward/lib/Koward/Controller/Application.php b/koward/lib/Koward/Controller/Application.php
index 86a0dd6ea..fdc66ff3c 100644
--- a/koward/lib/Koward/Controller/Application.php
+++ b/koward/lib/Koward/Controller/Application.php
@@ -58,29 +58,29 @@ class Koward_Controller_Application extends Horde_Controller_Base
 
         if ($this->koward->hasAccess('object/listall')) {
             $menu->add($this->urlFor(array('controller' => 'object', 'action' => 'listall')),
-                       _("_Objects"), 'user.png', Horde_Themes::img(null, 'horde'));
+                       _("_Objects"), 'user.png');
         }
 
         if ($this->koward->hasAccess('object/add', Koward::PERM_EDIT)) {
             $menu->add($this->urlFor(array('controller' => 'object', 'action' => 'add')),
-                       _("_Add"), 'plus.png', Horde_Themes::img(null, 'horde'));
+                       _("_Add"), 'plus.png');
         }
 
         if ($this->koward->hasAccess('object/search')) {
             $menu->add($this->urlFor(array('controller' => 'object', 'action' => 'search')),
-                       _("_Search"), 'search.png', Horde_Themes::img(null, 'horde'));
+                       _("_Search"), 'search.png');
         }
 
         if (!empty($this->koward->conf['koward']['menu']['queries'])) {
-            $menu->add(Horde::url('Queries'), _("_Queries"), 'query.png', Horde_Themes::img());
+            $menu->add(Horde::url('Queries'), _("_Queries"), 'query.png');
         }
         if (!empty($this->koward->conf['koward']['menu']['test'])) {
             $menu->add($this->urlFor(array('controller' => 'check', 'action' => 'show')),
-                   _("_Test"), 'problem.png', Horde_Themes::img(null, 'horde'));
+                   _("_Test"), 'problem.png');
         }
         if ($GLOBALS['registry']->getAuth()) {
             $menu->add($this->urlFor(array('controller' => 'index', 'action' => 'logout')),
-                       _("_Logout"), 'logout.png', Horde_Themes::img(null, 'horde'));
+                       _("_Logout"), 'logout.png');
         }
         return $menu;
     }
diff --git a/kronolith/lib/Application.php b/kronolith/lib/Application.php
index 0b79e9498..f06ddcee9 100644
--- a/kronolith/lib/Application.php
+++ b/kronolith/lib/Application.php
@@ -133,11 +133,11 @@ class Kronolith_Application extends Horde_Registry_Application
             ));
             $menu->add(new Horde_Url(''), _("_Goto"), 'goto.png', null, '', null, 'kgotomenu');
         }
-        $menu->add(Horde::url('search.php'), _("_Search"), 'search.png', Horde_Themes::img(null, 'horde'));
+        $menu->add(Horde::url('search.php'), _("_Search"), 'search.png');
 
         /* Import/Export. */
         if ($conf['menu']['import_export']) {
-            $menu->add(Horde::url('data.php'), _("_Import/Export"), 'data.png', Horde_Themes::img(null, 'horde'));
+            $menu->add(Horde::url('data.php'), _("_Import/Export"), 'data.png');
         }
     }
 
@@ -518,6 +518,7 @@ class Kronolith_Application extends Horde_Registry_Application
             }
 
             $alarmCount = 0;
+            $alarmImg = Horde_Themes::img('alarm.png');
             $horde_alarm = $GLOBALS['injector']->getInstance('Horde_Alarm');
 
             foreach ($alarms as $calId => $calAlarms) {
@@ -533,7 +534,7 @@ class Kronolith_Application extends Horde_Registry_Application
                         1,
                         false,
                         array(
-                            'icon' => Horde_Themes::img('alarm.png'),
+                            'icon' => $alarmImg,
                             'url' => $event->getViewUrl()
                         )
                     );
diff --git a/kronolith/lib/Event.php b/kronolith/lib/Event.php
index 2d05d4a8a..30a356665 100644
--- a/kronolith/lib/Event.php
+++ b/kronolith/lib/Event.php
@@ -1573,7 +1573,7 @@ abstract class Kronolith_Event
             }
         }
         if (isset($methods['mail'])) {
-            $background = new Horde_Themes_Image('big_alarm.png');
+            $background = Horde_Themes::img('big_alarm.png');
             $image = new Horde_Mime_Part();
             $image->setType('image/png');
             $image->setContents(file_get_contents($background->fs));
diff --git a/kronolith/lib/Kronolith.php b/kronolith/lib/Kronolith.php
index 9c524cb67..eca5254e6 100644
--- a/kronolith/lib/Kronolith.php
+++ b/kronolith/lib/Kronolith.php
@@ -1230,8 +1230,8 @@ class Kronolith
                 $language = 'en-US';
             }
             $params['conf'] = array(
-                'markerImage' => (string)Horde_Themes::img('map/marker.png', 'horde'),
-                'markerBackground' => (string)Horde_Themes::img('map/marker-shadow.png', 'horde'),
+                'markerImage' => (string)Horde_Themes::img('map/marker.png'),
+                'markerBackground' => (string)Horde_Themes::img('map/marker-shadow.png'),
                 'useMarkerLayer' => true,
                 'language' => $language,
             );
@@ -2266,7 +2266,7 @@ class Kronolith
 
         // Generate image mime part first and only once, because we
         // need the Content-ID.
-        $background = new Horde_Themes_Image('big_invitation.png');
+        $background = Horde_Themes::img('big_invitation.png');
         $image = new Horde_Mime_Part();
         $image->setType('image/png');
         $image->setContents(file_get_contents($background->fs));
diff --git a/mnemo/lib/Application.php b/mnemo/lib/Application.php
index a620c0c56..3f7e6bcfd 100644
--- a/mnemo/lib/Application.php
+++ b/mnemo/lib/Application.php
@@ -85,16 +85,16 @@ class Mnemo_Application extends Horde_Registry_Application
         }
 
         /* Search. */
-        $menu->add(Horde::url('search.php'), _("_Search"), 'search.png', Horde_Themes::img(null, 'horde'));
+        $menu->add(Horde::url('search.php'), _("_Search"), 'search.png');
 
         /* Import/Export */
         if ($conf['menu']['import_export']) {
-            $menu->add(Horde::url('data.php'), _("_Import/Export"), 'data.png', Horde_Themes::img(null, 'horde'));
+            $menu->add(Horde::url('data.php'), _("_Import/Export"), 'data.png');
         }
 
         /* Print */
         if ($conf['menu']['print'] && isset($print_link)) {
-            $menu->add(Horde::url($print_link), _("_Print"), 'print.png', Horde_Themes::img(null, 'horde'), '_blank', 'popup(this.href); return false;');
+            $menu->add(Horde::url($print_link), _("_Print"), 'print.png', null, '_blank', 'popup(this.href); return false;');
         }
     }
 
diff --git a/mnemo/lib/Block/summary.php b/mnemo/lib/Block/summary.php
index 30a5f3b51..f64a59725 100644
--- a/mnemo/lib/Block/summary.php
+++ b/mnemo/lib/Block/summary.php
@@ -15,8 +15,8 @@ class Horde_Block_Mnemo_summary extends Horde_Block
     protected function _title()
     {
         global $registry;
-	
-	$label = !empty($this->_params['block_title'])
+
+	    $label = !empty($this->_params['block_title'])
             ? $this->_params['block_title']
             : $registry->get('name');
 
@@ -71,7 +71,7 @@ class Horde_Block_Mnemo_summary extends Horde_Block
             $html .= '<tr>';
 
             if (!empty($this->_params['show_actions'])) {
-                $editImg = Horde_Themes::img('edit.png', 'horde');
+                $editImg = Horde_Themes::img('edit.png');
                 $editurl = Horde_Util::addParameter(
                     'memo.php',
                     array('memo' => $memo['memo_id'],
@@ -109,7 +109,7 @@ class Horde_Block_Mnemo_summary extends Horde_Block
         if (!$memos) {
             return '<p><em>' . _("No notes to display") . '</em></p>';
         }
-        
+
         return '<link href="'
             . htmlspecialchars(Horde::url('themes/categoryCSS.php',
                                                      true))
diff --git a/nag/lib/Application.php b/nag/lib/Application.php
index 457ef3419..3996e3b49 100644
--- a/nag/lib/Application.php
+++ b/nag/lib/Application.php
@@ -100,11 +100,11 @@ class Nag_Application extends Horde_Registry_Application
         }
 
         /* Search. */
-        $menu->add(Horde::url('search.php'), _("_Search"), 'search.png', Horde_Themes::img(null, 'horde'));
+        $menu->add(Horde::url('search.php'), _("_Search"), 'search.png');
 
         /* Import/Export. */
         if ($conf['menu']['import_export']) {
-            $menu->add(Horde::url('data.php'), _("_Import/Export"), 'data.png', Horde_Themes::img(null, 'horde'));
+            $menu->add(Horde::url('data.php'), _("_Import/Export"), 'data.png');
         }
     }
 
diff --git a/nag/lib/Task.php b/nag/lib/Task.php
index 8f30de6b1..783b94739 100644
--- a/nag/lib/Task.php
+++ b/nag/lib/Task.php
@@ -539,23 +539,22 @@ class Nag_Task {
      */
     function treeIcons()
     {
-        $treedir = Horde_Themes::img(null, 'horde');
         $html = '';
 
         $parent = $this->parent;
         for ($i = 1; $i < $this->indent; ++$i) {
             if ($parent && $parent->lastChild) {
-                $html = Horde::img('tree/blank.png', '', '', $treedir) . $html;
+                $html = Horde::img('tree/blank.png') . $html;
             } else {
-                $html = Horde::img('tree/line.png', '|', '', $treedir) . $html;
+                $html = Horde::img('tree/line.png', '|') . $html;
             }
             $parent = $parent->parent;
         }
         if ($this->indent) {
             if ($this->lastChild) {
-                $html .= Horde::img(empty($GLOBALS['registry']->nlsconfig['rtl'][$GLOBALS['language']]) ? 'tree/joinbottom.png' : 'tree/rev-joinbottom.png', '\\', '', $treedir);
+                $html .= Horde::img(empty($GLOBALS['registry']->nlsconfig['rtl'][$GLOBALS['language']]) ? 'tree/joinbottom.png' : 'tree/rev-joinbottom.png', '\\');
             } else {
-                $html .= Horde::img(empty($GLOBALS['registry']->nlsconfig['rtl'][$GLOBALS['language']]) ? 'tree/join.png' : 'tree/rev-join.png', '+', '', $treedir);
+                $html .= Horde::img(empty($GLOBALS['registry']->nlsconfig['rtl'][$GLOBALS['language']]) ? 'tree/join.png' : 'tree/rev-join.png', '+');
             }
         }
 
diff --git a/operator/lib/Operator.php b/operator/lib/Operator.php
index 2900aa640..98719a645 100644
--- a/operator/lib/Operator.php
+++ b/operator/lib/Operator.php
@@ -21,11 +21,11 @@ class Operator {
 
         $menu = new Horde_Menu(Horde_Menu::MASK_ALL);
         $menu->add(Horde::url('viewgraph.php'), _("_View Graphs"), 'graphs.png', null, null, null, basename($_SERVER['PHP_SELF']) == 'index.php' ? 'current' : null);
-        $menu->add(Horde::url('search.php'), _("_Search"), 'search.png', Horde_Themes::img(null, 'horde'));
+        $menu->add(Horde::url('search.php'), _("_Search"), 'search.png');
 
         /* Export */
         if ($GLOBALS['conf']['menu']['export']) {
-            $menu->add(Horde::url('export.php'), _("_Export"), 'data.png', Horde_Themes::img(null, 'horde'));
+            $menu->add(Horde::url('export.php'), _("_Export"), 'data.png');
         }
 
         if ($returnType == 'object') {
diff --git a/pastie/lib/Pastie.php b/pastie/lib/Pastie.php
index 5e6d09af0..c15fd0b08 100644
--- a/pastie/lib/Pastie.php
+++ b/pastie/lib/Pastie.php
@@ -18,7 +18,7 @@ class Pastie
     static public function getMenu()
     {
         $menu = new Horde_Menu(Horde_Menu::MASK_ALL);
-        $menu->add(Horde::url('paste.php'), _("Paste"), 'pastie.png', Horde_Themes::img(null, 'horde'));
+        $menu->add(Horde::url('paste.php'), _("Paste"), 'pastie.png');
 
         return $menu;
     }
diff --git a/shout/templates/dialplan/edit.inc b/shout/templates/dialplan/edit.inc
index fbee5d1f6..103d4acc3 100644
--- a/shout/templates/dialplan/edit.inc
+++ b/shout/templates/dialplan/edit.inc
@@ -41,7 +41,7 @@
         $addurl = Horde::url('dialplan.php');
         $addurl = Horde_Util::addParameter($addurl, 'action', 'add');
         ?>
-        
+
         <li>
             <a class="button" style="display: block;" href="<?php echo $addurl; ?>">
             <?php echo Horde::img('menu-add.png'); ?>&nbsp;New Menu
diff --git a/shout/templates/extensions.inc.php b/shout/templates/extensions.inc.php
index cd6c82c52..2fdbf6a6f 100644
--- a/shout/templates/extensions.inc.php
+++ b/shout/templates/extensions.inc.php
@@ -546,7 +546,7 @@ function saveExtension(event)
             });
         }
     });
-   
+
 }
 
 function addExtension(params)
@@ -592,4 +592,4 @@ new Ajax.Request(ajax_url + 'getDestinations',
 });
 
 // -->
-</script>
\ No newline at end of file
+</script>
diff --git a/turba/lib/Application.php b/turba/lib/Application.php
index 443f02338..54a0aeedd 100644
--- a/turba/lib/Application.php
+++ b/turba/lib/Application.php
@@ -188,11 +188,11 @@ class Turba_Application extends Horde_Registry_Application
             $menu->add(Horde::url('add.php'), _("_New Contact"), 'menu/new.png');
         }
 
-        $menu->add(Horde::url('search.php'), _("_Search"), 'search.png', Horde_Themes::img(null, 'horde'), null, null, (($GLOBALS['prefs']->getValue('initial_page') == 'search.php' && basename($_SERVER['PHP_SELF']) == 'index.php' && strpos($_SERVER['PHP_SELF'], 'addressbooks/index.php') === false) || (basename($_SERVER['PHP_SELF']) == 'browse.php' && Horde_Util::getFormData('key') == '**search')) ? 'current' : null);
+        $menu->add(Horde::url('search.php'), _("_Search"), 'search.png', null, null, null, (($GLOBALS['prefs']->getValue('initial_page') == 'search.php' && basename($_SERVER['PHP_SELF']) == 'index.php' && strpos($_SERVER['PHP_SELF'], 'addressbooks/index.php') === false) || (basename($_SERVER['PHP_SELF']) == 'browse.php' && Horde_Util::getFormData('key') == '**search')) ? 'current' : null);
 
         /* Import/Export */
         if ($GLOBALS['conf']['menu']['import_export']) {
-            $menu->add(Horde::url('data.php'), _("_Import/Export"), 'data.png', Horde_Themes::img(null, 'horde'));
+            $menu->add(Horde::url('data.php'), _("_Import/Export"), 'data.png');
         }
     }
 
diff --git a/vilma/lib/Vilma.php b/vilma/lib/Vilma.php
index 2a299693f..df3d43572 100644
--- a/vilma/lib/Vilma.php
+++ b/vilma/lib/Vilma.php
@@ -177,7 +177,7 @@ class Vilma {
             $url = Horde::url('users/index.php');
             $tmp = Horde_Util::addParameter($url, 'domain_id', $domain['domain_id']);
             $menu->add(Horde::url($tmp), _($domain['domain_name']), 'domain.png');
-            $menu->add(Horde::url('users/edit.php'), _("New _Address"), 'user.png', Horde_Themes::img(null, 'horde'));
+            $menu->add(Horde::url('users/edit.php'), _("New _Address"), 'user.png');
         } else {
             $menu->add(Horde::url('domains/edit.php'), _("_New Domain"), 'domain.png');
         }
diff --git a/whups/lib/Renderer/Query.php b/whups/lib/Renderer/Query.php
index f7e50f671..d650c9d46 100644
--- a/whups/lib/Renderer/Query.php
+++ b/whups/lib/Renderer/Query.php
@@ -210,7 +210,6 @@ class Horde_Form_Renderer_Query extends Horde_Form_Renderer {
         // little nicer.
         $fimgattrs = 'height="20" width="0" style="vertical-align: middle;"';
         $imgattrs = 'height="20" width="20" style="vertical-align: middle;"';
-        $imgdir = Horde_Themes::img(null, 'horde');
 
         $space = '';
         $count = count($more);
@@ -218,22 +217,22 @@ class Horde_Form_Renderer_Query extends Horde_Form_Renderer {
         if ($count == 0) {
             // Always have at least one image to make sure all rows are the
             // same height.
-            $space = Horde::img('tree/blank.png', '', $fimgattrs, $imgdir) . "\n";
+            $space = Horde::img('tree/blank.png', '', $fimgattrs) . "\n";
         } else {
             for ($i = 0; $i < $count - 1; $i++) {
                 if ($more[$i] == 1) {
-                    $space .= Horde::img('tree/line.png', '|', $imgattrs, $imgdir) . "\n";
+                    $space .= Horde::img('tree/line.png', '|', $imgattrs) . "\n";
                 } else {
-                    $space .= Horde::img('tree/blank.png', '', $imgattrs, $imgdir) . "\n";
+                    $space .= Horde::img('tree/blank.png', '', $imgattrs) . "\n";
                 }
             }
         }
 
         if ($count > 0) {
             if ($more[$count - 1] == 1) {
-                $space .= Horde::img('tree/join.png', '+', $imgattrs, $imgdir) . "\n";
+                $space .= Horde::img('tree/join.png', '+', $imgattrs) . "\n";
             } else {
-                $space .= Horde::img('tree/joinbottom.png', '-', $imgattrs, $imgdir) . "\n";
+                $space .= Horde::img('tree/joinbottom.png', '-', $imgattrs) . "\n";
             }
         }