From: Michael M Slusarz <slusarz@curecanti.org>
Date: Thu, 4 Nov 2010 22:57:05 +0000 (-0600)
Subject: Move CSS icon image display code from IMP->Horde
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=b7e22a3a79c5e9ff54c78bca500e366a07b2ffa8;p=horde.git

Move CSS icon image display code from IMP->Horde
---

diff --git a/framework/Core/js/spellchecker.js b/framework/Core/js/spellchecker.js
index e3ae778d5..c95215f58 100644
--- a/framework/Core/js/spellchecker.js
+++ b/framework/Core/js/spellchecker.js
@@ -65,7 +65,7 @@ var SpellChecker = Class.create({
                 onChoose: this.setLocale.bindAsEventListener(this)
             });
 
-            this.statusButton.insert({ after: new Element('SPAN', { className: 'spellcheckPopdownImg' }) });
+            this.statusButton.insert({ after: new Element('SPAN', { className: 'iconImg spellcheckPopdownImg' }) });
         }
 
         this.setStatus('CheckSpelling');
diff --git a/horde/themes/ie6_or_less.css b/horde/themes/ie6_or_less.css
index 4fe59388d..3c7259dd6 100644
--- a/horde/themes/ie6_or_less.css
+++ b/horde/themes/ie6_or_less.css
@@ -17,7 +17,7 @@
 }
 
 /* Fixes broken inline-block. */
