diff --git a/UI/MailerUI/Toolbars/SOGoDraftObject.toolbar b/UI/MailerUI/Toolbars/SOGoDraftObject.toolbar
index 63d1f38a6..05e7a38ff 100644
--- a/UI/MailerUI/Toolbars/SOGoDraftObject.toolbar
+++ b/UI/MailerUI/Toolbars/SOGoDraftObject.toolbar
@@ -12,14 +12,14 @@
     { link  = "#";
       onclick  = "return onContactAdd(this);";
       image = "tb-compose-contacts-flat-24x24.png";
-      cssClass = "tbicon_addressbook single-window-not-conditional";
+      cssClass = "tbicon_addressbook";
       label = "Contacts";
       tooltip = "Select a recipient from an Address Book"; },
     { link  = "#";
       isSafe = NO;
       onclick  = "return clickedEditorAttach(this)";
       image = "tb-compose-attach-flat-24x24.png";
-      cssClass = "tbicon_attach";
+      cssClass = "tbicon_attach single-window-not-conditional";
       label = "Attach";
       tooltip = "Include an attachment"; },
     { link  = "#";
diff --git a/UI/MailerUI/Toolbars/SOGoMailObject.toolbar b/UI/MailerUI/Toolbars/SOGoMailObject.toolbar
index 727c6e8eb..062af0643 100644
--- a/UI/MailerUI/Toolbars/SOGoMailObject.toolbar
+++ b/UI/MailerUI/Toolbars/SOGoMailObject.toolbar
@@ -43,7 +43,7 @@
   (
    { link = "#";
      onclick = "return onPrintCurrentMessage(event);";
-     cssClass = "tbicon_print";
+     cssClass = "tbicon_print single-window-not-conditional";
      image = "tb-mail-print-flat-24x24.png";
      label = "Print"; 
      tooltip = "Print this message"; },