DTDs contain image names too

editor/ui/composer/locale/en-US/editorOverlay.dtd

@@ -424,19 +424,19 @@
 <!ENTITY toolspellcheck.accesskey "s">
 
 <!-- editor toolbar -->
-<!ENTITY newEditorIcon.url "chrome://editor/skin/images/ED_NewFile.gif">
-<!ENTITY openEditorIcon.url "chrome://editor/skin/images/ED_OpenFile.gif">
-<!ENTITY saveIcon.url "chrome://editor/skin/images/ED_SaveFile.gif">
-<!ENTITY publishIcon.url "chrome://editor/skin/images/ED_Publish.gif">
-<!ENTITY previewIcon.url "chrome://editor/skin/images/ED_Preview.gif">
-<!ENTITY printIcon.url "chrome://editor/skin/images/ED_Print.gif">
-<!ENTITY findIcon.url "chrome://editor/skin/images/ED_Find.gif">
-<!ENTITY linkIcon.url "chrome://editor/skin/images/ED_Link.gif">
-<!ENTITY imageIcon.url "chrome://editor/skin/images/ED_Image.gif">
-<!ENTITY targetIcon.url "chrome://editor/skin/images/ED_Target.gif">
-<!ENTITY hlineIcon.url "chrome://editor/skin/images/ED_HLine.gif">
-<!ENTITY tableIcon.url "chrome://editor/skin/images/ED_Table.gif">
-<!ENTITY spellingIcon.url "chrome://editor/skin/images/ED_Spell.gif">
+<!ENTITY newEditorIcon.url "chrome://editor/skin/images/newfile.gif">
+<!ENTITY openEditorIcon.url "chrome://editor/skin/images/openfile.gif">
+<!ENTITY saveIcon.url "chrome://editor/skin/images/savefile.gif">
+<!ENTITY publishIcon.url "chrome://editor/skin/images/publish.gif">
+<!ENTITY previewIcon.url "chrome://editor/skin/images/preview.gif">
+<!ENTITY printIcon.url "chrome://editor/skin/images/print.gif">
+<!ENTITY findIcon.url "chrome://editor/skin/images/find.gif">
+<!ENTITY linkIcon.url "chrome://editor/skin/images/link.gif">
+<!ENTITY imageIcon.url "chrome://editor/skin/images/image.gif">
+<!ENTITY targetIcon.url "chrome://editor/skin/images/target.gif">
+<!ENTITY hlineIcon.url "chrome://editor/skin/images/hline.gif">
+<!ENTITY tableIcon.url "chrome://editor/skin/images/table.gif">
+<!ENTITY spellingIcon.url "chrome://editor/skin/images/spell.gif">
 
 <!-- formatting toolbar -->
 <!ENTITY paragraphToolbarMenu.label "Paragraph">
@@ -445,11 +445,11 @@
 <!ENTITY formatToolbar.boldChar "B">
 <!ENTITY formatToolbar.italicChar "I">
 <!ENTITY formatToolbar.underlineChar "U">
-<!ENTITY bulletListIcon.url "chrome://editor/skin/images/ED_Bullets.gif">
-<!ENTITY numberListIcon.url "chrome://editor/skin/images/ED_Numbers.gif">
-<!ENTITY outdentIcon.url "chrome://editor/skin/images/ED_Outdent.gif">
-<!ENTITY indentIcon.url "chrome://editor/skin/images/ED_Indent.gif">
-<!ENTITY alignpopupIcon.url "chrome://editor/skin/images/ED_Align.gif">
+<!ENTITY bulletListIcon.url "chrome://editor/skin/images/bullets.gif">
+<!ENTITY numberListIcon.url "chrome://editor/skin/images/numbers.gif">
+<!ENTITY outdentIcon.url "chrome://editor/skin/images/outdent.dif">
+<!ENTITY indentIcon.url "chrome://editor/skin/images/indent.gif">
+<!ENTITY alignpopupIcon.url "chrome://editor/skin/images/align.gif">
 <!ENTITY alignLeft.label "Left">
 <!ENTITY alignCenter.label "Center">
 <!ENTITY alignRight.label "Right">

editor/ui/dialogs/locale/en-US/EditorImageProperties.dtd

