#52271 - [Modern] new secondary icons, r=german, sr=ben

mailnews/base/resources/content/mailWindowOverlay.xul

@@ -190,7 +190,7 @@ Rights Reserved.
 			<template> 
 				<rule nc:CanFileMessages="true" iscontainer="true" isempty="false">
 					<menupopup>
-						<menu uri="..."  class="folderMenuItem" value="rdf:http://home.netscape.com/NC-rdf#Name"
+						<menu uri="..."  class="folderMenuItem menu-iconic" value="rdf:http://home.netscape.com/NC-rdf#Name"
 							SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
 							BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"
 							IsServer="rdf:http://home.netscape.com/NC-rdf#IsServer"
@@ -213,7 +213,7 @@ Rights Reserved.
 				<rule nc:CanFileMessages="false" iscontainer="true" isempty="false">
 					<!-- note, there is no "file here" -->
 					<menupopup>
-						<menu uri="..."  class="folderMenuItem" value="rdf:http://home.netscape.com/NC-rdf#Name"
+						<menu uri="..."  class="folderMenuItem menu-iconic" value="rdf:http://home.netscape.com/NC-rdf#Name"
 									SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
 									BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"
 									IsServer="rdf:http://home.netscape.com/NC-rdf#IsServer"
@@ -224,7 +224,7 @@ Rights Reserved.
 				</rule>
 				<rule nc:CanFileMessages="true">
 					<menupopup>
-						<menuitem uri="..." class="folderMenuItem" value="rdf:http://home.netscape.com/NC-rdf#Name" oncommand="MsgMoveMessage(event.target)" 
+						<menuitem uri="..." class="folderMenuItem menuitem-iconic" value="rdf:http://home.netscape.com/NC-rdf#Name" oncommand="MsgMoveMessage(event.target)" 
 							SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
 							BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"
 							IsServer="rdf:http://home.netscape.com/NC-rdf#IsServer"
@@ -242,7 +242,7 @@ Rights Reserved.
 			<template>
 				<rule nc:CanFileMessages="true" iscontainer="true" isempty="false">
 					<menupopup>
-						<menu uri="..."  class="folderMenuItem" value="rdf:http://home.netscape.com/NC-rdf#Name"
+						<menu uri="..."  class="folderMenuItem menu-iconic" value="rdf:http://home.netscape.com/NC-rdf#Name"
 							SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
 							BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"
 							IsServer="rdf:http://home.netscape.com/NC-rdf#IsServer"
@@ -265,7 +265,7 @@ Rights Reserved.
 				<rule nc:CanFileMessages="false" iscontainer="true" isempty="false">
 					<!-- note, there is no "file here" -->
 					<menupopup>
-						<menu uri="..."  class="folderMenuItem" value="rdf:http://home.netscape.com/NC-rdf#Name"
+						<menu uri="..."  class="folderMenuItem menu-iconic" value="rdf:http://home.netscape.com/NC-rdf#Name"
 									SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
 									BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"
 									IsServer="rdf:http://home.netscape.com/NC-rdf#IsServer"
@@ -276,7 +276,7 @@ Rights Reserved.
 				</rule>
 				<rule nc:CanFileMessages="true">
 					<menupopup>
-						<menuitem uri="..." class="folderMenuItem" value="rdf:http://home.netscape.com/NC-rdf#Name" 
+						<menuitem uri="..." class="folderMenuItem menuitem-iconic" value="rdf:http://home.netscape.com/NC-rdf#Name" 
 							oncommand="MsgCopyMessage(event.target)" 
 							SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
 							BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"
@@ -395,7 +395,7 @@ Rights Reserved.
 			<template> 
 				<rule nc:CanFileMessages="true" iscontainer="true" isempty="false">
 					<menupopup>
-						<menu uri="..."  class="folderMenuItem" value="rdf:http://home.netscape.com/NC-rdf#Name"
+						<menu uri="..."  class="folderMenuItem menu-iconic" value="rdf:http://home.netscape.com/NC-rdf#Name"
 							SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
 							BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"
 							IsServer="rdf:http://home.netscape.com/NC-rdf#IsServer"
@@ -418,7 +418,7 @@ Rights Reserved.
 				<rule nc:CanFileMessages="false" iscontainer="true" isempty="false">
 					<!-- note, there is no "file here" -->
 					<menupopup>
-						<menu uri="..."  class="folderMenuItem" value="rdf:http://home.netscape.com/NC-rdf#Name"
+						<menu uri="..."  class="folderMenuItem menu-iconic" value="rdf:http://home.netscape.com/NC-rdf#Name"
 									SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
 									BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"
 									IsServer="rdf:http://home.netscape.com/NC-rdf#IsServer"
@@ -429,7 +429,7 @@ Rights Reserved.
 				</rule>
 				<rule nc:CanFileMessages="true">
 					<menupopup>
-						<menuitem uri="..." class="folderMenuItem" value="rdf:http://home.netscape.com/NC-rdf#Name" oncommand="MsgMoveMessage(event.target)" 
+						<menuitem uri="..." class="folderMenuItem menuitem-iconic" value="rdf:http://home.netscape.com/NC-rdf#Name" oncommand="MsgMoveMessage(event.target)" 
 							SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
 							BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"
 							IsServer="rdf:http://home.netscape.com/NC-rdf#IsServer"
@@ -447,7 +447,7 @@ Rights Reserved.
 			<template>
 				<rule nc:CanFileMessages="true" iscontainer="true" isempty="false">
 					<menupopup>
