diff --git a/imp/lib/Basic/Thread.php b/imp/lib/Basic/Thread.php
index fdd0fcf14be..59890dceb2d 100644
--- a/imp/lib/Basic/Thread.php
+++ b/imp/lib/Basic/Thread.php
@@ -165,6 +165,8 @@ protected function _init()
 
         $t_css = new Horde_Themes_Element('thread.css');
         $page_output->addStylesheet($t_css->fs, $t_css->uri);
+        $v_css = new Horde_Themes_Element('dynamic/message_view.css');
+        $page_output->addStylesheet($v_css->fs, $v_css->uri);
 
         $this->output = $view->render('thread');
 
diff --git a/imp/themes/default/dynamic/mailbox.css b/imp/themes/default/dynamic/mailbox.css
index 599debc4213..9166fadbe2f 100644
--- a/imp/themes/default/dynamic/mailbox.css
+++ b/imp/themes/default/dynamic/mailbox.css
@@ -526,12 +526,6 @@ span.readonlyImg {
 }
 
 /* Action images. */
-.dimpactionCompose,
-#ctx_contacts_new span.iconImg,
-#ctx_forward_editasnew span.iconImg,
-#ctx_message_editasnew span.iconImg {
-    background-image: url("../graphics/compose.png");
-}
 .dimpactionRefresh,
 #ctx_folderopts_reload span.iconImg {
     background-image: url("../graphics/reload.png");
@@ -547,12 +541,6 @@ span.readonlyImg {
 #ctx_mbox_acl span.iconImg {
     background-image: url("../graphics/edit.png");
 }
-.dimpactionFilter,
-#ctx_contacts_addfilter span.iconImg,
-#ctx_message_addfilter span.iconImg,
-#ctx_filteropts_applyfilters span.iconImg {
-    background-image: url("../graphics/filters.png");
-}
 
 /* Other images */
 #msg_newwin_options span.iconImg {
diff --git a/imp/themes/default/dynamic/message.css b/imp/themes/default/dynamic/message.css
index 3c57db334eb..82db775c993 100644
--- a/imp/themes/default/dynamic/message.css
+++ b/imp/themes/default/dynamic/message.css
@@ -27,6 +27,9 @@ div.msgfullread span.messagePrintShow {
     float: right !important;
     margin-top: 6px;
 }
+.saveAsImg {
+    background-image: url("../graphics/download.png");
+}
 
 @media print {
     /* Hide UI elements when printing message in popup window. */
diff --git a/imp/themes/default/dynamic/message_view.css b/imp/themes/default/dynamic/message_view.css
index 886407517c6..90d21f464c0 100644
--- a/imp/themes/default/dynamic/message_view.css
+++ b/imp/themes/default/dynamic/message_view.css
@@ -62,7 +62,8 @@
     text-align: center;
 }
 #ctx_reply_reply span.iconImg,
-#ctx_message_reply span.iconImg {
+#ctx_message_reply span.iconImg,
+.dimpactionReply {
     background-image: url("../graphics/reply.png");
 }
 #ctx_reply_reply_all span.iconImg,
@@ -71,13 +72,15 @@
 }
 #ctx_forward_attach span.iconImg,
 #ctx_preview_allparts span.iconImg,
-#msg_all_parts span.iconImg {
+#msg_all_parts span.iconImg,
+.mimePartInfoAtc div {
     background-image: url("../graphics/attachment.png");
 }
 #ctx_message_forward span.iconImg,
 #ctx_forward_body span.iconImg,
 #ctx_forward_both span.iconImg,
-#ctx_forward_redirect span.iconImg {
+#ctx_forward_redirect span.iconImg,
+.dimpactionForward {
     background-image: url("../graphics/forward.png");
 }
 #ctx_message_source span.iconImg,
@@ -89,6 +92,18 @@
 #msg_listinfo span.iconImg {
     background-image: url("../graphics/group.png");
 }
+.dimpactionCompose,
+#ctx_contacts_new span.iconImg,
+#ctx_forward_editasnew span.iconImg,
+#ctx_message_editasnew span.iconImg {
+    background-image: url("../graphics/compose.png");
+}
+.dimpactionFilter,
+#ctx_contacts_addfilter span.iconImg,
+#ctx_message_addfilter span.iconImg,
+#ctx_filteropts_applyfilters span.iconImg {
+    background-image: url("../graphics/filters.png");
+}
 
 /* Email Addresses. */
 .msgHeaders .horde-button {
@@ -106,12 +121,6 @@
 }
 
 /* Action images. */
