diff --git a/themes/classic/jar.mn b/themes/classic/jar.mn
index ce30f9dd3cf2..bc3ce0f1e02e 100644
--- a/themes/classic/jar.mn
+++ b/themes/classic/jar.mn
@@ -424,9 +424,6 @@ classic.jar:
   skin/classic/messenger/icons/message-news-new-attach-off.gif          (messenger/icons/message-news-new-attach-off.gif)
   skin/classic/messenger/icons/message-news-new-offl.gif                (messenger/icons/message-news-new-offl.gif)
   skin/classic/messenger/icons/message-news-offl.gif                    (messenger/icons/message-news-offl.gif)
-  skin/classic/messenger/icons/winclassic.gif                           (messenger/icons/winclassic.gif)
-  skin/classic/messenger/icons/winwide.gif                              (messenger/icons/winwide.gif)
-  skin/classic/messenger/icons/winvertical.gif                          (messenger/icons/winvertical.gif)
   skin/classic/messenger/icons/server-local.gif                         (messenger/icons/server-local.gif)
   skin/classic/messenger/icons/server-local-new.gif                     (messenger/icons/server-local-new.gif)
   skin/classic/messenger/icons/server-mail.gif                          (messenger/icons/server-mail.gif)
diff --git a/themes/classic/messenger/icons/winclassic.gif b/themes/classic/messenger/icons/winclassic.gif
deleted file mode 100644
index 288f4b0ed7d5..000000000000
Binary files a/themes/classic/messenger/icons/winclassic.gif and /dev/null differ
diff --git a/themes/classic/messenger/icons/winvertical.gif b/themes/classic/messenger/icons/winvertical.gif
deleted file mode 100644
index f206ba71f669..000000000000
Binary files a/themes/classic/messenger/icons/winvertical.gif and /dev/null differ
diff --git a/themes/classic/messenger/icons/winwide.gif b/themes/classic/messenger/icons/winwide.gif
deleted file mode 100644
index 9722cc64e7a2..000000000000
Binary files a/themes/classic/messenger/icons/winwide.gif and /dev/null differ
diff --git a/themes/classic/messenger/prefPanels.css b/themes/classic/messenger/prefPanels.css
index e6a513fa03d6..76a22eb003a5 100644
--- a/themes/classic/messenger/prefPanels.css
+++ b/themes/classic/messenger/prefPanels.css
@@ -44,20 +44,3 @@
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-/* :::::: layout preference icons ::::: */
-
-#classic {
-  min-height       : 32px;
-  list-style-image : url("chrome://messenger/skin/icons/winclassic.gif");
-}
-
-#wide {
-  min-height       : 32px;
-  list-style-image : url("chrome://messenger/skin/icons/winwide.gif");
-}
-
-#vertical {
-  min-height       : 32px;
-  list-style-image : url("chrome://messenger/skin/icons/winvertical.gif");
-}
-
diff --git a/themes/modern/jar.mn b/themes/modern/jar.mn
index 9053e9912b53..6624be1d79c7 100644
--- a/themes/modern/jar.mn
+++ b/themes/modern/jar.mn
@@ -370,9 +370,6 @@ modern.jar:
   skin/modern/messenger/icons/folder-trash-share-open.gif          (messenger/icons/folder-trash-share-open.gif)
   skin/modern/messenger/icons/folder-trash-share.gif               (messenger/icons/folder-trash-share.gif)
   skin/modern/messenger/icons/folder-trash.gif                     (messenger/icons/folder-trash.gif)
-  skin/modern/messenger/icons/layout1.gif                          (messenger/icons/layout1.gif)
-  skin/modern/messenger/icons/layout2.gif                          (messenger/icons/layout2.gif)
-  skin/modern/messenger/icons/layout3.gif                          (messenger/icons/layout3.gif)
   skin/modern/messenger/icons/local-mailhost.gif                   (messenger/icons/local-mailhost.gif)
   skin/modern/messenger/icons/mast-mail.gif                        (messenger/icons/mast-mail.gif)
   skin/modern/messenger/icons/message-mail-attach-offl.gif         (messenger/icons/message-mail-attach-offl.gif)
diff --git a/themes/modern/messenger/icons/layout1.gif b/themes/modern/messenger/icons/layout1.gif
deleted file mode 100644
index 288f4b0ed7d5..000000000000
Binary files a/themes/modern/messenger/icons/layout1.gif and /dev/null differ
diff --git a/themes/modern/messenger/icons/layout2.gif b/themes/modern/messenger/icons/layout2.gif
deleted file mode 100644
index 9722cc64e7a2..000000000000
Binary files a/themes/modern/messenger/icons/layout2.gif and /dev/null differ
diff --git a/themes/modern/messenger/icons/layout3.gif b/themes/modern/messenger/icons/layout3.gif
deleted file mode 100644
index f206ba71f669..000000000000
Binary files a/themes/modern/messenger/icons/layout3.gif and /dev/null differ
diff --git a/themes/modern/messenger/prefPanels.css b/themes/modern/messenger/prefPanels.css
index 539fa36bc92d..55a5f9bc5eb7 100644
--- a/themes/modern/messenger/prefPanels.css
+++ b/themes/modern/messenger/prefPanels.css
@@ -44,17 +44,3 @@
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-/* :::::: layout preference icons ::::: */
-
-#classic {
-  list-style-image: url("chrome://messenger/skin/icons/layout1.gif");
-}
-
-#wide {
-  list-style-image: url("chrome://messenger/skin/icons/layout2.gif");
-}
-
-#vertical {
-  list-style-image: url("chrome://messenger/skin/icons/layout3.gif");
-}
-