-.mimeHeaders {
+.iconImg, .mimeHeaders, .treeImg {
     zoom: 1;
     *display: inline;
 }
diff --git a/horde/themes/ie7.css b/horde/themes/ie7.css
index f8f87a4e5..5fec04839 100644
--- a/horde/themes/ie7.css
+++ b/horde/themes/ie7.css
@@ -3,7 +3,7 @@
  */
 
 /* Fixes broken inline-block. */
-.mimeHeaders {
+.iconImg, .mimeHeaders, .treeImg {
     zoom: 1;
     *display: inline;
 }
diff --git a/horde/themes/screen.css b/horde/themes/screen.css
index 3c58cd378..97c736762 100644
--- a/horde/themes/screen.css
+++ b/horde/themes/screen.css
@@ -38,6 +38,17 @@ input[type=image] {
     background: transparent;
 }
 
+.iconImg {
+    background-color: transparent;
+    background-position: center right;
+    background-repeat: no-repeat;
+    display: -moz-inline-stack;
+    display: inline-block;
+    height: 16px;
+    vertical-align: bottom;
+    width: 16px;
+}
+
 ins {
     background: #cfc;
 }
@@ -1337,6 +1348,9 @@ div.GrowlerNoticeExit:hover {
 .contextSelected {
     background: #ffa;
 }
+.contextMenu .iconImg {
+    vertical-align: top;
+}
 
 /* Social Media Related CSS */
 .hordeSmStreamstory {
diff --git a/horde/themes/webkit.css b/horde/themes/webkit.css
index 321105941..37933e4c1 100644
--- a/horde/themes/webkit.css
+++ b/horde/themes/webkit.css
@@ -7,7 +7,7 @@
     height: 20px;
 }
 
-.treeRow img {
+.iconImg, .treeRow img {
     vertical-align: middle;
 }
 
diff --git a/imp/js/compose-dimp.js b/imp/js/compose-dimp.js
index 643dec3a0..d29dbfceb 100644
--- a/imp/js/compose-dimp.js
+++ b/imp/js/compose-dimp.js
@@ -119,7 +119,7 @@ var DimpCompose = {
             opts: opts
         };
 
-        $(opts.label).insert({ after: new Element('SPAN', { className: 'popdownImg' }).observe('click', function(e) { if (!this.disabled) { this.knl[id].knl.show(); this.knl[id].knl.ignoreClick(e); e.stop(); } }.bindAsEventListener(this)) });
+        $(opts.label).insert({ after: new Element('SPAN', { className: 'iconImg popdownImg' }).observe('click', function(e) { if (!this.disabled) { this.knl[id].knl.show(); this.knl[id].knl.ignoreClick(e); e.stop(); } }.bindAsEventListener(this)) });
     },
 
     setPopdownLabel: function(id, s, l)
diff --git a/imp/js/dimpbase.js b/imp/js/dimpbase.js
index 342002473..d384f4689 100644
--- a/imp/js/dimpbase.js
+++ b/imp/js/dimpbase.js
@@ -411,7 +411,7 @@ var DimpBase = {
                             r.subjectdata += ptr.elt;
                         } else {
                             if (!ptr.elt) {
-                                ptr.elt = '<div class="msgflags ' + ptr.c + '" title="' + ptr.l + '"></div>';
+                                ptr.elt = '<div class="iconImg msgflags ' + ptr.c + '" title="' + ptr.l + '"></div>';
                             }
                             r.status += ptr.elt;
 
@@ -1047,7 +1047,7 @@ var DimpBase = {
 
         $('ctx_flag').insert(
             a.insert(
-                new Element('SPAN', { className: 'contextImg' }).addClassName(f.c.escapeHTML()).setStyle(style)
+                new Element('SPAN', { className: 'iconImg' }).addClassName(f.c.escapeHTML()).setStyle(style)
             ).insert(
                 f.l.escapeHTML()
             )
@@ -2582,7 +2582,7 @@ var DimpBase = {
             cname += ' unsubFolder';
         }
 
-        div = new Element('SPAN', { className: 'iconSpan' });
+        div = new Element('SPAN', { className: 'iconImgSidebar' });
         if (ob.i) {
             div.setStyle({ backgroundImage: 'url("' + ob.i + '")' });
         }
diff --git a/imp/js/mailbox-dimp.js b/imp/js/mailbox-dimp.js
index ae181478a..0775ca663 100644
--- a/imp/js/mailbox-dimp.js
+++ b/imp/js/mailbox-dimp.js
@@ -14,7 +14,7 @@
 DimpBase.msglist_template_horiz =
 '<div class="#{className}" id="#{VP_domid}" style="#{style}">' +
  '<div class="msgStatus sep">' +
-  '<div class="msCheck"></div>' +
+  '<div class="iconImg msCheck"></div>' +
   '#{status}' +
  '</div>' +
  '<div class="msgFrom sep">#{from}</div>' +
@@ -25,8 +25,8 @@ DimpBase.msglist_template_horiz =
 
 DimpBase.msglist_template_vert =
 '<div class="#{className}" id="#{VP_domid}" style="#{style}">' +
- '<div class="msgStatus">' +
-  '<div class="msCheck"></div>' +
+ '<div class="iconImg msgStatus">' +
+  '<div class="iconImg msCheck"></div>' +
   '#{status}' +
  '</div>' +
  '<div>' +
diff --git a/imp/js/search.js b/imp/js/search.js
index f527bb198..ed6a67154 100644
--- a/imp/js/search.js
+++ b/imp/js/search.js
@@ -246,7 +246,7 @@ var ImpSearch = {
             div2.insert(node);
         });
 
-        div2.insert(new Element('A', { href: '#', className: 'searchuiImg searchuiDelete' }));
+        div2.insert(new Element('A', { href: '#', className: 'iconImg searchuiImg searchuiDelete' }));
 
         $('search_criteria_add').clear();
         $('search_criteria').insert(div);
@@ -306,7 +306,7 @@ var ImpSearch = {
 
         var tmp = [
                 new Element('EM').insert(this.getLabel(id)),
-                new Element('SPAN').insert(new Element('SPAN')).insert(new Element('A', { href: '#', className: 'calendarPopup', title: this.text.dateselection }).insert(new Element('SPAN', { className: 'searchuiImg searchuiCalendar' })))
+                new Element('SPAN').insert(new Element('SPAN')).insert(new Element('A', { href: '#', className: 'calendarPopup', title: this.text.dateselection }).insert(new Element('SPAN', { className: 'iconImg searchuiImg searchuiCalendar' })))
             ];
         this.replaceDate(this.insertCriteria(tmp), id, data);
     },
diff --git a/imp/lib/Contents.php b/imp/lib/Contents.php
index 88d40562f..8bc136a57 100644
--- a/imp/lib/Contents.php
+++ b/imp/lib/Contents.php
@@ -667,7 +667,7 @@ class IMP_Contents
         if ($is_atc &&
             (is_null($part['bytes']) || $part['bytes'])) {
             if ($mask & self::SUMMARY_DOWNLOAD) {
-                $part['download'] = $this->linkView($mime_part, 'download_attach', '', array('class' => 'downloadAtc', 'dload' => true, 'jstext' => _("Download")));
+                $part['download'] = $this->linkView($mime_part, 'download_attach', '', array('class' => 'iconImg downloadAtc', 'dload' => true, 'jstext' => _("Download")));
             } elseif ($mask & self::SUMMARY_DOWNLOAD_NOJS) {
                 $part['download'] = $this->urlView($mime_part, 'download_attach', array('dload' => true));
             }
@@ -680,7 +680,7 @@ class IMP_Contents
             ($part['bytes'] > 204800)) {
             $viewer = $GLOBALS['injector']->getInstance('IMP_Injector_Factory_MimeViewer')->create($mime_part, $this, $mime_type);
             if (!$viewer->getMetadata('compressed')) {
-                $part['download_zip'] = $this->linkView($mime_part, 'download_attach', null, array('class' => 'downloadZipAtc', 'dload' => true, 'jstext' => sprintf(_("Download %s in .zip Format"), $mime_part->getDescription(true)), 'params' => array('zip' => 1)));
+                $part['download_zip'] = $this->linkView($mime_part, 'download_attach', null, array('class' => 'iconImg downloadZipAtc', 'dload' => true, 'jstext' => sprintf(_("Download %s in .zip Format"), $mime_part->getDescription(true)), 'params' => array('zip' => 1)));
             }
         }
 
@@ -689,7 +689,7 @@ class IMP_Contents
         if (($mask & self::SUMMARY_IMAGE_SAVE) &&
             $GLOBALS['registry']->hasMethod('images/selectGalleries') &&
             ($mime_part->getPrimaryType() == 'image')) {
-            $part['img_save'] = Horde::link('#', _("Save Image in Gallery"), 'saveImgAtc', null, Horde::popupJs(Horde::url('saveimage.php'), array('params' => array('mbox' => $this->_mailbox, 'uid' => $this->_uid, 'id' => $id), 'height' => 200, 'width' => 450, 'urlencode' => true)) . 'return false;') . '</a>';
+            $part['img_save'] = Horde::link('#', _("Save Image in Gallery"), 'iconImg saveImgAtc', null, Horde::popupJs(Horde::url('saveimage.php'), array('params' => array('mbox' => $this->_mailbox, 'uid' => $this->_uid, 'id' => $id), 'height' => 200, 'width' => 450, 'urlencode' => true)) . 'return false;') . '</a>';
         }
 
         /* Add print link? */
@@ -697,8 +697,8 @@ class IMP_Contents
              ($mask & self::SUMMARY_PRINT_STUB)) &&
             $this->canDisplay($id, self::RENDER_FULL)) {
             $part['print'] = ($mask & self::SUMMARY_PRINT)
-                ? $this->linkViewJS($mime_part, 'print_attach', '', array('css' => 'printAtc', 'jstext' => _("Print"), 'onload' => 'IMP.printWindow', 'params' => $param_array))
-                : Horde::link('#', _("Print"), 'printAtc', null, null, null, null, array('mimeid' => $id)) . '</a>';
+                ? $this->linkViewJS($mime_part, 'print_attach', '', array('css' => 'iconImg printAtc', 'jstext' => _("Print"), 'onload' => 'IMP.printWindow', 'params' => $param_array))
+                : Horde::link('#', _("Print"), 'iconImg printAtc', null, null, null, null, array('mimeid' => $id)) . '</a>';
         }
 
         /* Strip Attachment? Allow stripping of base parts other than the
@@ -710,9 +710,9 @@ class IMP_Contents
             (strpos($id, '.') === false)) {
             if ($mask & self::SUMMARY_STRIP_LINK) {
                 $url = Horde::selfUrl(true)->remove(array('actionID', 'imapid', 'uid'))->add(array('actionID' => 'strip_attachment', 'imapid' => $id, 'uid' => $this->_uid, 'message_token' => Horde::getRequestToken('imp.impcontents')));
-                $part['strip'] = Horde::link($url, _("Strip Attachment"), 'deleteImg', null, 'return window.confirm(' . Horde_Serialize::serialize(_("Are you sure you wish to PERMANENTLY delete this attachment?"), Horde_Serialize::JSON, 'UTF-8') . ')') . '</a>';
+                $part['strip'] = Horde::link($url, _("Strip Attachment"), 'iconImg deleteImg', null, 'return window.confirm(' . Horde_Serialize::serialize(_("Are you sure you wish to PERMANENTLY delete this attachment?"), Horde_Serialize::JSON, 'UTF-8') . ')') . '</a>';
             } else {
-                $part['strip'] = Horde::link('#', _("Strip Attachment"), 'deleteImg stripAtc', null, null, null, null, array('mimeid' => $id)) . '</a>';
+                $part['strip'] = Horde::link('#', _("Strip Attachment"), 'iconImg deleteImg stripAtc', null, null, null, null, array('mimeid' => $id)) . '</a>';
             }
         }
 
diff --git a/imp/lib/Imap/Flags.php b/imp/lib/Imap/Flags.php
index d81d73489..513638d45 100644
--- a/imp/lib/Imap/Flags.php
+++ b/imp/lib/Imap/Flags.php
@@ -415,7 +415,7 @@ class IMP_Imap_Flags
      */
     protected function _getDiv($c, $l)
     {
-        return '<div class="msgflags ' . $c . '" title="' . htmlspecialchars($l) . '"></div>';
+        return '<div class="iconImg msgflags ' . $c . '" title="' . htmlspecialchars($l) . '"></div>';
     }
 
     /**
diff --git a/imp/message.php b/imp/message.php
index 6ab8b38ce..863c4f67f 100644
--- a/imp/message.php
+++ b/imp/message.php
@@ -318,12 +318,12 @@ if ($subject = $mime_headers->getValue('subject')) {
 switch ($priority = $imp_hdr_ui->getPriority($mime_headers)) {
 case 'high':
     $basic_headers['priority'] = _("Priority");
-    $display_headers['priority'] = '<div class="msgflags flagHighpriority" title="' . htmlspecialchars(_("High Priority")) . '"></div>&nbsp;' . _("High");
+    $display_headers['priority'] = '<div class="iconImg msgflags flagHighpriority" title="' . htmlspecialchars(_("High Priority")) . '"></div>&nbsp;' . _("High");
     break;
 
 case 'low':
     $basic_headers['priority'] = _("Priority");
-    $display_headers['priority'] = '<div class="msgflags flagLowpriority" title="' . htmlspecialchars(_("Low Priority")) . '"></div>&nbsp;' . _("Low");
+    $display_headers['priority'] = '<div class="iconImg msgflags flagLowpriority" title="' . htmlspecialchars(_("Low Priority")) . '"></div>&nbsp;' . _("Low");
     break;
 }
 
diff --git a/imp/templates/dimp/compose/compose-base.html b/imp/templates/dimp/compose/compose-base.html
index bb42ada2f..e17de5711 100644
--- a/imp/templates/dimp/compose/compose-base.html
+++ b/imp/templates/dimp/compose/compose-base.html
@@ -2,7 +2,7 @@
  <div id="dimpLoading"><gettext>Loading...</gettext></div>
  <div id="pageContainer" style="display:none">
   <div class="header">
-   <div class="headercloseimg closeImg" id="compose_close"></div>
+   <div class="iconImg headercloseimg closeImg" id="compose_close"></div>
    <tag:title />
   </div>
   <tag:compose_html />
diff --git a/imp/templates/dimp/index.inc b/imp/templates/dimp/index.inc
index 5fe023880..57a9716f9 100644
--- a/imp/templates/dimp/index.inc
+++ b/imp/templates/dimp/index.inc
@@ -37,7 +37,7 @@ function _simpleButton($id, $text, $image, $nodisplay = false)
         (strlen($id) ? ' id="' . $id . '"' : '') .
         (strlen($ak) ? ' accesskey="' . $ak . '"' : '') .
         ($nodisplay ? ' style="display:none"' : '') . '>' .
-        '<span class="iconSpan ' . $image . '"></span>' .
+        '<span class="iconImgSidebar ' . $image . '"></span>' .
         '<a>' . Horde::highlightAccessKey($text, $ak) . '</a></li>';
 }
 
@@ -114,11 +114,11 @@ function _simpleButton($id, $text, $image, $nodisplay = false)
     <div class="sepfull"></div>
     <ul class="folderlist" id="normalfolders">
      <li class="folder" id="folderopts">
-      <span class="iconSpan folderImg"></span>
+      <span class="iconImg iconImgSidebar folderImg"></span>
       <a id="folderopts_link" title="<?php echo _("Folder Options") ?>"><?php echo _("Folder Options") ?></a>
      </li>
      <li class="folder" id="dropbase" style="display:none">
-      <span class="iconSpan folderImg"></span>
+      <span class="iconImg iconImgSidebar folderImg"></span>
       <a title="<?php echo _("Move to Base Level") ?>"><?php echo _("Move to Base Level") ?></a>
      </li>
     </ul>
@@ -171,7 +171,7 @@ function _simpleButton($id, $text, $image, $nodisplay = false)
      <div class="dimpActions">
 <?php if ($session->get('imp', 'protocol') != 'pop'): ?>
       <div id="qsearch">
-       <span id="qsearch_icon"></span>
+       <span class="iconImg" id="qsearch_icon"></span>
        <form action="#" method="post">
         <input autocomplete="off" id="qsearch_input" type="text" />
        </form>
@@ -200,7 +200,7 @@ function _simpleButton($id, $text, $image, $nodisplay = false)
     </div>
 
      <div id="msglistHeader" class="item">
-      <div class="msgStatus"></div>
+      <div class="iconImg msgStatus"></div>
       <div class="msgFrom sep"></div>
       <div class="msgSubject sep"></div>
       <div class="msgDate sep"></div>
@@ -335,50 +335,50 @@ function _simpleButton($id, $text, $image, $nodisplay = false)
 </div>
 
 <div class="context" id="ctx_folder" style="display:none">
- <a id="ctx_folder_create"><span class="contextImg"></span><?php echo _("Create subfolder") ?></a>
- <a id="ctx_folder_rename"><span class="contextImg"></span><?php echo _("Rename Folder") ?></a>
- <a id="ctx_folder_empty"><span class="contextImg"></span><?php echo _("Empty Folder") ?></a>
- <a id="ctx_folder_delete"><span class="contextImg"></span><?php echo _("Delete Folder") ?></a>
+ <a id="ctx_folder_create"><span class="iconImg"></span><?php echo _("Create subfolder") ?></a>
+ <a id="ctx_folder_rename"><span class="iconImg"></span><?php echo _("Rename Folder") ?></a>
+ <a id="ctx_folder_empty"><span class="iconImg"></span><?php echo _("Empty Folder") ?></a>
+ <a id="ctx_folder_delete"><span class="iconImg"></span><?php echo _("Delete Folder") ?></a>
  <div class="sep"></div>
- <a id="ctx_folder_setflag"><span class="contextImg"></span><?php echo _("Mark all as") ?></a>
+ <a id="ctx_folder_setflag"><span class="iconImg"></span><?php echo _("Mark all as") ?></a>
  <div class="sep"></div>
- <a id="ctx_folder_poll"><span class="contextImg"></span><?php echo _("Check for New Mail") ?></a>
- <a id="ctx_folder_nopoll"><span class="contextImg"></span><?php echo _("Do Not Check for New Mail") ?></a>
+ <a id="ctx_folder_poll"><span class="iconImg"></span><?php echo _("Check for New Mail") ?></a>
+ <a id="ctx_folder_nopoll"><span class="iconImg"></span><?php echo _("Do Not Check for New Mail") ?></a>
 <?php if ($use_sub): ?>
- <a id="ctx_folder_sub"><span class="contextImg"></span><?php echo _("Subscribe") ?></a>
- <a id="ctx_folder_unsub"><span class="contextImg"></span><?php echo _("Unsubscribe") ?></a>
+ <a id="ctx_folder_sub"><span class="iconImg"></span><?php echo _("Subscribe") ?></a>
+ <a id="ctx_folder_unsub"><span class="iconImg"></span><?php echo _("Unsubscribe") ?></a>
 <?php endif; ?>
  <div style="display:none">
   <div class="sep"></div>
-  <a id="ctx_folder_expand"><span class="contextImg"></span><?php echo _("Expand All") ?></a>
-  <a id="ctx_folder_collapse"><span class="contextImg"></span><?php echo _("Collapse All") ?></a>
+  <a id="ctx_folder_expand"><span class="iconImg"></span><?php echo _("Expand All") ?></a>
+  <a id="ctx_folder_collapse"><span class="iconImg"></span><?php echo _("Collapse All") ?></a>
  </div>
 </div>
 
 <div class="context" id="ctx_folder_flag" style="display:none">
- <a id="ctx_folder_seen"><span class="contextImg"></span><?php echo _("Read") ?></a>
- <a id="ctx_folder_unseen"><span class="contextImg"></span><?php echo _("Unseen") ?></a>
+ <a id="ctx_folder_seen"><span class="iconImg"></span><?php echo _("Read") ?></a>
+ <a id="ctx_folder_unseen"><span class="iconImg"></span><?php echo _("Unseen") ?></a>
 </div>
 
 <div class="context" id="ctx_container" style="display:none">
- <a id="ctx_container_create"><span class="contextImg"></span><?php echo _("Create subfolder") ?></a>
- <a id="ctx_container_rename"><span class="contextImg"></span><?php echo _("Rename Folder") ?></a>
+ <a id="ctx_container_create"><span class="iconImg"></span><?php echo _("Create subfolder") ?></a>
+ <a id="ctx_container_rename"><span class="iconImg"></span><?php echo _("Rename Folder") ?></a>
  <div class="sep"></div>
- <a id="ctx_container_expand"><span class="contextImg"></span><?php echo _("Expand All") ?></a>
- <a id="ctx_container_collapse"><span class="contextImg"></span><?php echo _("Collapse All") ?></a>
+ <a id="ctx_container_expand"><span class="iconImg"></span><?php echo _("Expand All") ?></a>
+ <a id="ctx_container_collapse"><span class="iconImg"></span><?php echo _("Collapse All") ?></a>
 </div>
 
 <?php if ($conf['user']['allow_folders']): ?>
 <div class="context" id="ctx_folderopts" style="display:none">
- <a id="ctx_folderopts_new"><span class="contextImg"></span><?php echo _("New Folder") ?></a>
+ <a id="ctx_folderopts_new"><span class="iconImg"></span><?php echo _("New Folder") ?></a>
 <?php if ($use_sub): ?>
- <a id="ctx_folderopts_sub" style="display:none"><span class="contextImg"></span><?php echo _("Hide Unsubscribed") ?></a>
- <a id="ctx_folderopts_unsub"><span class="contextImg"></span><?php echo _("Show Unsubscribed") ?></a>
+ <a id="ctx_folderopts_sub" style="display:none"><span class="iconImg"></span><?php echo _("Hide Unsubscribed") ?></a>
+ <a id="ctx_folderopts_unsub"><span class="iconImg"></span><?php echo _("Show Unsubscribed") ?></a>
 <?php endif; ?>
- <a id="ctx_folderopts_expand"><span class="contextImg"></span><?php echo _("Expand All") ?></a>
- <a id="ctx_folderopts_collapse"><span class="contextImg"></span><?php echo _("Collapse All") ?></a>
+ <a id="ctx_folderopts_expand"><span class="iconImg"></span><?php echo _("Expand All") ?></a>
+ <a id="ctx_folderopts_collapse"><span class="iconImg"></span><?php echo _("Collapse All") ?></a>
  <div class="sep"></div>
- <a id="ctx_folderopts_reload"><span class="contextImg"></span><?php echo _("Rebuild Folder List") ?></a>
+ <a id="ctx_folderopts_reload"><span class="iconImg"></span><?php echo _("Rebuild Folder List") ?></a>
 </div>
 <?php endif; ?>
 
@@ -387,92 +387,92 @@ function _simpleButton($id, $text, $image, $nodisplay = false)
 </div>
 
 <div class="context" id="ctx_vcontainer" style="display:none">
- <a id="ctx_vcontainer_edit"><span class="contextImg"></span><?php echo _("Edit Virtual Folders") ?></a>
+ <a id="ctx_vcontainer_edit"><span class="iconImg"></span><?php echo _("Edit Virtual Folders") ?></a>
 </div>
 
 <div class="context" id="ctx_vfolder" style="display:none">
- <a id="ctx_vfolder_edit"><span class="contextImg"></span><?php echo _("Edit Virtual Folder") ?></a>
- <a id="ctx_vfolder_delete"><span class="contextImg"></span><?php echo _("Delete Virtual Folder") ?></a>
+ <a id="ctx_vfolder_edit"><span class="iconImg"></span><?php echo _("Edit Virtual Folder") ?></a>
+ <a id="ctx_vfolder_delete"><span class="iconImg"></span><?php echo _("Delete Virtual Folder") ?></a>
 </div>
 
 <div class="context" id="ctx_message" style="display:none">
- <a id="ctx_message_resume" style="display:none"><span class="contextImg"></span><?php echo _("Resume Draft") ?></a>
- <a id="ctx_message_reply"><span class="contextImg"></span><?php echo _("Reply") ?></a>
- <a id="ctx_message_forward"><span class="contextImg"></span><?php echo _("Forward") ?></a>
+ <a id="ctx_message_resume" style="display:none"><span class="iconImg"></span><?php echo _("Resume Draft") ?></a>
+ <a id="ctx_message_reply"><span class="iconImg"></span><?php echo _("Reply") ?></a>
+ <a id="ctx_message_forward"><span class="iconImg"></span><?php echo _("Forward") ?></a>
  <div id="ctx_message_flagopts" style="display:none">
   <div class="sep"></div>
-  <a id="ctx_message_setflag"><span class="contextImg"></span><?php echo _("Mark as") ?>...</a>
-  <a id="ctx_message_unsetflag"><span class="contextImg"></span><?php echo _("Unmark as") ?>...</a>
+  <a id="ctx_message_setflag"><span class="iconImg"></span><?php echo _("Mark as") ?>...</a>
+  <a id="ctx_message_unsetflag"><span class="iconImg"></span><?php echo _("Unmark as") ?>...</a>
  </div>
  <div class="sep"></div>
 <?php if (!empty($conf['spam']['reporting'])): ?>
- <a id="ctx_message_spam"><span class="contextImg"></span><?php echo _("Report as Spam") ?></a>
+ <a id="ctx_message_spam"><span class="iconImg"></span><?php echo _("Report as Spam") ?></a>
 <?php endif; ?>
 <?php if (!empty($conf['notspam']['reporting'])): ?>
- <a id="ctx_message_ham"><span class="contextImg"></span><?php echo _("Report as Innocent") ?></a>
+ <a id="ctx_message_ham"><span class="iconImg"></span><?php echo _("Report as Innocent") ?></a>
 <?php endif; ?>
 <?php if ($has_blacklist): ?>
- <a id="ctx_message_blacklist"><span class="contextImg"></span><?php echo _("Blacklist") ?></a>
+ <a id="ctx_message_blacklist"><span class="iconImg"></span><?php echo _("Blacklist") ?></a>
 <?php endif; ?>
 <?php if ($has_whitelist): ?>
- <a id="ctx_message_whitelist"><span class="contextImg"></span><?php echo _("Whitelist") ?></a>
+ <a id="ctx_message_whitelist"><span class="iconImg"></span><?php echo _("Whitelist") ?></a>
 <?php endif; ?>
- <a id="ctx_message_deleted"><span class="contextImg"></span><?php echo _("Delete") ?></a>
+ <a id="ctx_message_deleted"><span class="iconImg"></span><?php echo _("Delete") ?></a>
 <?php if (!$use_trash): ?>
- <a id="ctx_message_undeleted"><span class="contextImg"></span><?php echo _("Undelete") ?></a>
+ <a id="ctx_message_undeleted"><span class="iconImg"></span><?php echo _("Undelete") ?></a>
 <?php endif; ?>
  <div style="display:none">
   <div class="sep"></div>
-  <a id="ctx_message_source"><span class="contextImg"></span><?php echo _("View Source") ?></a>
+  <a id="ctx_message_source"><span class="iconImg"></span><?php echo _("View Source") ?></a>
  </div>
 </div>
 
 <div class="context" id="ctx_reply" style="display:none;">
- <a id="ctx_reply_reply"><span class="contextImg"></span><?php echo _("To Sender") ?></a>
- <a id="ctx_reply_reply_all"><span class="contextImg"></span><?php echo _("To All") ?></a>
- <a id="ctx_reply_reply_list"><span class="contextImg"></span><?php echo _("To List") ?></a>
+ <a id="ctx_reply_reply"><span class="iconImg"></span><?php echo _("To Sender") ?></a>
+ <a id="ctx_reply_reply_all"><span class="iconImg"></span><?php echo _("To All") ?></a>
+ <a id="ctx_reply_reply_list"><span class="iconImg"></span><?php echo _("To List") ?></a>
 </div>
 
 <div class="context" id="ctx_forward" style="display:none;">
 <?php if (!$prefs->isLocked('forward_default')): ?>
- <a id="ctx_forward_attach"><span class="contextImg"></span><?php echo _("As Attachment") ?></a>
- <a id="ctx_forward_body"><span class="contextImg"></span><?php echo _("In Body Text") ?></a>
- <a id="ctx_forward_both"><span class="contextImg"></span><?php echo _("Attachment and Body Text") ?></a>
+ <a id="ctx_forward_attach"><span class="iconImg"></span><?php echo _("As Attachment") ?></a>
+ <a id="ctx_forward_body"><span class="iconImg"></span><?php echo _("In Body Text") ?></a>
+ <a id="ctx_forward_both"><span class="iconImg"></span><?php echo _("Attachment and Body Text") ?></a>
  <div class="sep"></div>
 <?php endif; ?>
- <a id="ctx_forward_redirect"><span class="contextImg"></span><?php echo _("Redirect") ?></a>
+ <a id="ctx_forward_redirect"><span class="iconImg"></span><?php echo _("Redirect") ?></a>
 </div>
 
 <div class="context" id="ctx_otheractions" style="display:none">
- <a id="oa_preview_hide"><span class="contextImg"></span><?php echo _("Hide Preview") ?></a>
- <a id="oa_preview_show"><span class="contextImg"></span><?php echo _("Show Preview") ?></a>
- <a id="oa_layout_horiz"><span class="contextImg"></span><?php echo _("Horizontal Layout") ?></a>
- <a id="oa_layout_vert"><span class="contextImg"></span><?php echo _("Vertical Layout") ?></a>
+ <a id="oa_preview_hide"><span class="iconImg"></span><?php echo _("Hide Preview") ?></a>
+ <a id="oa_preview_show"><span class="iconImg"></span><?php echo _("Show Preview") ?></a>
+ <a id="oa_layout_horiz"><span class="iconImg"></span><?php echo _("Horizontal Layout") ?></a>
+ <a id="oa_layout_vert"><span class="iconImg"></span><?php echo _("Vertical Layout") ?></a>
  <div id="oa_flagopts" style="display:none">
   <div class="sep"></div>
-  <a id="oa_setflag"><span class="contextImg"></span><?php echo _("Mark as") ?>...</a>
-  <a id="oa_unsetflag"><span class="contextImg"></span><?php echo _("Unmark as") ?>...</a>
+  <a id="oa_setflag"><span class="iconImg"></span><?php echo _("Mark as") ?>...</a>
+  <a id="oa_unsetflag"><span class="iconImg"></span><?php echo _("Unmark as") ?>...</a>
  </div>
 <?php if ($has_blacklist || $has_whitelist): ?>
 <?php if ($has_blacklist): ?>
  <div>
   <div class="sep"></div>
-  <a id="oa_blacklist"><span class="contextImg"></span><?php echo _("Blacklist") ?></a>
+  <a id="oa_blacklist"><span class="iconImg"></span><?php echo _("Blacklist") ?></a>
  </div>
 <?php endif; ?>
 <?php if ($has_whitelist): ?>
  <div>
   <div<?php if (!$has_blacklist) echo ' class="sep"'; ?>></div>
-  <a id="oa_whitelist"><span class="contextImg"></span><?php echo _("Whitelist") ?></a>
+  <a id="oa_whitelist"><span class="iconImg"></span><?php echo _("Whitelist") ?></a>
  </div>
 <?php endif; ?>
 <?php endif; ?>
  <div class="sep"></div>
- <a id="oa_selectall"><span class="contextImg"></span><?php echo _("Select All") ?></a>
+ <a id="oa_selectall"><span class="iconImg"></span><?php echo _("Select All") ?></a>
 <?php if (!$use_trash): ?>
  <div class="sep"></div>
- <a id="oa_purge_deleted"><span class="contextImg"></span><?php echo _("Purge Deleted") ?></a>
- <a id="oa_undeleted"><span class="contextImg"></span><?php echo _("Undelete") ?></a>
+ <a id="oa_purge_deleted"><span class="iconImg"></span><?php echo _("Purge Deleted") ?></a>
+ <a id="oa_undeleted"><span class="iconImg"></span><?php echo _("Undelete") ?></a>
 <?php endif; ?>
 </div>
 
@@ -483,8 +483,8 @@ function _simpleButton($id, $text, $image, $nodisplay = false)
 </div>
 
 <div class="context" id="ctx_contacts" style="display:none">
- <a id="ctx_contacts_new"><span class="contextImg"></span><?php echo _("New Message") ?></a>
- <a id="ctx_contacts_add"><span class="contextImg"></span><?php echo _("Add to Address Book") ?></a>
+ <a id="ctx_contacts_new"><span class="iconImg"></span><?php echo _("New Message") ?></a>
+ <a id="ctx_contacts_add"><span class="iconImg"></span><?php echo _("Add to Address Book") ?></a>
 </div>
 
 <div class="context" id="ctx_mboxsort" style="display:none">
diff --git a/imp/templates/dimp/message/message.html b/imp/templates/dimp/message/message.html
index 14ad76c30..bd4282c06 100644
--- a/imp/templates/dimp/message/message.html
+++ b/imp/templates/dimp/message/message.html
@@ -3,7 +3,7 @@
  <div id="pageContainer" style="display:none">
   <div id="msgData">
    <div class="dimpActions dimpActionsMsg">
-    <div class="headercloseimg closeImg" id="windowclose" title="X"></div>
+    <div class="iconImg headercloseimg closeImg" id="windowclose" title="X"></div>
     <div>
      <tag:reply_button />
     </div>
@@ -110,7 +110,7 @@
   <div id="qreply" style="display:none">
    <div class="header">
     <div class="headercloseimg" id="compose_close">
-     <span class="closeImg" title="X"></span>
+     <span class="iconImg closeImg" title="X"></span>
     </div>
     <div>
      <gettext>Message:</gettext>
@@ -122,27 +122,27 @@
  </div>
 
  <div class="context" id="ctx_replypopdown" style="display:none">
-  <a id="ctx_reply_reply"><span class="contextImg"></span><gettext>To Sender</gettext></a>
-  <a id="ctx_reply_reply_all"><span class="contextImg"></span><gettext>To All</gettext></a>
+  <a id="ctx_reply_reply"><span class="iconImg"></span><gettext>To Sender</gettext></a>
+  <a id="ctx_reply_reply_all"><span class="iconImg"></span><gettext>To All</gettext></a>
 <if:reply_list>
-  <a id="ctx_reply_reply_list"><span class="contextImg"></span><gettext>To List</gettext></a>
+  <a id="ctx_reply_reply_list"><span class="iconImg"></span><gettext>To List</gettext></a>
 </if:reply_list>
  </div>
 
  <div class="context" id="ctx_forwardpopdown" style="display:none;">
 <if:forward_select>
-  <a id="ctx_forward_attach"><span class="contextImg"></span><gettext>As Attachment</gettext></a>
-  <a id="ctx_forward_body"><span class="contextImg"></span><gettext>In Body Text</gettext></a>
-  <a id="ctx_forward_both"><span class="contextImg"></span><gettext>Attachment and Body Text</gettext></a>
+  <a id="ctx_forward_attach"><span class="iconImg"></span><gettext>As Attachment</gettext></a>
+  <a id="ctx_forward_body"><span class="iconImg"></span><gettext>In Body Text</gettext></a>
+  <a id="ctx_forward_both"><span class="iconImg"></span><gettext>Attachment and Body Text</gettext></a>
   <div class="sep"></div>
 </if:forward_select>
-  <a id="ctx_forward_redirect"><span class="contextImg"></span><gettext>Redirect</gettext></a>
+  <a id="ctx_forward_redirect"><span class="iconImg"></span><gettext>Redirect</gettext></a>
  </div>
 </if:html>
 
  <div class="context" id="ctx_contacts" style="display:none">
-  <a id="ctx_contacts_new"><span class="contextImg"></span><gettext>New Message</gettext></a>
-  <a id="ctx_contacts_add"><span class="contextImg"></span><gettext>Add to Address Book</gettext></a>
+  <a id="ctx_contacts_new"><span class="iconImg"></span><gettext>New Message</gettext></a>
+  <a id="ctx_contacts_add"><span class="iconImg"></span><gettext>Add to Address Book</gettext></a>
  </div>
 
  <div style="display:none">
diff --git a/imp/templates/imp/folders/head.html b/imp/templates/imp/folders/head.html
index 49d0c422b..b5ab43fb4 100644
--- a/imp/templates/imp/folders/head.html
+++ b/imp/templates/imp/folders/head.html
@@ -1,6 +1,6 @@
 <h1 class="header">
  <gettext>Folder Navigator</gettext>
- <tag:refresh /><span class="reloadImg"></span></a>
+ <tag:refresh /><span class="iconImg reloadImg"></span></a>
  <tag:help />
 </h1>
 <div class="headerbox folders">
diff --git a/imp/templates/imp/mailbox/header.html b/imp/templates/imp/mailbox/header.html
index 035ace40f..2211c0ab8 100644
--- a/imp/templates/imp/mailbox/header.html
+++ b/imp/templates/imp/mailbox/header.html
@@ -12,14 +12,14 @@
 <if:readonly>
   <tag:readonly />
 </if:readonly>
-  <tag:refresh /><span class="reloadImg"></span></a>
+  <tag:refresh /><span class="iconImg reloadImg"></span></a>
 <if:filter_url>
   <a href="<tag:filter_url />" title="<gettext>Apply Filters</gettext>"><tag:filter_img /></a>
 </if:filter_url>
 <if:search_url>
   <a href="<tag:search_url />" title="<gettext>Search</gettext>"><tag:search_img /></a>
 <if:searchclose>
-  <a href="<tag:searchclose />" title="<gettext>Exit Search</gettext>"><span class="closeImg"</span></a>
+  <a href="<tag:searchclose />" title="<gettext>Exit Search</gettext>"><span class="iconImg closeImg"</span></a>
 </if:searchclose>
 </if:search_url>
 <if:edit_search_url>
diff --git a/imp/templates/imp/search/search.html b/imp/templates/imp/search/search.html
index 6ae25c788..44a8cef41 100644
--- a/imp/templates/imp/search/search.html
+++ b/imp/templates/imp/search/search.html
@@ -16,8 +16,8 @@
  </h1>
 
  <div id="recent_searches_div" class="smallheader leftAlign" style="display:none">
-  <span class="searchuiImg arrowExpanded" style="display:none"></span>
-  <span class="searchuiImg arrowCollapsed"></span>
+  <span class="iconImg searchuiImg arrowExpanded" style="display:none"></span>
+  <span class="iconImg searchuiImg arrowCollapsed"></span>
   <gettext>Recent Searches</gettext>
  </div>
 
@@ -29,8 +29,8 @@
  </div>
 
  <div class="smallheader leftAlign">
-  <span class="searchuiImg arrowExpanded"></span>
-  <span class="searchuiImg arrowCollapsed" style="display:none"></span>
+  <span class="iconImg searchuiImg arrowExpanded"></span>
+  <span class="iconImg searchuiImg arrowCollapsed" style="display:none"></span>
  <gettext>Search Criteria</gettext>
  </div>
 
@@ -60,8 +60,8 @@
 
 <if:edit_query_filter><else:edit_query_filter>
  <div class="smallheader leftAlign" id="search_folders_hdr">
-  <span class="searchuiImg arrowExpanded" style="display:none"></span>
-  <span class="searchuiImg arrowCollapsed"></span>
+  <span class="iconImg searchuiImg arrowExpanded" style="display:none"></span>
+  <span class="iconImg searchuiImg arrowCollapsed"></span>
   <gettext>Search Folders</gettext>
   <span class="searchuiFoldersActions" style="display:none">
    [ <a id="link_sel_all" href="#"><gettext>Select all</gettext></a> |
@@ -76,8 +76,8 @@
 
 <if:virtualfolder>
  <div class="smallheader leftAlign">
-  <span class="searchuiImg arrowExpanded" style="display:none"></span>
-  <span class="searchuiImg arrowCollapsed"></span>
+  <span class="iconImg searchuiImg arrowExpanded" style="display:none"></span>
+  <span class="iconImg searchuiImg arrowCollapsed"></span>
   <gettext>Saved Searches</gettext>
  </div>
 
diff --git a/imp/templates/prefs/acl.html b/imp/templates/prefs/acl.html
index c1cc15cbc..b39fbd98b 100644
--- a/imp/templates/prefs/acl.html
+++ b/imp/templates/prefs/acl.html
@@ -54,7 +54,7 @@
 </if:hasacl>
 
 <div>
- <span class="folderImg"></span>
+ <span class="iconImg folderImg"></span>
  <select id="aclfolder" name="folder">
   <tag:options />
  </select>
diff --git a/imp/templates/prefs/flags.html b/imp/templates/prefs/flags.html
index a8f39fe56..6130d6930 100644
--- a/imp/templates/prefs/flags.html
+++ b/imp/templates/prefs/flags.html
@@ -30,10 +30,10 @@
    <td>
 <if:flags.locked><else:flags.locked>
     <input type="hidden" id="<tag:flags.colorid />" name="<tag:flags.colorid />" value="<tag:flags.color />" />
-    <div class="msgflags flagUser" style="<tag:flags.colorstyle />"></div>
+    <div class="iconImg msgflags flagUser" style="<tag:flags.colorstyle />"></div>
     <a class="flagcolorpicker" href="#"><tag:picker_img /></a>
 <if:flags.flag_del>
-    <a class="flagdelete" href="#"><span class="deleteImg"></span></a>
+    <a class="flagdelete" href="#"><span class="iconImg deleteImg"></span></a>
 </if:flags.flag_del>
 </else:flags.locked></if:flags.locked>
    </td>
diff --git a/imp/templates/prefs/searches.html b/imp/templates/prefs/searches.html
index 99282195a..4d6a57992 100644
--- a/imp/templates/prefs/searches.html
+++ b/imp/templates/prefs/searches.html
@@ -29,8 +29,8 @@
    </td>
    <td>
 <if:vfolders.edit>
-    <a class="vfolderedit" href="<tag:vfolders.edit />"><span class="editImg"></span></a>
-    <a class="vfolderdelete" href="#"><span class="deleteImg"></span></a>
+    <a class="vfolderedit" href="<tag:vfolders.edit />"><span class="iconImg editImg"></span></a>
+    <a class="vfolderdelete" href="#"><span class="iconImg deleteImg"></span></a>
 <else:vfolders.edit>
      <gettext>No Actions Available</gettext>
 </else:vfolders.edit></if:vfolders.edit>
@@ -65,8 +65,8 @@
    </td>
    <td>
 <if:filters.edit>
-    <a class="filteredit" href="<tag:filters.edit />"><span class="editImg"></span></a>
-    <a class="filterdelete" href="#"><span class="deleteImg"></span></a>
+    <a class="filteredit" href="<tag:filters.edit />"><span class="iconImg editImg"></span></a>
+    <a class="filterdelete" href="#"><span class="iconImg deleteImg"></span></a>
 <else:filters.edit>
      <gettext>No Actions Available</gettext>
 </else:filters.edit></if:filters.edit>
diff --git a/imp/themes/dimp/ie7.css b/imp/themes/dimp/ie7.css
index c3c974f95..61f100bc3 100644
--- a/imp/themes/dimp/ie7.css
+++ b/imp/themes/dimp/ie7.css
@@ -39,13 +39,6 @@ div.msgSubject span.treeImg {
 }
 
 /* Fixes broken inline-block. */
-div.msgStatus div,
-#msgHeadersContent .subject span,
-span.iconImg,
-span.contextImg,
-span.spellcheckPopdownImg,
-span.popdownImg,
-#qsearch_icon,
 #upload_wait,
 #noticerow .notices li,
 .msgwrite span.loadingImg {
diff --git a/imp/themes/dimp/screen.css b/imp/themes/dimp/screen.css
index e632618fa..3502dc24c 100644
--- a/imp/themes/dimp/screen.css
+++ b/imp/themes/dimp/screen.css
@@ -133,11 +133,6 @@ div.msgStatus {
     width: 8%;
     text-indent: 0 !important;
 }
-div.msgStatus div, #msgHeadersContent .subject span {
-    padding-right: 2px;
-    background-repeat: no-repeat;
-    vertical-align: inherit;
-}
 div.msgFrom {
     float: left;
     width: 20%;
@@ -346,21 +341,22 @@ div.vpRowVert.flagUnseen {
 #sidebar li.subfolders ul {
     padding-left: 10px;
 }
-#sidebar span.iconSpan {
+#sidebar span.iconImgSidebar {
     background-position: left center;
     background-repeat: no-repeat;
     display: inline;
     float: left;
     height: 100%;
+    margin-right: 0;
     width: 20px;
 }
-#ctx_folder_sub span.contextImg, #ctx_folder_unsub span.contextImg, #ctx_folderopts_sub span.contextImg, #ctx_folderopts_unsub span.contextImg {
+#ctx_folder_sub span.iconImg, #ctx_folder_unsub span.iconImg, #ctx_folderopts_sub span.iconImg, #ctx_folderopts_unsub span.iconImg {
     background-image: url("../graphics/folders/folder.png");
 }
-#sidebar span.col, #ctx_folderopts_collapse span.contextImg, #ctx_container_collapse span.contextImg, #ctx_folder_collapse span.contextImg {
+#sidebar span.col, #ctx_folderopts_collapse span.iconImg, #ctx_container_collapse span.iconImg, #ctx_folder_collapse span.iconImg {
     background-image: url("../graphics/folders/minus.png");
 }
-#sidebar span.exp, #ctx_folderopts_expand span.contextImg, #ctx_container_expand span.contextImg, #ctx_folder_expand span.contextImg {
+#sidebar span.exp, #ctx_folderopts_expand span.iconImg, #ctx_container_expand span.iconImg, #ctx_folder_expand span.iconImg {
     background-image: url("../graphics/folders/plus.png");
 }
 #normalfolders li.unsubFolder {