-.dimpactionReply {
-    background-image: url("../graphics/reply.png");
-}
-.dimpactionForward {
-    background-image: url("../graphics/forward.png");
-}
 .dimpactionSpam {
     background-image: url("../graphics/spam.png");
 }
@@ -130,3 +139,96 @@ div.msgSubject span.horde-tree-image {
     margin-top: -3px;
     margin-right: 1px;
 }
+
+/* IMP_Contents styles */
+div.partsTreeDiv {
+    min-height: 0;
+}
+.messageBody div.mimePartData {
+    line-height: 1.3em;
+    margin-bottom: 8px;
+}
+.htmlMsgData {
+    margin: 2px 0;
+    width: 100%;
+}
+.mimeStatusMessageTable {
+    background: #ffc;
+    border: 1px solid #fff760;
+    color: #000;
+    display: inline-block;
+    margin-bottom: 3px;
+    padding: 4px;
+}
+.mimeStatusIcon {
+    width: 22px;
+}
+div.mimeStatusMessage, div.mimePartInfo {
+    margin-bottom: 7px;
+}
+.mimePartInfo div {
+    background-color: #ebeff0;
+    border: 1px solid #d0d0d0;
+    margin: 0;
+    padding: 5px;
+    /* For FF2 */
+    display: table-cell;
+    display: inline-block;
+}
+.mimePartInfo div > img {
+    vertical-align: top;
+}
+.mimePartInfoAtc div {
+    border: 1px dashed;
+    background-position: 2px 50%;
+    background-repeat: no-repeat;
+    padding-left: 35px;
+}
+span.mimePartInfoSize {
+    color: #666;
+}
+.mimeStatusMessageTable td {
+    padding: 0;
+}
+.mimeStatusMessageTable td table td {
+    padding-right: 2px;
+    white-space: nowrap;
+}
+.mimePartWrap,
+.mimePartWrapValid,
+.mimePartWrapInvalid {
+    border: 1px solid #d0d0d0;
+    margin: 2px 0;
+    padding: 10px;
+}
+.mimePartWrapValid {
+    border-color: #cfc;
+}
+.mimePartWrapInvalid {
+    border-color: #ffd0af;
+}
+.downloadAtc {
+    background-image: url("../graphics/download.png");
+    margin-left: 1px;
+}
+.saveImgAtc {
+    background-image: url("../graphics/gallery.png");
+    margin-left: 1px;
+}
+.printAtc {
+    background-image: url("../graphics/print.png");
+}
+
+/* Large addresslist display. */
+.largeaddrlist,
+.largeaddrlistlimit {
+    color: #36525d;
+    cursor: pointer;
+    font-weight: bold;
+    margin-right: 5px;
+    padding: 1px;
+}
+.largeaddrlist:hover,
+.largeaddrlistlimit:hover {
+    text-decoration: underline;
+}
diff --git a/imp/themes/default/prefs.css b/imp/themes/default/prefs.css
index 572a2dffd52..cd63f41193e 100644
--- a/imp/themes/default/prefs.css
+++ b/imp/themes/default/prefs.css
@@ -71,6 +71,9 @@ table.remotemanagement td.noneconfigured {
     color: red;
     padding: 5px 10px;
 }
+.calendarImg {
+    background-image: url("graphics/calendar.png");
+}
 
 /* ACL */
 .prefsAclTable {
diff --git a/imp/themes/default/screen.css b/imp/themes/default/screen.css
index 87b66d14056..21d3a4baeb5 100644
--- a/imp/themes/default/screen.css
+++ b/imp/themes/default/screen.css
@@ -8,22 +8,6 @@
     margin-left: 20px;
 }
 