-						<menu uri="..."  class="folderMenuItem" value="rdf:http://home.netscape.com/NC-rdf#Name"
+						<menu uri="..."  class="folderMenuItem menu-iconic" value="rdf:http://home.netscape.com/NC-rdf#Name"
 							SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
 							BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"
 							IsServer="rdf:http://home.netscape.com/NC-rdf#IsServer"
@@ -470,7 +470,7 @@ Rights Reserved.
 				<rule nc:CanFileMessages="false" iscontainer="true" isempty="false">
 					<!-- note, there is no "file here" -->
 					<menupopup>
-						<menu uri="..."  class="folderMenuItem" value="rdf:http://home.netscape.com/NC-rdf#Name"
+						<menu uri="..."  class="folderMenuItem menu-iconic" value="rdf:http://home.netscape.com/NC-rdf#Name"
 									SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
 									BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"
 									IsServer="rdf:http://home.netscape.com/NC-rdf#IsServer"
@@ -481,7 +481,7 @@ Rights Reserved.
 				</rule>
 				<rule nc:CanFileMessages="true">
 					<menupopup>
-						<menuitem uri="..." class="folderMenuItem" value="rdf:http://home.netscape.com/NC-rdf#Name" 
+						<menuitem uri="..." class="folderMenuItem menuitem-iconic" value="rdf:http://home.netscape.com/NC-rdf#Name" 
 							oncommand="MsgCopyMessage(event.target)" 
 							SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
 							BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"
@@ -765,7 +765,7 @@ Rights Reserved.
 			<template> 
 				<rule nc:CanFileMessages="true" iscontainer="true" isempty="false">
 					<menupopup>
-						<menu uri="..."  class="folderMenuItem" value="rdf:http://home.netscape.com/NC-rdf#Name"
+						<menu uri="..."  class="folderMenuItem menu-iconic" value="rdf:http://home.netscape.com/NC-rdf#Name"
 						 SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
 						 BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"
 						 IsServer="rdf:http://home.netscape.com/NC-rdf#IsServer"
@@ -788,7 +788,7 @@ Rights Reserved.
 				<rule nc:CanFileMessages="false" iscontainer="true" isempty="false">
 					<!-- note, there is no "file here" -->
 					<menupopup>
-						<menu uri="..."  class="folderMenuItem" value="rdf:http://home.netscape.com/NC-rdf#Name"
+						<menu uri="..."  class="folderMenuItem menu-iconic" value="rdf:http://home.netscape.com/NC-rdf#Name"
 						 SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
 						 BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"
 						 IsServer="rdf:http://home.netscape.com/NC-rdf#IsServer"
@@ -799,7 +799,7 @@ Rights Reserved.
 				</rule>
 				<rule nc:CanFileMessages="true">
 					<menupopup>
-						<menuitem uri="..." class="folderMenuItem" value="rdf:http://home.netscape.com/NC-rdf#Name" oncommand="MsgMoveMessage(event.target)" 
+						<menuitem uri="..." class="folderMenuItem menuitem-iconic" value="rdf:http://home.netscape.com/NC-rdf#Name" oncommand="MsgMoveMessage(event.target)" 
 						 SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
 						 BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"
 						 IsServer="rdf:http://home.netscape.com/NC-rdf#IsServer"
@@ -814,7 +814,7 @@ Rights Reserved.
 			<template>
 				<rule nc:CanFileMessages="true" iscontainer="true" isempty="false">
 					<menupopup>
-						<menu uri="..."  class="folderMenuItem" value="rdf:http://home.netscape.com/NC-rdf#Name"
+						<menu uri="..."  class="folderMenuItem menu-iconic" value="rdf:http://home.netscape.com/NC-rdf#Name"
 						 SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
 						 BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"
 						 IsServer="rdf:http://home.netscape.com/NC-rdf#IsServer"
@@ -837,7 +837,7 @@ Rights Reserved.
 				<rule nc:CanFileMessages="false" iscontainer="true" isempty="false">
 					<!-- note, there is no "file here" -->
 					<menupopup>
-						<menu uri="..."  class="folderMenuItem" value="rdf:http://home.netscape.com/NC-rdf#Name"
+						<menu uri="..."  class="folderMenuItem menu-iconic" value="rdf:http://home.netscape.com/NC-rdf#Name"
 						 SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
 						 BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"
 						 IsServer="rdf:http://home.netscape.com/NC-rdf#IsServer"
@@ -848,7 +848,7 @@ Rights Reserved.
 				</rule>
 				<rule nc:CanFileMessages="true">
 					<menupopup>
-						<menuitem uri="..." class="folderMenuItem" value="rdf:http://home.netscape.com/NC-rdf#Name" 
+						<menuitem uri="..." class="folderMenuItem menuitem-iconic" value="rdf:http://home.netscape.com/NC-rdf#Name" 
 						 oncommand="MsgCopyMessage(event.target)" 
 						 SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
 						 BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"
@@ -891,7 +891,7 @@ Rights Reserved.
 				<template> 
 					<rule nc:CanFileMessages="true" iscontainer="true" isempty="false">
 						<menupopup>
-							<menu uri="..."  class="folderMenuItem" value="rdf:http://home.netscape.com/NC-rdf#Name"
+							<menu uri="..."  class="folderMenuItem menu-iconic" value="rdf:http://home.netscape.com/NC-rdf#Name"
 							 SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
 							 BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"
 							 IsServer="rdf:http://home.netscape.com/NC-rdf#IsServer"