@@ -371,7 +367,7 @@ div.vpRowVert.flagUnseen {
     font-weight: bold;
     text-decoration: underline;
 }
-#sidebar .container span.iconSpan {
+#sidebar .container span.iconImgSidebar {
     cursor: pointer;
 }
 
@@ -441,6 +437,9 @@ div.vpRowVert.flagUnseen {
     margin-right: 4px;
     vertical-align: top;
 }
+.dimpActions .iconImg {
+    vertical-align: top;
+}
 .dimpActions a:hover {
     background-color: #e3e3e3;
     text-decoration: none;
@@ -810,6 +809,7 @@ a.address:hover img {
 #qsearch_icon {
     background: #f3f3f3 url("../graphics/search.png") center no-repeat;
     cursor: pointer;
+    margin-right: 0;
     padding-top: 2px;
 }
 #qsearch_input {
@@ -876,15 +876,7 @@ a.address:hover img {
 }
 
 /* Images */
-div.msgStatus div, #msgHeadersContent .subject span, span.iconImg, span.contextImg, span.spellcheckPopdownImg, span.popdownImg, #qsearch_icon {
-    display: -moz-inline-stack;
-    display: inline-block;
-    height: 16px;
-    width: 16px;
-    vertical-align: top;
-}
-
-span.iconImg, span.contextImg, span.spellcheckPopdownImg {
+span.iconImg, span.spellcheckPopdownImg {
     margin-right: 4px;
 }
 
@@ -947,82 +939,82 @@ span.dimpactionResume {
 }
 
 /* Context menu images */
-#ctx_message_reply span.contextImg {
+#ctx_message_reply span.iconImg {
     background-image: url("../graphics/reply.png");
 }
