diff --git a/editor/ui/composer/skin/MANIFEST b/editor/ui/composer/skin/MANIFEST
index 1969348bee60..dc581a412f0a 100644
--- a/editor/ui/composer/skin/MANIFEST
+++ b/editor/ui/composer/skin/MANIFEST
@@ -24,53 +24,53 @@ Editor.css
 
 #skin directory
 
-images:ED_Center.gif
-images:ED_Copy.gif
-images:ED_HLine.gif
-images:ED_Indent.gif
-images:ED_Left.gif
-images:ED_Center.gif
-images:ED_Right.gif
-images:ED_Justify.gif
-images:ED_Numbers.gif
-images:ED_Redo.gif
-images:ED_Spell.gif
-images:ED_Target.gif
-images:ED_Undo.gif
-images:ED_Bullets.gif
-images:ED_Copy.gif
-images:ED_Cut.gif
-images:ED_Outdent.gif
-images:ED_Find.gif
-images:ED_HLine.gif
-images:ED_Image.gif
-images:ED_imgalignbottom.gif
-images:ED_imgalignleft.gif
-images:ED_imgalignmiddle.gif
-images:ED_imgalignright.gif
-images:ED_imgaligntop.gif
-images:ED_Indent.gif
-images:ED_Italic.gif
-images:ED_Left.gif
-images:ED_Link.gif
-images:ED_Numbers.gif
-images:ED_Paste.gif
-images:ED_Redo.gif
-images:ED_Spell.gif
-images:ED_Table.gif
-images:ED_Target.gif
-images:ED_Underline.gif
-images:ED_Undo.gif
-images:ED_Bold.gif
-images:ED_TextColor.gif
-images:ED_BackColor.gif
-images:ED_Align.gif
-images:ED_ObjectPopup.gif
-images:ED_NewFile.gif
-images:ED_OpenFile.gif
-images:ED_SaveFile.gif
-images:ED_SaveMod.gif
-images:ED_Publish.gif
-images:ED_Preview.gif
-images:ED_Print.gif
-images:ED_Find.gif
\ No newline at end of file
+images:center.gif
+images:copy.gif
+images:hline.gif
+images:indent.gif
+images:left.gif
+images:center.gif
+images:right.gif
+images:justify.gif
+images:numbers.gif
+images:redo.gif
+images:spell.gif
+images:target.gif
+images:undo.gif
+images:bullets.gif
+images:copy.gif
+images:cut.gif
+images:outdent.dif
+images:find.gif
+images:hline.gif
+images:image.gif
+images:img-align-bottom.gif
+images:img-align-left.gif
+images:img-align-middle.gif
+images:img-align-right.gif
+images:img-align-top.gif
+images:indent.gif
+images:italic.gif
+images:left.gif
+images:link.gif
+images:numbers.gif
+images:paste.gif
+images:redo.gif
+images:spell.gif
+images:table.gif
+images:target.gif
+images:underline.gif
+images:undo.gif
+images:bold.gif
+images:text-color.gif
+images:backcolor.gif
+images:align.gif
+images:object-popup.gif
+images:newfile.gif
+images:openfile.gif
+images:savefile.gif
+images:savemod.gif
+images:publish.gif
+images:preview.gif
+images:print.gif
+images:find.gif
\ No newline at end of file
diff --git a/mailnews/base/resources/skin/MANIFEST b/mailnews/base/resources/skin/MANIFEST
index 2957610e351d..d8874f45d39a 100644
--- a/mailnews/base/resources/skin/MANIFEST
+++ b/mailnews/base/resources/skin/MANIFEST
@@ -20,12 +20,12 @@ messenger.css
 folderPane.css
 threadPane.css
 subscribe.css
-closedMailFolder.gif
-openMailFolder.gif
-mailMessage.gif
-closedInbox.gif
-closedTrash.gif
-closedOutbox.gif
+mailfolder.gif
+open-mailfolder.gif
+mail-message.gif
+inbox.gif
+trash.gif
+outbox.gif
 getmsg.gif
 newmsg.gif
 reply.gif
@@ -34,7 +34,7 @@ forward.gif
 trash.gif
 check.gif
 dot.gif
-folderHasMail.gif
+folder-hasmail.gif
 readcol.gif
 readmail.gif
 unreadmail.gif
@@ -44,42 +44,42 @@ unthreadcol.gif
 flagcol.gif
 flaggedmail.gif
 Folder.gif