@@ -914,7 +914,7 @@ Rights Reserved.
 					<rule nc:CanFileMessages="false" iscontainer="true" isempty="false">
 					<!-- note, there is no "file here" -->
 						<menupopup>
-							<menu uri="..."  class="folderMenuItem" value="rdf:http://home.netscape.com/NC-rdf#Name"
+							<menu uri="..."  class="folderMenuItem menu-iconic" value="rdf:http://home.netscape.com/NC-rdf#Name"
 							 SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
 							 BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"
 							 IsServer="rdf:http://home.netscape.com/NC-rdf#IsServer"
@@ -925,7 +925,7 @@ Rights Reserved.
 					</rule>
 					<rule nc:CanFileMessages="true">
 						<menupopup>
-							<menuitem uri="..." class="folderMenuItem" value="rdf:http://home.netscape.com/NC-rdf#Name" oncommand="MsgMoveMessage(event.target)" 
+							<menuitem uri="..." class="folderMenuItem menuitem-iconic" value="rdf:http://home.netscape.com/NC-rdf#Name" oncommand="MsgMoveMessage(event.target)" 
 							 SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
 							 BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"
 							 IsServer="rdf:http://home.netscape.com/NC-rdf#IsServer"

mailnews/base/resources/content/msgFolderPickerOverlay.xul

@@ -33,7 +33,7 @@ Rights Reserved.
         <template>
           <rule nc:CanCreateSubfolders="true" iscontainer="true" isempty="false">
             <menupopup>
-              <menu uri="..." class="folderMenuItem" value="rdf:http://home.netscape.com/NC-rdf#Name" 
+              <menu uri="..." class="folderMenuItem menu-iconic" value="rdf:http://home.netscape.com/NC-rdf#Name" 
                                 oncommand="PickedMsgFolder(event.target,'msgNewFolderPicker')"
 				SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
                                 BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"
@@ -57,7 +57,7 @@ Rights Reserved.
 	  <!-- no subfolders for some inboxes -->	
 	  <rule nc:CanCreateSubfolders="false" iscontainer="true" isempty="true">
             <menupopup>
-                        <menuitem disabled="true" uri="..." class="folderMenuItem" value="rdf:http://home.netscape.com/NC-rdf#Name"
+                        <menuitem disabled="true" uri="..." class="folderMenuItem menuitem-iconic" value="rdf:http://home.netscape.com/NC-rdf#Name"
                                 SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
                                 BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"
                                 IsServer="rdf:http://home.netscape.com/NC-rdf#IsServer"
@@ -66,7 +66,7 @@ Rights Reserved.
 	  </rule>
           <rule nc:CanCreateSubfolders="true">
             <menupopup>
-                        <menuitem uri="..." class="folderMenuItem" value="rdf:http://home.netscape.com/NC-rdf#Name" 
+                        <menuitem uri="..." class="folderMenuItem menuitem-iconic" value="rdf:http://home.netscape.com/NC-rdf#Name" 
                                 oncommand="PickedMsgFolder(event.target,'msgNewFolderPicker')"
 				SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
                                 BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"
@@ -83,7 +83,7 @@ Rights Reserved.
         <template>
           <rule nc:CanRename="true" iscontainer="true" isempty="false">
             <menupopup>
-              <menu uri="..." class="folderMenuItem" value="rdf:http://home.netscape.com/NC-rdf#Name" 
+              <menu uri="..." class="folderMenuItem menu-iconic" value="rdf:http://home.netscape.com/NC-rdf#Name" 
                                 oncommand="PickedMsgFolder(event.target,'msgRenameFolderPicker')"
 				SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
                                 BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"
@@ -107,7 +107,7 @@ Rights Reserved.
 	  <rule nc:CanRename="false" iscontainer="true" isempty="false">
 	    <!-- note, there is no "file here" -->
             <menupopup>
-              <menu uri="..." class="folderMenuItem" value="rdf:http://home.netscape.com/NC-rdf#Name"
+              <menu uri="..." class="folderMenuItem menu-iconic" value="rdf:http://home.netscape.com/NC-rdf#Name"
                                 oncommand="PickedMsgFolder(event.target,'msgRenameFolderPicker')"
                                 SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
                                 BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"
@@ -121,7 +121,7 @@ Rights Reserved.
 		like TRASH and INBOX show up, but they are disabled -->
 	  <rule nc:CanRename="false" iscontainer="true" isempty="true">
             <menupopup>
-                        <menuitem disabled="true" uri="..." class="folderMenuItem" value="rdf:http://home.netscape.com/NC-rdf#Name"
+                        <menuitem disabled="true" uri="..." class="folderMenuItem menuitem-iconic" value="rdf:http://home.netscape.com/NC-rdf#Name"
                                 SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
                                 BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"
                                 IsServer="rdf:http://home.netscape.com/NC-rdf#IsServer"
@@ -130,7 +130,7 @@ Rights Reserved.
           </rule>
           <rule nc:CanRename="true">
             <menupopup>
-                        <menuitem uri="..." class="folderMenuItem" value="rdf:http://home.netscape.com/NC-rdf#Name" 
+                        <menuitem uri="..." class="folderMenuItem menuitem-iconic" value="rdf:http://home.netscape.com/NC-rdf#Name" 
                                 oncommand="PickedMsgFolder(event.target,'msgRenameFolderPicker')"
 				SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
                                 BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"
@@ -147,7 +147,7 @@ Rights Reserved.
         <template>
           <rule nc:CanFileMessages="true" iscontainer="true" isempty="false">
             <menupopup>