-#ctx_reply_reply span.contextImg, #ctx_reply_reply_all span.contextImg, #ctx_reply_reply_list span.contextImg {
+#ctx_reply_reply span.iconImg, #ctx_reply_reply_all span.iconImg, #ctx_reply_reply_list span.iconImg {
     background-image: url("../graphics/replyall.png");
 }
-#ctx_message_forward span.contextImg, #ctx_forward_attach span.contextImg, #ctx_forward_body span.contextImg, #ctx_forward_both span.contextImg, #ctx_forward_redirect span.contextImg {
+#ctx_message_forward span.iconImg, #ctx_forward_attach span.iconImg, #ctx_forward_body span.iconImg, #ctx_forward_both span.iconImg, #ctx_forward_redirect span.iconImg {
     background-image: url("../graphics/forward.png");
 }
-#ctx_folder_empty span.contextImg, #ctx_message_deleted span.contextImg, #oa_purge_deleted span.contextImg {
+#ctx_folder_empty span.iconImg, #ctx_message_deleted span.iconImg, #oa_purge_deleted span.iconImg {
     background-image: url("../graphics/delete.png");
 }
-#ctx_message_undeleted span.contextImg, #oa_undeleted span.contextImg {
+#ctx_message_undeleted span.iconImg, #oa_undeleted span.iconImg {
     background-image: url("../graphics/undelete.png");
 }