@@ -55,11 +55,11 @@
 <!ENTITY centerPopup.value "in the center">
 <!ENTITY wrapRightPopup.value "wrap around right side">
 <!ENTITY wrapLeftPopup.value "wrap around left side">
-<!ENTITY bottomIcon.url "chrome://editor/skin/images/ED_imgalignbottom.gif">
-<!ENTITY topIcon.url "chrome://editor/skin/images/ED_imgaligntop.gif">
-<!ENTITY centerIcon.url "chrome://editor/skin/images/ED_imgalignmiddle.gif">
-<!ENTITY wrapRightIcon.url "chrome://editor/skin/images/ED_imgalignleft.gif">
-<!ENTITY wrapLeftIcon.url "chrome://editor/skin/images/ED_imgalignright.gif">
+<!ENTITY bottomIcon.url "chrome://editor/skin/images/img-align-bottom.gif">
+<!ENTITY topIcon.url "chrome://editor/skin/images/img-align-top.gif">
+<!ENTITY centerIcon.url "chrome://editor/skin/images/img-align-middle.gif">
+<!ENTITY wrapRightIcon.url "chrome://editor/skin/images/img-align-left.gif">
+<!ENTITY wrapLeftIcon.url "chrome://editor/skin/images/img-align-right.gif">
 
 <!-- These controls are in the Spacing Fieldset of the expanded area -->
 <!ENTITY spacingFieldset.label "Spacing">

mailnews/addrbook/resources/locale/en-US/abMainWindow.dtd

@@ -74,9 +74,9 @@ Rights Reserved.
 <!ENTITY newmsgButton.label "New Msg">  
 <!ENTITY deleteButton.img "chrome://messenger/skin/trash.gif">
 <!ENTITY deleteButton.label "Delete">  
-<!ENTITY stopButton.img "resource:/res/toolbar/TB_Stop.gif">
+<!ENTITY stopButton.img "chrome://global/skin/stop.gif">
 <!ENTITY stopButton.label ".Stop">  
-<!ENTITY searchButton.img "resource:/res/toolbar/TB_Search.gif">
+<!ENTITY searchButton.img "chrome://navigator/skin/search.gif">
 <!ENTITY searchButton.label ".Search">  
 <!ENTITY showNames.label "Show names containing:">  
 <!ENTITY throbber.img "resource:/res/throbber/anims00.gif">

mailnews/base/resources/locale/en-US/folderpane.dtd

@@ -22,4 +22,4 @@ Rights Reserved.
 <!ENTITY totalColumn.label "Total"> 
 <!ENTITY accounts.label "Accounts">
 <!-- LOCALIZATION NOTE (accounts.img) : do not translate below line -->
-<!ENTITY accounts.img "chrome://messenger/skin/localMailHost.gif">
+<!ENTITY accounts.img "chrome://messenger/skin/local-mailhost.gif">

suite/locales/en-US/chrome/mailnews/addressbook/abMainWindow.dtd

@@ -74,9 +74,9 @@ Rights Reserved.
 <!ENTITY newmsgButton.label "New Msg">  
 <!ENTITY deleteButton.img "chrome://messenger/skin/trash.gif">
 <!ENTITY deleteButton.label "Delete">  
-<!ENTITY stopButton.img "resource:/res/toolbar/TB_Stop.gif">
+<!ENTITY stopButton.img "chrome://global/skin/stop.gif">
 <!ENTITY stopButton.label ".Stop">  
-<!ENTITY searchButton.img "resource:/res/toolbar/TB_Search.gif">
+<!ENTITY searchButton.img "chrome://navigator/skin/search.gif">
 <!ENTITY searchButton.label ".Search">  
 <!ENTITY showNames.label "Show names containing:">  
 <!ENTITY throbber.img "resource:/res/throbber/anims00.gif">

suite/locales/en-US/chrome/mailnews/folderpane.dtd

@@ -22,4 +22,4 @@ Rights Reserved.
 <!ENTITY totalColumn.label "Total"> 
 <!ENTITY accounts.label "Accounts">
 <!-- LOCALIZATION NOTE (accounts.img) : do not translate below line -->
-<!ENTITY accounts.img "chrome://messenger/skin/localMailHost.gif">
+<!ENTITY accounts.img "chrome://messenger/skin/local-mailhost.gif">