-              <menu uri="..." class="folderMenuItem" value="rdf:http://home.netscape.com/NC-rdf#Name" 
+              <menu uri="..." class="folderMenuItem menu-iconic" value="rdf:http://home.netscape.com/NC-rdf#Name" 
                                 oncommand="PickedMsgFolder(event.target,'msgFccFolderPicker')"
 				SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
                                 BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"
@@ -171,7 +171,7 @@ Rights Reserved.
 	  <rule nc:CanFileMessages="false" iscontainer="true" isempty="false">
 	    <!-- note, there is no "file here" -->
             <menupopup>
-              <menu uri="..." class="folderMenuItem" value="rdf:http://home.netscape.com/NC-rdf#Name"
+              <menu uri="..." class="folderMenuItem menu-iconic" value="rdf:http://home.netscape.com/NC-rdf#Name"
                                 oncommand="PickedMsgFolder(event.target,'msgFccFolderPicker')"
                                 SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
                                 BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"
@@ -183,7 +183,7 @@ Rights Reserved.
           </rule>
           <rule nc:CanFileMessages="true">
             <menupopup>
-                        <menuitem uri="..." class="folderMenuItem" value="rdf:http://home.netscape.com/NC-rdf#Name" 
+                        <menuitem uri="..." class="folderMenuItem menuitem-iconic" value="rdf:http://home.netscape.com/NC-rdf#Name" 
                                 oncommand="PickedMsgFolder(event.target,'msgFccFolderPicker')"
 				SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
                                 BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"
@@ -200,7 +200,7 @@ Rights Reserved.
         <template>
           <rule nc:CanFileMessages="true" iscontainer="true" isempty="false">
             <menupopup>
-              <menu uri="..." class="folderMenuItem" value="rdf:http://home.netscape.com/NC-rdf#Name" 
+              <menu uri="..." class="folderMenuItem menu-iconic" value="rdf:http://home.netscape.com/NC-rdf#Name" 
                                 oncommand="PickedMsgFolder(event.target,'msgDraftsFolderPicker')"
 				SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
                                 BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"
@@ -224,7 +224,7 @@ Rights Reserved.
 	  <rule nc:CanFileMessages="false" iscontainer="true" isempty="false">
 	    <!-- note, there is no "file here" -->
             <menupopup>
-              <menu uri="..." class="folderMenuItem" value="rdf:http://home.netscape.com/NC-rdf#Name"
+              <menu uri="..." class="folderMenuItem menu-iconic" value="rdf:http://home.netscape.com/NC-rdf#Name"
                                 oncommand="PickedMsgFolder(event.target,'msgDraftsFolderPicker')"
                                 SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
                                 BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"
@@ -236,7 +236,7 @@ Rights Reserved.
           </rule>
           <rule nc:CanFileMessages="true">
             <menupopup>
-                        <menuitem uri="..." class="folderMenuItem" value="rdf:http://home.netscape.com/NC-rdf#Name" 
+                        <menuitem uri="..." class="folderMenuItem menuitem-iconic" value="rdf:http://home.netscape.com/NC-rdf#Name" 
                                 oncommand="PickedMsgFolder(event.target,'msgDraftsFolderPicker')"
 				SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
                                 BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"
@@ -253,7 +253,7 @@ Rights Reserved.
         <template>
           <rule nc:CanFileMessages="true" iscontainer="true" isempty="false">
             <menupopup>
-              <menu uri="..." class="folderMenuItem" value="rdf:http://home.netscape.com/NC-rdf#Name" 
+              <menu uri="..." class="folderMenuItem menuitem-iconic" value="rdf:http://home.netscape.com/NC-rdf#Name" 
                                 oncommand="PickedMsgFolder(event.target,'msgStationeryFolderPicker')"
 				SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
                                 BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"
@@ -277,7 +277,7 @@ Rights Reserved.
 	  <rule nc:CanFileMessages="false" iscontainer="true" isempty="false">
 	    <!-- note, there is no "file here" -->
             <menupopup>
-              <menu uri="..." class="folderMenuItem" value="rdf:http://home.netscape.com/NC-rdf#Name"
+              <menu uri="..." class="folderMenuItem menu-iconic" value="rdf:http://home.netscape.com/NC-rdf#Name"
                                 oncommand="PickedMsgFolder(event.target,'msgStationeryFolderPicker')"
                                 SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
                                 BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"
@@ -289,7 +289,7 @@ Rights Reserved.
           </rule>
           <rule nc:CanFileMessages="true">
             <menupopup>
-                        <menuitem uri="..." class="folderMenuItem" value="rdf:http://home.netscape.com/NC-rdf#Name" 
+                        <menuitem uri="..." class="folderMenuItem menuitem-iconic" value="rdf:http://home.netscape.com/NC-rdf#Name" 
                                 oncommand="PickedMsgFolder(event.target,'msgStationeryFolderPicker')"
 				SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
                                 BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"

profile/resources/content/profileSelection.js

@@ -103,6 +103,7 @@ function AddItem( aChildren, aProfileObject )
   var cell    = document.createElement("treecell");
   cell.setAttribute("value", aProfileObject.mName );
   cell.setAttribute("rowMigrate",  aProfileObject.mMigrated );
+  cell.setAttribute("class", "treecell-iconic");
   row.appendChild(cell);
   item.appendChild(row);
   item.setAttribute("profile_name", aProfileObject.mName );

themes/classic/communicator/bookmarks/bookmarks.css

@@ -182,7 +182,7 @@
     }
 
   .treeitem-bookmark[type="http://home.netscape.com/NC-rdf#Folder"],