-#ctx_folder_seen span.contextImg {
+#ctx_folder_seen span.iconImg {
     background-image: url("../graphics/mail_seen.png");
 }
-#ctx_folder_unseen span.contextImg, #ctx_folder_poll span.contextImg, #ctx_folder_nopoll span.contextImg {
+#ctx_folder_unseen span.iconImg, #ctx_folder_poll span.iconImg, #ctx_folder_nopoll span.iconImg {
     background-image: url("../graphics/mail_unseen.png");
 }
-#ctx_message_setflag span.contextImg, #oa_setflag span.contextImg, #ctx_folder_setflag span.contextImg {
+#ctx_message_setflag span.iconImg, #oa_setflag span.iconImg, #ctx_folder_setflag span.iconImg {
     background-image: url("../graphics/mail_flagged.png");
 }
-#ctx_message_unsetflag span.contextImg, #oa_unsetflag span.contextImg {
+#ctx_message_unsetflag span.iconImg, #oa_unsetflag span.iconImg {
     background-image: url("../graphics/mail_clearflag.png");
 }
-#ctx_message_source span.contextImg, #msg_view_source span.iconImg {
+#ctx_message_source span.iconImg, #msg_view_source span.iconImg {
     background-image: url("../graphics/message_source.png");
 }
-#ctx_message_resume span.contextImg, #msg_resume_draft span.iconImg {
+#ctx_message_resume span.iconImg, #msg_resume_draft span.iconImg {
     background-image: url("../graphics/mail_draft.png");
 }
