diff -ru horde/turba/templates/prefs/addressbookselect.inc horde-changed/turba/templates/prefs/addressbookselect.inc
--- horde/turba/templates/prefs/addressbookselect.inc	2005-05-24 23:45:16.000000000 +0430
+++ horde-changed/turba/templates/prefs/addressbookselect.inc	2005-06-01 16:42:58.000000000 +0430
@@ -171,9 +171,9 @@
    </select>
   </td>
   <td>
-   <a href="#" onclick="addAddressBook(); return false;"><?php echo Horde::img(isset($nls['rtl'][$GLOBALS['language']]) ? 'lhand.png' : 'rhand.png', _("Add address book"), null, $registry->getImageDir('horde')) ?></a>
+   <a href="#" onclick="addAddressBook(); return false;"><?php echo Horde::img(isset($GLOBALS['nls']['rtl'][$GLOBALS['language']]) ? 'lhand.png' : 'rhand.png', _("Add address book"), null, $registry->getImageDir('horde')) ?></a>
    <br />
-   <a href="#" onclick="removeAddressBook(); return false;"><?php echo Horde::img(isset($nls['rtl'][$GLOBALS['language']]) ? 'rhand.png' : 'lhand.png', _("Remove address book"), null, $registry->getImageDir('horde')) ?></a>
+   <a href="#" onclick="removeAddressBook(); return false;"><?php echo Horde::img(isset($GLOBALS['nls']['rtl'][$GLOBALS['language']]) ? 'rhand.png' : 'lhand.png', _("Remove address book"), null, $registry->getImageDir('horde')) ?></a>
   </td>
   <td>
    <select name="selected_addressbooks" multiple="multiple" size="5" style="width:300px" onchange="deselectHeaders();">
diff -ru horde/turba/templates/prefs/columnselect.inc horde-changed/turba/templates/prefs/columnselect.inc
--- horde/turba/templates/prefs/columnselect.inc	2005-05-24 23:45:16.000000000 +0430
+++ horde-changed/turba/templates/prefs/columnselect.inc	2005-06-01 16:38:22.000000000 +0430
@@ -234,9 +234,9 @@
    </select>
   </td>
   <td>
-   <a href="#" onclick="addColumn(); return false;"><?php echo Horde::img(isset($nls['rtl'][$GLOBALS['language']]) ? 'lhand.png' : 'rhand.png', _("Add column"), null, $registry->getImageDir('horde')) ?></a>
+   <a href="#" onclick="addColumn(); return false;"><?php echo Horde::img(isset($GLOBALS['nls']['rtl'][$GLOBALS['language']]) ? 'lhand.png' : 'rhand.png', _("Add column"), null, $registry->getImageDir('horde')) ?></a>
    <br />
-   <a href="#" onclick="removeColumn(); return false;"><?php echo Horde::img(isset($nls['rtl'][$GLOBALS['language']]) ? 'rhand.png' : 'lhand.png', _("Remove column"), null, $registry->getImageDir('horde')) ?></a>
+   <a href="#" onclick="removeColumn(); return false;"><?php echo Horde::img(isset($GLOBALS['nls']['rtl'][$GLOBALS['language']]) ? 'rhand.png' : 'lhand.png', _("Remove column"), null, $registry->getImageDir('horde')) ?></a>
   </td>
   <td>
    <select name="selected_columns" multiple="multiple" size="5" style="width:300px" onchange="deselectHeaders();">
--- horde/imp/templates/prefs/sourceselect.inc	2005-02-04 13:21:10.000000000 +0330
+++ horde-changed/imp/templates/prefs/sourceselect.inc	2005-06-01 16:48:57.000000000 +0430
@@ -300,9 +300,9 @@
    </select>
   </td>
   <td>
-   <a href="" onclick="addSource(); return false;"><?php echo Horde::img('rhand.png', _("Add source"), null, $registry->getImageDir('horde')) ?></a>
+   <a href="" onclick="addSource(); return false;"><?php echo Horde::img(isset($GLOBALS['nls']['rtl'][$GLOBALS['language']]) ? 'lhand.png' : 'rhand.png', _("Add source"), null, $registry->getImageDir('horde')) ?></a>
    <br />
-   <a href="" onclick="removeSource(); return false;"><?php echo Horde::img('lhand.png', _("Remove source"), null, $registry->getImageDir('horde')) ?></a>
+   <a href="" onclick="removeSource(); return false;"><?php echo Horde::img(isset($GLOBALS['nls']['rtl'][$GLOBALS['language']]) ? 'rhand.png' : 'lhand.png', _("Remove source"), null, $registry->getImageDir('horde')) ?></a>
   </td>
   <td>
    <select name="selected_search_sources" multiple="multiple" size="5" width="20" onchange="deselectHeaders();updateSearchFields();">