-  .treeitem-bookmark[container="true"][open="true"]
+  .treeitem-bookmark[container="true"]
     {
       list-style-image    : url("chrome://communicator/skin/bookmarks/bookmark-folder-closed.gif");
     }
@@ -212,11 +212,6 @@
       list-style-image    : url("chrome://communicator/skin/bookmarks/location.gif");
     }
 
-  .treeitem-bookmark[type="http://home.netscape.com/NC-rdf#IEFavorite"]
-    {
-      list-style-image    : url("chrome://communicator/skin/bookmarks/iefavorite.gif");
-    }
-
   .treeitem-bookmark[type="http://home.netscape.com/NC-rdf#Bookmark"]
     {
       list-style-image    : url("chrome://communicator/skin/bookmarks/location.gif");
@@ -240,12 +235,6 @@
       list-style-image    : url("chrome://communicator/skin/directory/file-icon.gif");
     }
 
-  .treeitem-bookmark[type="http://home.netscape.com/NC-rdf#IEFavoriteFolder"],
-  .treeitem-bookmark[type="http://home.netscape.com/NC-rdf#IEFavoriteFolder"][open="true"]
-    {
-	    list-style-image    : url("chrome://communicator/skin/bookmarks/iefolder.gif");
-    }
-
 /**
  * Bookmarks tree 
  **/    

themes/modern/communicator/bookmarks/bookmarks.css

@@ -70,7 +70,7 @@ treeitem[status="new"] > treerow > .treecell-bookmark
 
 treeitem[type="http://home.netscape.com/NC-rdf#Folder"] > treerow > .treecell-bookmark,
 treeitem[type="http://home.netscape.com/NC-rdf#IEFavoriteFolder"] > treerow > .treecell-bookmark,
-treeitem[container="true"][open="true"] > treerow > .treecell-bookmark
+treeitem[container="true"] > treerow > .treecell-bookmark
 {
  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-closed.gif");
 }
@@ -123,11 +123,6 @@ treeitem[type="http://home.netscape.com/NC-rdf#BookmarkSeparator"] > treerow > .
  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-item.gif");
 }
 
-treeitem[type="http://home.netscape.com/NC-rdf#IEFavorite"] > treerow > .treecell-bookmark
-{
- list-style-image: url("chrome://communicator/skin/bookmarks/iefavorite.gif");
-}
-
 treeitem[type="http://home.netscape.com/NC-rdf#Bookmark"] > treerow > .treecell-bookmark
 {
  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-item.gif");

themes/modern/communicator/directory/directory.css

@@ -37,28 +37,15 @@
     list-style-image      : url("chrome://communicator/skin/directory/file-icon.gif");
   }  
   
-treeitem[selected="true"] > treerow > .treecell-filename
-  {
-    list-style-image      : url("chrome://communicator/skin/directory/file-icon-sel.gif");
-  }
-  
 treeitem[container="true"] > treerow > .treecell-filename
   {
     list-style-image      : url("chrome://communicator/skin/directory/file-folder-closed.gif");
   }
-treeitem[container="true"][selected="true"] > treerow > .treecell-filename
-  {
-    list-style-image      : url("chrome://communicator/skin/directory/file-folder-closed-sel.gif");
-  }
 
 treeitem[container="true"][open="true"] > treerow > .treecell-filename
   {
     list-style-image      : url("chrome://communicator/skin/directory/file-folder-open.gif");
   }
-treeitem[container="true"][open="true"][selected="true"] > treerow > .treecell-filename
-  {
-    list-style-image      : url("chrome://communicator/skin/directory/file-folder-open-sel.gif");
-  }
   
   
 /* Show an animated icon when a directory/symlink is loading */

themes/modern/communicator/profile/profile.css

@@ -34,8 +34,11 @@ window.dialog {
   color: #99cccc ! important;
 } 
 
-/** icon courtesy of chris nelson, chrisn@statecollege.com **/
-treeitem[rowMigrate="no"] > treerow > treecell > .tree-button {
+#profiles > treechildren > treeitem > treerow > treecell > .tree-cell-icon {
+  list-style-image: url("chrome://communicator/skin/profile/profileicon-large.gif");
+}
+
+#profiles > treechildren > treeitem > treerow > treecell[rowMigrate="no"] > .tree-cell-icon {
   list-style-image: url("chrome://communicator/skin/profile/migrate.gif");
 }
 

themes/modern/communicator/tasksOverlay.css

@@ -23,6 +23,11 @@
 	  list-style-image      : url("chrome://global/skin/taskbar-mailnew.gif");
   }
 
+#mini-mail[BiffState="NewMail"]:hover:active
+  {
+	  list-style-image      : url("chrome://global/skin/taskbar-mailnew-clicked.gif");
+  }
+
 #mini-addr 
   {
 	  list-style-image      : url("chrome://global/skin/taskbar-addressbook.gif");

themes/modern/global/tree.css

@@ -119,10 +119,6 @@ tree:focus > treechildren treeitem[selected="true"][current="true"] > treerow {
   border: 1px solid #AECDCD;
 }
 
-treeitem[selected="true"] > treerow > treecell > .tree-cell-twisty {
-  list-style-image: url("chrome://global/skin/closedtwisty-selected.gif");
-}
-
 .tree-cell-twisty:hover {
  text-decoration: none;
 }
@@ -139,11 +135,6 @@ treeitem[container="true"][open="true"] > treerow > treecell > .tree-cell-twisty
  list-style-image: url("chrome://global/skin/opentwisty.gif");
 }
 