-FolderDraft.gif
-FolderDraftO.gif
-FolderDraftShare.gif
-FolderDraftShareO.gif
-FolderFiled.gif
-FolderFiledO.gif
-FolderInbox.gif
-FolderInboxNew.gif
-FolderInboxO.gif
-FolderInboxShare.gif
-FolderInboxShareO.gif
-FolderMailServer.gif
-FolderNew.gif
-FolderNewO.gif
-FolderNewsgroup.gif
-FolderNewsgroupNew.gif
-FolderO.gif
-FolderOutbox.gif
-FolderOutboxO.gif
-FolderSent.gif
-FolderSentO.gif
-FolderSentShare.gif
-FolderSentShareO.gif
-FolderServer.gif
-FolderServerO.gif
-FolderShare.gif
-FolderShareO.gif
-FolderTemplate.gif
-FolderTemplateO.gif
-FolderTemplateShare.gif
-FolderTemplateShareO.gif
-FolderTrash.gif
-FolderTrashO.gif
-FolderTrashShare.gif
-FolderTrashShareO.gif
-Server.gif
-ServerNews.gif
-ServerNewsLock.gif
-ServerRemote.gif
+folder-draft.gif
+folder-draft-open.gif
+folder-draft-share.gif
+folder-draft-share-open.gif
+folder-filed.gif
+folder-filed-open.gif
+folder-inbox.gif
+folder-inbox-new.gif
+folder-inbox-open.gif
+folder-inbox-share.gif
+folder-inbox-share-open.gif
+folder-mailserver.gif
+folder-new.gif
+folder-new-open.gif
+folder-newsgroup.gif
+folder-newsgroup-new.gif
+folder-open.gif
+folder-outbox.gif
+folder-outbox-open.gif
+folder-sent.gif
+folder-sent-open.gif
+folder-sent-share.gif
+folder-sent-share-open.gif
+folder-server.gif
+folder-server-open.gif
+folder-share.gif
+folder-share-open.gif
+folder-template.gif
+folder-template-open.gif
+folder-template-share.gif
+folder-template-share-open.gif
+folder-trash.gif
+folder-trash-open.gif
+folder-trash-share.gif
+folder-trash-share-open.gif
+server.gif
+server-news.gif
+server-news-lock.gif
+server-remote.gif
diff --git a/mailnews/local/resources/skin/MANIFEST b/mailnews/local/resources/skin/MANIFEST
index 9964c4ecde10..aeace1ba2159 100644
--- a/mailnews/local/resources/skin/MANIFEST
+++ b/mailnews/local/resources/skin/MANIFEST
@@ -16,6 +16,6 @@
 # This is a list of local files which get copied to the res\mailnews\messenger directory
 #
 
-localMailHost.gif
+local-mailhost.gif
 
 
diff --git a/mailnews/news/resources/skin/MANIFEST b/mailnews/news/resources/skin/MANIFEST
index 60469c4081e1..d27d2e1aa565 100644
--- a/mailnews/news/resources/skin/MANIFEST
+++ b/mailnews/news/resources/skin/MANIFEST
@@ -16,6 +16,6 @@
 # This is a list of local files which get copied to the res\mailnews\messenger directory
 #
 
-newsHost.gif
+newshost.gif
 
 
diff --git a/xpfe/global/resources/skin/MANIFEST b/xpfe/global/resources/skin/MANIFEST
index d6b27d83b120..0657757a3e10 100644
--- a/xpfe/global/resources/skin/MANIFEST
+++ b/xpfe/global/resources/skin/MANIFEST
@@ -6,12 +6,12 @@ lessCols_dis.gif
 moreCols.gif
 moreCols_mo.gif
 moreCols_dis.gif
-scrollUp.gif
-scrollUp_mo.gif
-scrollUp_dis.gif
-scrollDown.gif
-scrollDown_mo.gif
-scrollDown_dis.gif
+scroll-up.gif
+scroll-up-hover.gif
+scroll-up-disabled.gif
+scroll-down.gif
+scroll-down-hover.gif
+scroll-down-disabled.gif
 scroll-left.gif
 scroll-left-hover.gif
 scroll-left-disabled.gif
@@ -35,13 +35,13 @@ grippy-horizontal-after.gif
 grippy-horizontal-before.gif  
 grippy-vertical-after.gif  
 grippy-vertical-before.gif  
-TB_MiniAddr.gif  
-TB_MiniComp.gif  
-TB_MiniMail.gif  
-TB_MiniNav.gif  
-TB_MiniTab.gif  
-TB_Tab.gif  
-TB_popup.gif  
-TB_Tab_mo.gif  
+taskbar-addressbook.gif  
+taskbar-composer.gif  
+taskbar-mail.gif  
+taskbar-navigator.gif  
+taskbar-tab-minimized.gif  
+taskbar-tab.gif  
+taskbar-popup-arrow.gif  
+taskbar-tab-hover.gif  
 print.gif
 stop.gif