-/* Attachment tree styling. */
-div.partsTreeDiv {
-    min-height: 0;
-}
-
-/* Message body styling. */
-.messageBody div.mimePartData {
-    line-height: 1.3em;
-    margin-bottom: 8px;
-}
-
-/* Calendar image. */
-.calendarImg {
-    background-image: url("graphics/calendar.png");
-}
-
 /* Folder images. */
 .folderImg {
     background-image: url("graphics/folders/folder.png");
@@ -55,12 +39,6 @@ div.partsTreeDiv {
     font-style: italic;
 }
 
-/* Style for HTML data iframe. */
-.htmlMsgData {
-    margin: 2px 0;
-    width: 100%;
-}
-
 /* Quota styles. */
 .quotawarn {
     color: yellow;
@@ -71,20 +49,6 @@ div.partsTreeDiv {
     font-weight:bold;
 }
 
-/* Large addresslist display. */
-.largeaddrlist,
-.largeaddrlistlimit {
-    color: #36525d;
-    cursor: pointer;
-    font-weight: bold;
-    margin-right: 5px;
-    padding: 1px;
-}
-.largeaddrlist:hover,
-.largeaddrlistlimit:hover {
-    text-decoration: underline;
-}
-
 /* Mailing list info page */
 table.mailinglistinfo {
     border: 1px solid #d0d0d0;
@@ -92,67 +56,6 @@ table.mailinglistinfo {
     margin: 8px;
 }
 
-/* Inline display (Horde_Mime_Viewer) styles. */
-.mimeStatusMessageTable {
-    margin-bottom: 3px;
-}
-.mimeStatusMessageTable {
-    background: #ffc;
-    border: 1px solid #fff760;
-    color: #000;
-    display: inline-block;
-    margin-bottom: 3px;
-    padding: 4px;
-}
-.mimeStatusIcon {
-    width: 22px;
-}
-div.mimeStatusMessage, div.mimePartInfo {
-    margin-bottom: 7px;
-}
-.mimePartInfo div {
-    background-color: #ebeff0;
-    border: 1px solid #d0d0d0;
-    margin: 0;
-    padding: 5px;
-    /* For FF2 */
-    display: table-cell;
-    display: inline-block;
-}
-.mimePartInfo div > img {
-    vertical-align: top;
-}
-.mimePartInfoAtc div {
-    border: 1px dashed;
-    background-image: url("graphics/attachment.png");
-    background-position: 2px 50%;
-    background-repeat: no-repeat;
-    padding-left: 35px;
-}
-span.mimePartInfoSize {
-    color: #666;
-}
-
-.mimeStatusMessageTable td {
-    padding: 0;
-}
-.mimeStatusMessageTable td table td {
-    padding-right: 2px;
-    white-space: nowrap;
-}
-
-.mimePartWrap, .mimePartWrapValid, .mimePartWrapInvalid {
-    border: 1px solid #d0d0d0;
-    margin: 2px 0;
-    padding: 10px;
-}
-.mimePartWrapValid {
-    border-color: #cfc;
-}
-.mimePartWrapInvalid {
-    border-color: #ffd0af;
-}
-
 .mimeHeadersPrint {
     border-color: black;
     /* Must be pixel size to properly work with Mozilla on print page. */
@@ -160,33 +63,9 @@ span.mimePartInfoSize {
 }
 
 /* Other images. */
-.downloadAtc,
-.saveImgAtc {
-    margin-left: 1px;
-}
-.downloadAtc,
-.saveAsImg {
-    background-image: url("graphics/download.png");
-}
-.printAtc {
-    background-image: url("graphics/print.png");
-}
-.saveImgAtc {
-    background-image: url("graphics/gallery.png");
-}
 .deleteImg {
     background-image: url("graphics/delete.png");
 }
 .closeImg {
     background-image: url("graphics/close.png");
 }
-.reloadImg {
-    background-image: url("graphics/reload.png");
-}
-.readonlyImg,
-.horde-buttonbar li.readonlyImg {
-    background-image: url("graphics/locked.png");
-}
-.horde-buttonbar li.readonlyImg {
-    margin-right: -5px;
-}
diff --git a/imp/themes/default/search.css b/imp/themes/default/search.css
index 9062d273d4d..99f2b47e156 100644
--- a/imp/themes/default/search.css
+++ b/imp/themes/default/search.css
@@ -67,7 +67,10 @@
 .searchElement span.endDate {
     margin-left: 6px;
 }
-.searchElement .calendarImg,
+.searchElement .calendarImg {
+    background-image: url("graphics/calendar.png");
+    margin-right: 0;
+}
 .searchElement .closeImg {
     margin-right: 0;
 }