-#oa_preview_hide span.contextImg, #oa_preview_show span.contextImg {
+#oa_preview_hide span.iconImg, #oa_preview_show span.iconImg {
     background-image: url("../graphics/preview.png");
 }
-#oa_layout_horiz span.contextImg {
+#oa_layout_horiz span.iconImg {
     background-image: url("../graphics/application_tile_vertical.png");
 }
-#oa_layout_vert span.contextImg {
+#oa_layout_vert span.iconImg {
     background-image: url("../graphics/application_tile_horizontal.png");
 }
-#oa_selectall span.contextImg {
+#oa_selectall span.iconImg {
     background-image: url("../graphics/tick.png");
 }
-#ctx_folder_create span.contextImg, #ctx_container_create span.contextImg, #ctx_folderopts_new span.contextImg {
+#ctx_folder_create span.iconImg, #ctx_container_create span.iconImg, #ctx_folderopts_new span.iconImg {
     background-image: url("../graphics/folders/create.png");
 }
-#ctx_folder_rename span.contextImg, #ctx_container_rename span.contextImg, #ctx_vcontainer_edit span.contextImg, #ctx_vfolder_edit span.contextImg {
+#ctx_folder_rename span.iconImg, #ctx_container_rename span.iconImg, #ctx_vcontainer_edit span.iconImg, #ctx_vfolder_edit span.iconImg {
     background-image: url("../graphics/folders/edit.png");
 }