-treeitem[selected="true"][container="true"][open="true"] > treerow > treecell > .tree-cell-twisty {
-  list-style-image: url("chrome://global/skin/opentwisty-selected.gif");
-}
-
-
 /* tree header with sort direction indicators */
 .sortDirectionIndicator[sortDirection="ascending"]  > .tree-header-sortdirection {
   list-style-image: url("chrome://global/skin/sortAscending.gif");

themes/modern/jar.mn

@@ -163,6 +163,7 @@ modern.jar:
     skin/modern/global/taskbar-composer.gif                           (global/taskbar-composer.gif)
     skin/modern/global/taskbar-mail.gif                               (global/taskbar-mail.gif)
     skin/modern/global/taskbar-mailnew.gif                            (global/taskbar-mailnew.gif)
+    skin/modern/global/taskbar-mailnew-clicked.gif                            (global/taskbar-mailnew-clicked.gif)
     skin/modern/global/taskbar-navigator.gif                          (global/taskbar-navigator.gif)
     skin/modern/global/taskbar-popup-arrow.gif                        (global/taskbar-popup-arrow.gif)
     skin/modern/global/taskbar-tab-hover.gif                          (global/taskbar-tab-hover.gif)
@@ -385,7 +386,6 @@ modern.jar:
     skin/modern/messenger/folder-inbox-share.gif                      (messenger/folder-inbox-share.gif)
     skin/modern/messenger/folder-inbox.gif                            (messenger/folder-inbox.gif)
     skin/modern/messenger/folder-mailserver.gif                       (messenger/folder-mailserver.gif)
-    skin/modern/messenger/folder-new-closed.gif                       (messenger/folder-new-closed.gif)
     skin/modern/messenger/folder-new-open.gif                         (messenger/folder-new-open.gif)
     skin/modern/messenger/folder-new.gif                              (messenger/folder-new.gif)
     skin/modern/messenger/folder-newsgroup-new.gif                    (messenger/folder-newsgroup-new.gif)
@@ -711,6 +711,8 @@ modern.jar:
     skin/modern/editor/images/right_hover.gif                         (editor/images/right_hover.gif)
     skin/modern/editor/images/underline_active.gif                    (editor/images/underline_active.gif)
     skin/modern/editor/images/underline_hover.gif                     (editor/images/underline_hover.gif)
+    skin/modern/messenger/addressbook/directory.gif                   (messenger/addressbook/directory.gif)
+    skin/modern/messenger/addressbook/directory-open.gif              (messenger/addressbook/directory-open.gif)
     skin/modern/messenger/addressbook/abnewmsg.gif                    (messenger/addressbook/abnewmsg.gif)
     skin/modern/messenger/addressbook/addressbook.css                 (messenger/addressbook/addressbook.css)
     skin/modern/messenger/addressbook/edit.gif                        (messenger/addressbook/edit.gif)

themes/modern/messenger/addressbook/addressbook.css

@@ -115,10 +115,12 @@ tree[class="abDirectory"] treeitem > treerow > treecell > .tree-cell-primary-ico
 	list-style-image: url("chrome://messenger/skin/addressbook/myaddrbk.gif");
 }
 
+tree[class="abDirectory"] treeitem > treerow > treecell[IsMailList="true"] > .tree-cell-primary-icon {
+	list-style-image: url("chrome://messenger/skin/addressbook/list.gif");
+}
+
 tree[class="abResults"] treeitem > treerow > treecell.cardicon {
 	list-style-image: url("chrome://messenger/skin/addressbook/person.gif");
-	height: 14px;
-	min-height: 14px;
 }
 
 

themes/modern/messenger/folderPane.css

@@ -24,7 +24,7 @@
  list-style-image: url("chrome://messenger/skin/folder-closed.gif");
 }
 
-treeitem.folderTreeItem[open="true"] > treerow > .tree-cell-folderpane-icon
+.folderTreeItem[selected="true"] > treerow > .tree-cell-folderpane-icon
 {
  list-style-image: url("chrome://messenger/skin/folder-open.gif");
 }
@@ -35,17 +35,57 @@ treeitem.folderTreeItem[open="true"] > treerow > .tree-cell-folderpane-icon
  list-style-image: url("chrome://messenger/skin/folder-inbox.gif");
 }
 
+.folderTreeItem[selected="true"][SpecialFolder="Inbox"] > treerow > .tree-cell-folderpane-icon
+{
+ list-style-image: url("chrome://messenger/skin/folder-inbox-open.gif");
+}
+
+.tree-cell-folderpane-icon[SpecialFolder="Sent"]
+{
+ list-style-image: url("chrome://messenger/skin/folder-sent.gif");
+}
+
+.folderTreeItem[selected="true"][SpecialFolder="Sent"] > treerow > .tree-cell-folderpane-icon
+{
+ list-style-image: url("chrome://messenger/skin/folder-sent-open.gif");
+}
+
+.tree-cell-folderpane-icon[SpecialFolder="Drafts"]
+{
+ list-style-image: url("chrome://messenger/skin/folder-draft.gif");
+}
+
+.folderTreeItem[selected="true"][SpecialFolder="Drafts"] > treerow > .tree-cell-folderpane-icon
+{
+ list-style-image: url("chrome://messenger/skin/folder-draft-open.gif");
+}
+
+.tree-cell-folderpane-icon[SpecialFolder="Templates"]
+{
+ list-style-image: url("chrome://messenger/skin/folder-template.gif");
+}
+
+.folderTreeItem[selected="true"][SpecialFolder="Templates"] > treerow > .tree-cell-folderpane-icon
+{
+ list-style-image: url("chrome://messenger/skin/folder-template-open.gif");
+}
+
 .tree-cell-folderpane-icon[SpecialFolder="Trash"]
 {
  list-style-image: url("chrome://messenger/skin/folder-trash.gif");
 }
 
+.folderTreeItem[selected="true"][SpecialFolder="Trash"] > treerow > .tree-cell-folderpane-icon
+{
+ list-style-image: url("chrome://messenger/skin/folder-trash-open.gif");
+}
+
 .tree-cell-folderpane-icon[IsServer="true"]
 {
  list-style-image: url("chrome://messenger/skin/server-mail.gif");
 }
 
-treeitem.folderTreeItem[open="true"] > treerow > .tree-cell-folderpane-icon[IsServer="true"]
+.folderTreeItem[selected="true"] > treerow > .tree-cell-folderpane-icon[IsServer="true"]
 {
  list-style-image: url("chrome://messenger/skin/server-mail.gif");
 }
@@ -55,7 +95,7 @@ treeitem.folderTreeItem[open="true"] > treerow > .tree-cell-folderpane-icon[IsSe
  list-style-image: url("chrome://messenger/skin/server-mail-new.gif");
 }
 
-treeitem[open="true"] > treerow > .tree-cell-folderpane-icon[BiffState="NewMail"][IsServer="true"]
+treeitem[selected="true"] > treerow > .tree-cell-folderpane-icon[BiffState="NewMail"][IsServer="true"]
 {
  list-style-image: url("chrome://messenger/skin/server-mail-new.gif");
 }