-#ctx_folder_delete span.contextImg, #ctx_vfolder_delete span.contextImg {
+#ctx_folder_delete span.iconImg, #ctx_vfolder_delete span.iconImg {
     background-image: url("../graphics/folders/delete.png");
 }
-#ctx_message_spam span.contextImg {
+#ctx_message_spam span.iconImg {
     background-image: url("../graphics/spam.png");
 }
-#ctx_message_ham span.contextImg {
+#ctx_message_ham span.iconImg {
     background-image: url("../graphics/ham.png");
 }
-#ctx_message_blacklist span.contextImg, #oa_blacklist span.contextImg {
+#ctx_message_blacklist span.iconImg, #oa_blacklist span.iconImg {
     background-image: url("../graphics/blacklist.png");
 }
-#ctx_message_whitelist span.contextImg, #oa_whitelist span.contextImg {
+#ctx_message_whitelist span.iconImg, #oa_whitelist span.iconImg {
     background-image: url("../graphics/whitelist.png");
 }
-#ctx_contacts_new span.contextImg {
+#ctx_contacts_new span.iconImg {
     background-image: url("../graphics/compose.png");
 }
-#ctx_contacts_add span.contextImg {
+#ctx_contacts_add span.iconImg {
     background-image: url("../graphics/add_contact.png");
 }
-#ctx_folderopts_reload span.contextImg {
+#ctx_folderopts_reload span.iconImg {
     background-image: url("../graphics/reload.png");
 }
-#ctx_flag span.contextImg.flagUser {
+#ctx_flag span.iconImg.flagUser {
     border: 1px black solid;
     height: 15px;
     width: 15px;
diff --git a/imp/themes/dimp/webkit.css b/imp/themes/dimp/webkit.css
deleted file mode 100644
index ad8b18223..000000000
--- a/imp/themes/dimp/webkit.css
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * CSS corrections for WebKit.
- */
-
-div.msgStatus div, #msgHeadersContent .subject span, span.iconImg, span.contextImg, span.spellcheckPopdownImg, span.popdownImg, #qsearch_icon {
-    vertical-align: middle;
-}
diff --git a/imp/themes/ie6_or_less.css b/imp/themes/ie6_or_less.css
index cab69dacb..5cf99f1c2 100644
--- a/imp/themes/ie6_or_less.css
+++ b/imp/themes/ie6_or_less.css
@@ -3,7 +3,7 @@
  */
 
 /* Fixes broken inline-block. */
-div.msgflags, span.spellcheckPopdownImg, span.treeImg, .downloadAtc, .downloadZipAtc, .saveImgAtc, .deleteImg, .mimePartInfo div, .mimeStatusMessage {
+.mimePartInfo div, .mimeStatusMessage {
     zoom: 1;
     *display: inline;
 }
diff --git a/imp/themes/ie7.css b/imp/themes/ie7.css
index 93d292398..502e4bbe5 100644
--- a/imp/themes/ie7.css
+++ b/imp/themes/ie7.css
@@ -3,7 +3,7 @@
  */
 
 /* Fixes broken inline-block. */
-div.msgflags, span.spellcheckPopdownImg, span.treeImg, .downloadAtc, .downloadZipAtc, .saveImgAtc, .deleteImg, .mimePartInfo div, .mimeStatusMessage {
+.mimePartInfo div, .mimeStatusMessage {
     zoom: 1;
     *display: inline;
 }
diff --git a/imp/themes/screen.css b/imp/themes/screen.css
index 42a49934a..9926a79ef 100644
--- a/imp/themes/screen.css
+++ b/imp/themes/screen.css
@@ -344,12 +344,6 @@ span.trashImg {
 /* Message flags definitions.
  * For background color, see config/prefs.php [msgflags preference]. */
 div.msgflags {
-    display: -moz-inline-stack;
-    display: inline-block;
-    padding-right: 2px;
-    width: 16px;
-    height: 16px;
-    background-repeat: no-repeat;
     vertical-align: middle;
 }
 .mboxheader div.msgflags {
@@ -380,25 +374,25 @@ div.msgflags.flagAttachmsg {
 tr.flagUnseen {
     font-weight: bold;
 }
-div.msgflags.flagUnseen, span.contextImg.flagUnseen {
+div.msgflags.flagUnseen, span.iconImg.flagUnseen {
     background-image: url("graphics/mail_unseen.png");
 }
-div.msgflags.flagAnswered, span.contextImg.flagAnswered {
+div.msgflags.flagAnswered, span.iconImg.flagAnswered {
     background-image: url("graphics/mail_answered.png");
 }
-div.msgflags.flagDraft, span.contextImg.flagDraft {
+div.msgflags.flagDraft, span.iconImg.flagDraft {
     background-image: url("graphics/mail_draft.png");
 }
-div.msgflags.flagForwarded, span.contextImg.flagForwarded {
+div.msgflags.flagForwarded, span.iconImg.flagForwarded {
     background-image: url("graphics/mail_forwarded.png");
 }
-div.msgflags.flagFlagged, span.contextImg.flagFlagged {
+div.msgflags.flagFlagged, span.iconImg.flagFlagged {
     background-image: url("graphics/mail_flagged.png");
 }
 tr.flagDeleted * {
     text-decoration: line-through;
 }
-div.msgflags.flagDeleted, span.contextImg.flagDeleted {
+div.msgflags.flagDeleted, span.iconImg.flagDeleted {
     background-image: url("graphics/mail_deleted.png");
 }
 
@@ -500,10 +494,6 @@ td.msgheader {
 span.spellcheckPopdownImg {
     cursor: pointer;
     background: url("graphics/popdown.png") no-repeat center center;
-    display: -moz-inline-stack;
-    display: inline-block;
-    height: 16px;
-    width: 16px;
     vertical-align: top;
     margin-left: 3px;
 }
@@ -644,16 +634,6 @@ div.mimeStatusMessage, div.mimePartInfo {
 }
 
 /* Other images. */
-.downloadAtc, .downloadZipAtc, .saveImgAtc, .printAtc, .closeImg, .deleteImg, .folderImg, .foldersImg, .searchuiImg, .reloadImg, .editImg {
-    display: -moz-inline-stack;
-    display: inline-block;
-    height: 16px;
-    width: 16px;
-    background-color: transparent;
-    background-position: center right;
-    background-repeat: no-repeat;
-    vertical-align: bottom;
-}
 .downloadAtc, .downloadZipAtc, .saveImgAtc {
     margin-left: 1px;
 }
diff --git a/imp/themes/silver/dimp/screen.css b/imp/themes/silver/dimp/screen.css
index 4f4f0e5a9..1c81a9058 100644
--- a/imp/themes/silver/dimp/screen.css
+++ b/imp/themes/silver/dimp/screen.css
@@ -1,10 +1,10 @@
-#ctx_folder_sub span.contextImg, #ctx_folder_unsub span.contextImg, #ctx_folderopts_sub span.contextImg, #ctx_folderopts_unsub span.contextImg {
+#ctx_folder_sub span.iconImg, #ctx_folder_unsub span.iconImg, #ctx_folderopts_sub span.iconImg, #ctx_folderopts_unsub span.iconImg {
     background-image: url("../graphics/folders/explore.png");
 }
-#sidebar span.col, #ctx_folderopts_collapse span.contextImg, #ctx_container_collapse span.contextImg, #ctx_folder_collapse span.contextImg {
+#sidebar span.col, #ctx_folderopts_collapse span.iconImg, #ctx_container_collapse span.iconImg, #ctx_folder_collapse span.iconImg {
     background-image: url("../graphics/folders/minus.png");
 }
-#sidebar span.exp, #ctx_folderopts_expand span.contextImg, #ctx_container_expand span.contextImg, #ctx_folder_expand span.contextImg {
+#sidebar span.exp, #ctx_folderopts_expand span.iconImg, #ctx_container_expand span.iconImg, #ctx_folder_expand span.iconImg {
     background-image: url("../graphics/folders/plus.png");
 }
 
@@ -79,79 +79,79 @@ span.dimpactionEditsearch {
 }
 
 /* Context menu images */
-#ctx_message_reply span.contextImg {
+#ctx_message_reply span.iconImg {
     background-image: url("../graphics/reply.png");
 }
-#ctx_reply_reply span.contextImg, #ctx_reply_reply_all span.contextImg, #ctx_reply_reply_list span.contextImg {
+#ctx_reply_reply span.iconImg, #ctx_reply_reply_all span.iconImg, #ctx_reply_reply_list span.iconImg {
     background-image: url("../graphics/replyall.png");
 }
-#ctx_message_forward span.contextImg, #ctx_forward_attach span.contextImg, #ctx_forward_body span.contextImg, #ctx_forward_both span.contextImg, #ctx_forward_redirect span.contextImg {
+#ctx_message_forward span.iconImg, #ctx_forward_attach span.iconImg, #ctx_forward_body span.iconImg, #ctx_forward_both span.iconImg, #ctx_forward_redirect span.iconImg {
     background-image: url("../graphics/forward.png");
 }
-#ctx_folder_empty span.contextImg, #ctx_message_deleted span.contextImg, #oa_purge_deleted span.contextImg {
+#ctx_folder_empty span.iconImg, #ctx_message_deleted span.iconImg, #oa_purge_deleted span.iconImg {
     background-image: url("../graphics/delete.png");
 }
-#ctx_message_undeleted span.contextImg, #oa_undeleted span.contextImg {
+#ctx_message_undeleted span.iconImg, #oa_undeleted span.iconImg {
     background-image: url("../graphics/undelete.png");
 }
-#ctx_folder_seen span.contextImg {
+#ctx_folder_seen span.iconImg {
     background-image: url("../graphics/mail_seen.png");
 }
-#ctx_folder_unseen span.contextImg, #ctx_folder_poll span.contextImg, #ctx_folder_nopoll span.contextImg {
+#ctx_folder_unseen span.iconImg, #ctx_folder_poll span.iconImg, #ctx_folder_nopoll span.iconImg {
     background-image: url("../graphics/mail_unseen.png");
 }
-#ctx_message_setflag span.contextImg, #oa_setflag span.contextImg, #ctx_folder_setflag span.contextImg {
+#ctx_message_setflag span.iconImg, #oa_setflag span.iconImg, #ctx_folder_setflag span.iconImg {
     background-image: url("../graphics/mail_flagged.png");
 }
-#ctx_message_unsetflag span.contextImg, #oa_unsetflag span.contextImg {
+#ctx_message_unsetflag span.iconImg, #oa_unsetflag span.iconImg {
     background-image: url("../graphics/mail_clearflag.png");
 }