@@ -63,73 +103,57 @@ treeitem[open="true"] > treerow > .tree-cell-folderpane-icon[BiffState="NewMail"
 /* differentiate new messages on inbox/folders from biff on the server */
 .tree-cell-folderpane-icon[NewMessages="true"]
 {
-    list-style-image: url("chrome://messenger/skin/folder-new-closed.gif");
-	font-weight: bold;
+  list-style-image: url("chrome://messenger/skin/folder-new.gif");
+  font-weight: bold;
 }
 
-.tree-cell-folderpane-icon[SpecialFolder="Inbox"][NewMessages="true"]
-{
- list-style-image: url("chrome://messenger/skin/folder-inbox-new.gif");
- font-weight: bold;
-}
-
-treeitem[open="true"] > treerow > .tree-cell-folderpane-icon[NewMessages="true"]
+treeitem[selected="true"] > treerow > .tree-cell-folderpane-icon[NewMessages="true"]
 {
  list-style-image: url("chrome://messenger/skin/folder-new-open.gif");
  font-weight: bold;
 }
 
+.tree-cell-folderpane-icon[SpecialFolder="Inbox"][NewMessages="true"],
+treeitem[selected="true"] > treerow > .tree-cell-folderpane-icon[NewMessages="true"][SpecialFolder="Inbox"]
+{
+ list-style-image: url("chrome://messenger/skin/folder-inbox-new.gif");
+ font-weight: bold;
+}
 
 /* IMAP folders */
 
-.tree-cell-folderpane-icon[IsServer="true"][ServerType="imap"][IsSecure="true"]
+.tree-cell-folderpane-icon[IsServer="true"][ServerType="imap"][IsSecure="true"],
+.folderTreeItem[selected="true"] > treerow > .tree-cell-folderpane-icon[IsServer="true"][ServerType="imap"][IsSecure="true"]
 {
     list-style-image: url("chrome://messenger/skin/server-remote-lock.gif");
 }
 
-treeitem.folderTreeItem[open="true"] > treerow > .tree-cell-folderpane-icon[IsServer="true"][ServerType="imap"][IsSecure="true"]
-{
- list-style-image: url("chrome://messenger/skin/server-remote-lock.gif");
-}
-
 /* Local servers */
-.tree-cell-folderpane-icon[IsServer="true"][ServerType="none"] 
+.tree-cell-folderpane-icon[IsServer="true"][ServerType="none"],
+.folderTreeItem[selected="true"] > treerow > .tree-cell-folderpane-icon[IsServer="true"][ServerType="none"]
 {
  list-style-image: url("chrome://messenger/skin/server-local.gif");
 }
 
-treeitem.folderTreeItem[open="true"] > treerow > .tree-cell-folderpane-icon[IsServer="true"][ServerType="none"]
-{
- list-style-image: url("chrome://messenger/skin/server-local.gif");
-}
-
-
 /* News folders */
-.tree-cell-folderpane-icon[ServerType="nntp"]
+.tree-cell-folderpane-icon[ServerType="nntp"],
+.folderTreeItem[selected="true"] > treerow > .tree-cell-folderpane-icon[ServerType="nntp"]
 {
     list-style-image: url("chrome://messenger/skin/folder-newsgroup.gif");
 }
 
-.tree-cell-folderpane-icon[IsServer="true"][ServerType="nntp"][IsSecure="true"]
+.tree-cell-folderpane-icon[IsServer="true"][ServerType="nntp"][IsSecure="true"],
+.folderTreeItem[selected="true"] > treerow > .tree-cell-folderpane-icon[IsServer="true"][ServerType="nntp"][IsSecure="true"]
 {
     list-style-image: url("chrome://messenger/skin/server-news-lock.gif");
 }
 
-treeitem.folderTreeItem[open="true"] > treerow > .tree-cell-folderpane-icon[IsServer="true"][ServerType="nntp"][IsSecure="true"]
-{
- list-style-image: url("chrome://messenger/skin/server-news-lock.gif");
-}
-
-.tree-cell-folderpane-icon[IsServer="true"][ServerType="nntp"] 
+.tree-cell-folderpane-icon[IsServer="true"][ServerType="nntp"],
+.folderTreeItem[selected="true"] > treerow > .tree-cell-folderpane-icon[IsServer="true"][ServerType="nntp"]
 {
     list-style-image: url("chrome://messenger/skin/server-news.gif");
 }
 
-treeitem.folderTreeItem[open="true"] > treerow > .tree-cell-folderpane-icon[IsServer="true"][ServerType="nntp"]
-{
- list-style-image: url("chrome://messenger/skin/server-news.gif");
-}
-
 /*All Servers*/
 .tree-folder-row[IsServer="true"]
 {

themes/modern/messenger/messenger.css

@@ -311,40 +311,59 @@ menu[open="true"] > #button-file
     list-style-image      : url("chrome://global/skin/stop-clicked.gif");
   }
 
+/* .......... folderPane icons ..................... */
 
-.folderMenuItem > .menu-left {
+.folderMenuItem > .menu-iconic-left {
  list-style-image: url("chrome://messenger/skin/folder-closed.gif");
 }
 
-.folderMenuItem[open="true"] > .menu-left {
+.folderMenuItem[open="true"] > .menu-iconic-left {
  list-style-image: url("chrome://messenger/skin/folder-open.gif");
 }
 
-/* special folder */
-.folderMenuItem[SpecialFolder="Inbox"] > .menu-left {
+/* special folders */
+
+.folderMenuItem[SpecialFolder="Inbox"] > .menu-iconic-left {
  list-style-image: url("chrome://messenger/skin/folder-inbox.gif");
 }
 
-.folderMenuItem[SpecialFolder="Inbox"][open="true"] > .menu-left
-{
-    list-style-image: url("chrome://messenger/skin/folder-inbox.gif");
+.folderMenuItem[SpecialFolder="Inbox"][open="true"] > .menu-iconic-left {
+ list-style-image: url("chrome://messenger/skin/folder-inbox-open.gif");
 }
 
-.folderMenuItem[SpecialFolder="Trash"] > .menu-left {
+.folderMenuItem[SpecialFolder="Sent"] > .menu-iconic-left {
+ list-style-image: url("chrome://messenger/skin/folder-sent.gif");
+}
+
+.folderMenuItem[SpecialFolder="Sent"][open="true"] > .menu-iconic-left {
+ list-style-image: url("chrome://messenger/skin/folder-sent-open.gif");
+}
+
+.folderMenuItem[SpecialFolder="Drafts"] > .menu-iconic-left {
+ list-style-image: url("chrome://messenger/skin/folder-draft.gif");
+}
+
+.folderMenuItem[SpecialFolder="Drafts"][open="true"] > .menu-iconic-left {
+ list-style-image: url("chrome://messenger/skin/folder-draft-open.gif");
+}
+
+.folderMenuItem[SpecialFolder="Templates"] > .menu-iconic-left {
+ list-style-image: url("chrome://messenger/skin/folder-template.gif");
+}
+
+.folderMenuItem[SpecialFolder="Templates"][open="true"] > .menu-iconic-left {
+ list-style-image: url("chrome://messenger/skin/folder-template-open.gif");
+}
+
+.folderMenuItem[SpecialFolder="Trash"] > .menu-iconic-left {
  list-style-image: url("chrome://messenger/skin/folder-trash.gif");
 }
 
-.folderMenuItem[SpecialFolder="Trash"][open="true"] > .menu-left {
- list-style-image: url("chrome://messenger/skin/folder-trash.gif");
+.folderMenuItem[SpecialFolder="Trash"][open="true"] > .menu-iconic-left {
+ list-style-image: url("chrome://messenger/skin/folder-trash-open.gif");
 }
 
-.folderMenuItem[IsServer="true"] > .menu-left
-{
- list-style-image: url("chrome://messenger/skin/server-mail.gif");
-}
-
-.folderMenuItem[IsServer="true"][open="true"] > .menu-left
-{
+.folderMenuItem[IsServer="true"] > .menu-iconic-left {
  list-style-image: url("chrome://messenger/skin/server-mail.gif");
 }
 
@@ -355,21 +374,21 @@ menu[open="true"] > #button-file
 }
 
 /* Local Servers */
-.folderMenuItem[IsServer="true"][ServerType="none"] > .menu-left
+.folderMenuItem[IsServer="true"][ServerType="none"] > .menu-iconic-left
 {
  list-style-image: url("chrome://messenger/skin/server-local.gif");
 }
 
 /* News folders */
-.folderMenuItem[ServerType="nntp"] > .menu-left {
+.folderMenuItem[ServerType="nntp"] > .menu-iconic-left {
     list-style-image: url("chrome://messenger/skin/folder-newsgroup.gif");
 }
 
-.folderMenuItem[IsServer="true"][ServerType="nntp"][IsSecure="true"] > .menu-left {
+.folderMenuItem[IsServer="true"][ServerType="nntp"][IsSecure="true"] > .menu-iconic-left {
     list-style-image: url("chrome://messenger/skin/server-news-lock.gif");
 }
 
-.folderMenuItem[IsServer="true"][ServerType="nntp"] > .menu-left {
+.folderMenuItem[IsServer="true"][ServerType="nntp"] > .menu-iconic-left {
     list-style-image: url("chrome://messenger/skin/server-news.gif");
 }