-#ctx_message_resume span.contextImg, #msg_resume_draft span.iconImg {
+#ctx_message_resume span.iconImg, #msg_resume_draft span.iconImg {
     background-image: url("../graphics/mail_draft.png");
 }
-#oa_preview_hide span.contextImg, #oa_preview_show span.contextImg {
+#oa_preview_hide span.iconImg, #oa_preview_show span.iconImg {
     background-image: url("../graphics/preview.png");
 }
-#oa_layout_horiz span.contextImg {
+#oa_layout_horiz span.iconImg {
     background-image: url("../graphics/application_tile_vertical.png");
 }
-#oa_layout_vert span.contextImg {
+#oa_layout_vert span.iconImg {
     background-image: url("../graphics/application_tile_horizontal.png");
 }
-#oa_selectall span.contextImg {
+#oa_selectall span.iconImg {
     background-image: url("../graphics/tick.png");
 }
-#ctx_folder_create span.contextImg, #ctx_container_create span.contextImg, #ctx_folderopts_new span.contextImg {
+#ctx_folder_create span.iconImg, #ctx_container_create span.iconImg, #ctx_folderopts_new span.iconImg {
     background-image: url("../graphics/folders/create.png");
 }
-#ctx_folder_rename span.contextImg, #ctx_container_rename span.contextImg, #ctx_vcontainer_edit span.contextImg, #ctx_vfolder_edit span.contextImg {
+#ctx_folder_rename span.iconImg, #ctx_container_rename span.iconImg, #ctx_vcontainer_edit span.iconImg, #ctx_vfolder_edit span.iconImg {
     background-image: url("../graphics/folders/edit.png");
 }
-#ctx_folder_delete span.contextImg, #ctx_vfolder_delete span.contextImg {
+#ctx_folder_delete span.iconImg, #ctx_vfolder_delete span.iconImg {
     background-image: url("../graphics/folders/delete.png");
 }
-#ctx_message_spam span.contextImg {
+#ctx_message_spam span.iconImg {
     background-image: url("../graphics/spam.png");
 }
-#ctx_message_ham span.contextImg {
+#ctx_message_ham span.iconImg {
     background-image: url("../graphics/ham.png");
 }
-#ctx_message_blacklist span.contextImg, #oa_blacklist span.contextImg {
+#ctx_message_blacklist span.iconImg, #oa_blacklist span.iconImg {
     background-image: url("../graphics/blacklist.png");
 }
-#ctx_message_whitelist span.contextImg, #oa_whitelist span.contextImg {
+#ctx_message_whitelist span.iconImg, #oa_whitelist span.iconImg {
     background-image: url("../graphics/whitelist.png");
 }
-#ctx_message_source span.contextImg, #msg_view_source span.iconImg {
+#ctx_message_source span.iconImg, #msg_view_source span.iconImg {
     background-image: url("../graphics/message_source.png");
 }
-#ctx_contacts_new span.contextImg {
+#ctx_contacts_new span.iconImg {
     background-image: url("../graphics/compose.png");
 }
-#ctx_contacts_add span.contextImg {
+#ctx_contacts_add span.iconImg {
     background-image: url("../graphics/add_contact.png");
 }
-#ctx_folderopts_reload span.contextImg {
+#ctx_folderopts_reload span.iconImg {
     background-image: url("../graphics/reload.png");
 }
 
diff --git a/imp/themes/silver/screen.css b/imp/themes/silver/screen.css
index 5b6a945eb..6e148b158 100644
--- a/imp/themes/silver/screen.css
+++ b/imp/themes/silver/screen.css
@@ -41,22 +41,22 @@ div.msgflags.flagEncryptmsg {
 div.msgflags.flagAttachmsg {
     background-image: url("graphics/attachment.png");
 }
-div.msgflags.flagUnseen, span.contextImg.flagUnseen {
+div.msgflags.flagUnseen, span.iconImg.flagUnseen {
     background-image: url("graphics/mail_unseen.png");
 }
-div.msgflags.flagAnswered, span.contextImg.flagAnswered {
+div.msgflags.flagAnswered, span.iconImg.flagAnswered {
     background-image: url("graphics/mail_answered.png");
 }
-div.msgflags.flagDraft, span.contextImg.flagDraft {
+div.msgflags.flagDraft, span.iconImg.flagDraft {
     background-image: url("graphics/mail_draft.png");
 }
-div.msgflags.flagForwarded, span.contextImg.flagForwarded {
+div.msgflags.flagForwarded, span.iconImg.flagForwarded {
     background-image: url("graphics/mail_forwarded.png");
 }
-div.msgflags.flagFlagged, span.contextImg.flagFlagged {
+div.msgflags.flagFlagged, span.iconImg.flagFlagged {
     background-image: url("graphics/mail_flagged.png");
 }
-div.msgflags.flagDeleted, span.contextImg.flagDeleted {
+div.msgflags.flagDeleted, span.iconImg.flagDeleted {
     background-image: url("graphics/mail_deleted.png");
 }
 
diff --git a/imp/themes/tango-blue/dimp/screen.css b/imp/themes/tango-blue/dimp/screen.css
index 7416ec14f..a355b9f14 100644
--- a/imp/themes/tango-blue/dimp/screen.css
+++ b/imp/themes/tango-blue/dimp/screen.css
@@ -15,6 +15,6 @@
     background-color: #c9daed;
 }
 
-#ctx_folderopts_reload span.contextImg {
+#ctx_folderopts_reload span.iconImg {
     background-image: url("../graphics/reload.png");
 }