diff --git a/build/mac/NGLayoutBuildList.pm b/build/mac/NGLayoutBuildList.pm
index 4c7c4320a26..fa27da67fd5 100644
--- a/build/mac/NGLayoutBuildList.pm
+++ b/build/mac/NGLayoutBuildList.pm
@@ -519,7 +519,6 @@ sub MakeResourceAliases()
 
 	_InstallResources(":mozilla:xpinstall:res:locale:en-US:MANIFEST",					"$xpinstall_locale_chrome_dir", 0);
 	_InstallResources(":mozilla:xpinstall:res:content:MANIFEST",						"$xpinstall_content_chrome_dir", 0);
-	_InstallResources(":mozilla:xpinstall:res:skin:MANIFEST",							"$xpinstall_skin_chrome_dir", 0);
 
 	# profile lives inside of the top level communicator dist dir
 
@@ -528,7 +527,6 @@ sub MakeResourceAliases()
 	my($profile_skin_chrome_dir) = "$communicator_skin_chrome_dir" . "profile";
 
 	_InstallResources(":mozilla:profile:resources:content:MANIFEST",					"$profile_content_chrome_dir", 0);
-	_InstallResources(":mozilla:profile:resources:skin:MANIFEST",						"$profile_skin_chrome_dir", 0);
 	_InstallResources(":mozilla:profile:resources:locale:en-US:MANIFEST",				"$profile_locale_chrome_dir", 0);
 	_InstallResources(":mozilla:profile:pref-migrator:resources:content:MANIFEST",		"$profile_content_chrome_dir", 0);
 	_InstallResources(":mozilla:profile:pref-migrator:resources:locale:en-US:MANIFEST", "$profile_locale_chrome_dir", 0);
@@ -556,7 +554,6 @@ sub MakeResourceAliases()
 	# NOTE: this will change as we move the toolbar/appshell chrome files to a real place
 
 	_InstallResources(":mozilla:xpfe:browser:resources:content:MANIFEST",				"$navigator_content_chrome_dir");
-	_InstallResources(":mozilla:xpfe:browser:resources:skin:MANIFEST",					"$navigator_skin_chrome_dir");
 	_InstallResources(":mozilla:xpfe:browser:resources:locale:en-US:MANIFEST",			"$navigator_locale_chrome_dir", 0);
 
 	#NECKO
@@ -567,18 +564,13 @@ sub MakeResourceAliases()
 	_InstallResources(":mozilla:extensions:psm-glue:res:content:MANIFEST_GLOBAL",		"$global_content_chrome_dir");
 	_InstallResources(":mozilla:extensions:psm-glue:res:content:MANIFEST_NAV",			"$navigator_content_chrome_dir");
 	_InstallResources(":mozilla:extensions:psm-glue:res:locale:en-US:MANIFEST",			"$global_locale_chrome_dir");
-	_InstallResources(":mozilla:extensions:psm-glue:res:skin:MANIFEST",					"$navigator_skin_chrome_dir");
 
 	_InstallResources(":mozilla:xpfe:global:resources:content:MANIFEST",				"$global_content_chrome_dir");
 	_InstallResources(":mozilla:xpfe:global:resources:content:mac:MANIFEST",			"$global_content_chrome_dir");
-	_InstallResources(":mozilla:xpfe:global:resources:skin:MANIFEST",					"$global_skin_chrome_dir");
-	_InstallResources(":mozilla:xpfe:global:resources:skin:mac:MANIFEST",				"$chrome_dir");
 	_InstallResources(":mozilla:xpfe:global:resources:skin:MANIFEST_CHROME",			"$chrome_dir");
 	_InstallResources(":mozilla:xpfe:global:resources:locale:en-US:MANIFEST",			"$global_locale_chrome_dir", 0);
 	_InstallResources(":mozilla:xpfe:global:resources:locale:en-US:mac:MANIFEST",		"$global_locale_chrome_dir", 0);
 
-	_InstallResources(":mozilla:xpfe:communicator:resources:skin:MANIFEST", "$communicator_skin_chrome_dir");
-
 	_InstallResources(":mozilla:docshell:base:MANIFEST",								"$global_locale_chrome_dir", 0);
 
 	my($layout_locale_hack_dir) = "$communicator_locale_chrome_dir"."layout:";
@@ -663,7 +655,6 @@ sub MakeResourceAliases()
 		my($bookmarks_skin_chrome_dir) = "$communicator_skin_chrome_dir"."bookmarks:";
 
 		_InstallResources(":mozilla:xpfe:components:bookmarks:resources:MANIFEST-content",	"$bookmarks_content_chrome_dir");
-		_InstallResources(":mozilla:xpfe:components:bookmarks:resources:MANIFEST-skin",		"$bookmarks_skin_chrome_dir");
 		_InstallResources(":mozilla:xpfe:components:bookmarks:resources:locale:en-US:MANIFEST", "$bookmarks_locale_chrome_dir");
 	}
 	{
@@ -672,7 +663,6 @@ sub MakeResourceAliases()
 		my($directory_skin_chrome_dir) = "$communicator_skin_chrome_dir"."directory:";
 
 		_InstallResources(":mozilla:xpfe:components:directory:MANIFEST-content",			"$directory_content_chrome_dir");
-		_InstallResources(":mozilla:xpfe:components:directory:MANIFEST-skin",				"$directory_skin_chrome_dir");
 		_InstallResources(":mozilla:xpfe:components:directory:locale:en-US:MANIFEST",				"$directory_locale_chrome_dir");
 	}
 	{
@@ -681,7 +671,6 @@ sub MakeResourceAliases()
 		my($regviewer_skin_chrome_dir) = "$communicator_skin_chrome_dir"."regviewer:";
 
 		_InstallResources(":mozilla:xpfe:components:regviewer:MANIFEST-content",			"$regviewer_content_chrome_dir");
-		_InstallResources(":mozilla:xpfe:components:regviewer:MANIFEST-skin",				"$regviewer_skin_chrome_dir");
 		_InstallResources(":mozilla:xpfe:components:regviewer:locale:en-US:MANIFEST",				"$regviewer_locale_chrome_dir");
 	}
 	{
@@ -690,7 +679,6 @@ sub MakeResourceAliases()
 		my($history_skin_chrome_dir) = "$communicator_skin_chrome_dir"."history:";
 
 		_InstallResources(":mozilla:xpfe:components:history:resources:MANIFEST-content",	"$history_content_chrome_dir");
-		_InstallResources(":mozilla:xpfe:components:history:resources:MANIFEST-skin",		"$history_skin_chrome_dir");
 		_InstallResources(":mozilla:xpfe:components:history:resources:locale:en-US:MANIFEST",		"$history_locale_chrome_dir");
 	}
 	{
@@ -699,7 +687,6 @@ sub MakeResourceAliases()
 		my($related_skin_chrome_dir) = "$communicator_skin_chrome_dir"."related:";
 
 		_InstallResources(":mozilla:xpfe:components:related:resources:MANIFEST-content",	"$related_content_chrome_dir");
-		_InstallResources(":mozilla:xpfe:components:related:resources:MANIFEST-skin",		"$related_skin_chrome_dir");
 		_InstallResources(":mozilla:xpfe:components:related:resources:locale:en-US:MANIFEST",		"$related_locale_chrome_dir");
 	}
 	{
@@ -708,7 +695,6 @@ sub MakeResourceAliases()
 		my($search_skin_chrome_dir) = "$communicator_skin_chrome_dir"."search:";
 
 		_InstallResources(":mozilla:xpfe:components:search:resources:MANIFEST-content",		"$search_content_chrome_dir");
-		_InstallResources(":mozilla:xpfe:components:search:resources:MANIFEST-skin",		"$search_skin_chrome_dir");
 		_InstallResources(":mozilla:xpfe:components:search:resources:locale:en-US:MANIFEST",		"$search_locale_chrome_dir");
 
 		# Make copies (not aliases) of the various search files
@@ -720,7 +706,6 @@ sub MakeResourceAliases()
 		my($sidebar_skin_chrome_dir) = "$communicator_skin_chrome_dir"."sidebar:";
 
 		_InstallResources(":mozilla:xpfe:components:sidebar:resources:MANIFEST-content",	"$sidebar_content_chrome_dir");
-		_InstallResources(":mozilla:xpfe:components:sidebar:resources:MANIFEST-skin",		"$sidebar_skin_chrome_dir");
 		_InstallResources(":mozilla:xpfe:components:sidebar:resources:locale:en-US:MANIFEST",		"$sidebar_locale_chrome_dir");
 		_InstallResources(":mozilla:xpfe:components:sidebar:src:MANIFEST",					"${dist_dir}Components");
 	}
@@ -744,18 +729,15 @@ sub MakeResourceAliases()
 		my($pref_skin_chrome_dir) = "$communicator_skin_chrome_dir"."pref:";
 
 		_InstallResources(":mozilla:xpfe:components:prefwindow:resources:content:MANIFEST",		"$pref_content_chrome_dir", 0);
-		_InstallResources(":mozilla:xpfe:components:prefwindow:resources:skin:MANIFEST",			"$pref_skin_chrome_dir", 0);
 		_InstallResources(":mozilla:xpfe:components:prefwindow:resources:locale:en-US:MANIFEST",	"$pref_locale_chrome_dir", 0);
 	}
 
 	_InstallResources(":mozilla:xpfe:components:console:resources:content:MANIFEST",		"$global_content_chrome_dir", 0);
-	_InstallResources(":mozilla:xpfe:components:console:resources:skin:MANIFEST",			"$global_skin_chrome_dir", 0);
 	_InstallResources(":mozilla:xpfe:components:console:resources:locale:en-US:MANIFEST",	"$global_locale_chrome_dir", 0);
 	_InstallResources(":mozilla:xpfe:components:console:MANIFEST",					"${dist_dir}Components");
 
 
 	# XXX autocomplete needs to move somewhere
-	_InstallResources(":mozilla:xpfe:components:autocomplete:resources:skin:MANIFEST",		"$chrome_dir");
 
 	{
 		my($wallet_content_chrome_dir) = "$communicator_content_chrome_dir"."wallet:";
@@ -773,9 +755,6 @@ sub MakeResourceAliases()
 		_InstallResources(":mozilla:extensions:wallet:editor:MANIFEST_PROPERTIES",			"$wallet_locale_chrome_dir", 0);
 		_InstallResources(":mozilla:extensions:wallet:src:MANIFEST_PROPERTIES",				"$wallet_locale_chrome_dir", 0);
 
-		_InstallResources(":mozilla:extensions:wallet:editor:MANIFEST_SKIN",			"$wallet_skin_chrome_dir", 0);
-		_InstallResources(":mozilla:extensions:wallet:cookieviewer:MANIFEST_SKIN",			"$wallet_skin_chrome_dir", 0);
-		_InstallResources(":mozilla:extensions:wallet:signonviewer:MANIFEST_SKIN",			"$wallet_skin_chrome_dir", 0);
 	}
 	{
 		my($security_content_chrome_dir) = "$communicator_content_chrome_dir"."security:";
diff --git a/xpfe/browser/resources/Makefile.in b/xpfe/browser/resources/Makefile.in
index e12a5a94b13..d95b9ed9909 100644
--- a/xpfe/browser/resources/Makefile.in
+++ b/xpfe/browser/resources/Makefile.in
@@ -26,7 +26,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS		= content skin locale
+DIRS		= content locale
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/xpfe/browser/resources/makefile.win b/xpfe/browser/resources/makefile.win
index 6e3d6f8c43c..e69de29bb2d 100644
--- a/xpfe/browser/resources/makefile.win
+++ b/xpfe/browser/resources/makefile.win
@@ -1,29 +0,0 @@
-#!nmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-
-
-DEPTH=..\..\..
-
-DIRS= skin content locale
-
-include <$(DEPTH)\config\rules.mak>
-
diff --git a/xpfe/communicator/resources/Makefile.in b/xpfe/communicator/resources/Makefile.in
index 32c00bf6a04..1ac7f6d4540 100644
--- a/xpfe/communicator/resources/Makefile.in
+++ b/xpfe/communicator/resources/Makefile.in
@@ -26,7 +26,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS=content locale skin
+DIRS=content locale
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/xpfe/communicator/resources/makefile.win b/xpfe/communicator/resources/makefile.win
index 1f72fbb975c..e69de29bb2d 100644
--- a/xpfe/communicator/resources/makefile.win
+++ b/xpfe/communicator/resources/makefile.win
@@ -1,29 +0,0 @@
-#!nmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-
-
-DEPTH=..\..\..
-
-DIRS=content locale skin
-
-include <$(DEPTH)\config\rules.mak>
-
diff --git a/xpfe/components/bookmarks/resources/Makefile.in b/xpfe/components/bookmarks/resources/Makefile.in
index 70bdf47f261..c8b6d1c0dfd 100644
--- a/xpfe/components/bookmarks/resources/Makefile.in
+++ b/xpfe/components/bookmarks/resources/Makefile.in
@@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk
 CHROME_DIR = communicator
 CHROME_CONTENT_DIR = content/bookmarks
 CHROME_L10N_DIR = locale/bookmarks
-CHROME_SKIN_DIR = skin/bookmarks
 
 CHROME_CONTENT = \
 	bm-find.js \
@@ -43,22 +42,6 @@ CHROME_CONTENT = \
 	bookmarks.xul \
 	$(NULL)
 
-CHROME_SKIN = \
-	bookmark-folder-closed.gif \
-	bookmark-folder-closed-sel.gif \
-	bookmark-folder-open.gif \
-	bookmark-folder-open-sel.gif \
-	home.gif \
-	home-sel.gif \
-	bookmark-item.gif \
-	bookmarks.css \
-	iefavorite.gif \
-	personal-folder-closed.gif \
-	personal-folder-closed-sel.gif \
-	personal-folder-open.gif \
-	personal-folder-open-sel.gif \
-	$(NULL)
-
 EXPORT_RESOURCE_LOCALE	= \
 	locale/en-US/bm-find.dtd \
 	locale/en-US/bm-props.dtd \
diff --git a/xpfe/components/bookmarks/resources/makefile.win b/xpfe/components/bookmarks/resources/makefile.win
index 97dd3a37f94..aecb567f3d4 100644
--- a/xpfe/components/bookmarks/resources/makefile.win
+++ b/xpfe/components/bookmarks/resources/makefile.win
@@ -26,7 +26,6 @@ DIRS= locale
 CHROME_DIR          = communicator
 CHROME_CONTENT_DIR = content\bookmarks
 CHROME_L10N_DIR = locale\bookmarks
-CHROME_SKIN_DIR = skin\bookmarks
 CHROME_SOURCE_DIR	= $(srcdir)
 
 CHROME_CONTENT = \
@@ -41,22 +40,6 @@ CHROME_CONTENT = \
 	.\bookmarks.xul \
 	$(NULL)
 
-CHROME_SKIN = \
-	.\bookmark-folder-closed.gif \
-	.\bookmark-folder-closed-sel.gif \
-	.\home.gif \
-	.\home-sel.gif \
-	.\bookmark-folder-open.gif \
-	.\bookmark-folder-open-sel.gif \
-	.\bookmark-item.gif \
-	.\bookmarks.css \
-	.\iefavorite.gif \
-	.\personal-folder-closed.gif \
-	.\personal-folder-closed-sel.gif \
-	.\personal-folder-open.gif \
-	.\personal-folder-open-sel.gif \
-	$(NULL)
-
 include <$(DEPTH)\config\rules.mak>
 
 install::
diff --git a/xpfe/components/console/resources/Makefile.in b/xpfe/components/console/resources/Makefile.in
index 9163a69b6bd..e69de29bb2d 100644
--- a/xpfe/components/console/resources/Makefile.in
+++ b/xpfe/components/console/resources/Makefile.in
@@ -1,32 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DIRS		= content locale skin
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/xpfe/components/console/resources/makefile.win b/xpfe/components/console/resources/makefile.win
index a6e6f580336..e69de29bb2d 100644
--- a/xpfe/components/console/resources/makefile.win
+++ b/xpfe/components/console/resources/makefile.win
@@ -1,27 +0,0 @@
-#!nmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-DEPTH=..\..\..\..
-
-DIRS= content locale skin
-
-include <$(DEPTH)\config\rules.mak>
-
diff --git a/xpfe/components/directory/Makefile.in b/xpfe/components/directory/Makefile.in
index 4dc629f400e..adf9bff42ba 100644
--- a/xpfe/components/directory/Makefile.in
+++ b/xpfe/components/directory/Makefile.in
@@ -38,23 +38,12 @@ CPPSRCS		= nsDirectoryViewer.cpp
 CHROME_DIR	= communicator
 CHROME_CONTENT_DIR = content/directory
 CHROME_L10N_DIR = locale/directory
-CHROME_SKIN_DIR = skin/directory
 
 CHROME_CONTENT	= \
 		directory.xul \
 		directory.js \
 		$(NULL)
 
-CHROME_SKIN	= \
-		directory.css \
-		file-folder-closed.gif \
-		file-folder-closed-sel.gif \
-		file-folder-open.gif \
-		file-folder-open-sel.gif \
-		file-icon.gif \
-		file-icon-sel.gif \
-		$(NULL)
-
 EXPORT_RESOURCE_LOCALE	= ${srcdir}/locale/en-US/directory.dtd
 
 EXTRA_DSO_LDOPTS = \
diff --git a/xpfe/components/directory/makefile.win b/xpfe/components/directory/makefile.win
index d9713774d72..b3121648f42 100644
--- a/xpfe/components/directory/makefile.win
+++ b/xpfe/components/directory/makefile.win
@@ -26,23 +26,12 @@ DIRS=locale
 CHROME_DIR         = communicator
 CHROME_CONTENT_DIR = content\directory
 CHROME_L10N_DIR = locale\directory
-CHROME_SKIN_DIR = skin\directory
 
 CHROME_CONTENT = \
         .\directory.xul \
         .\directory.js  \
         $(NULL)
 
-CHROME_SKIN = \
-        .\directory.css \
-        .\file-folder-closed.gif \
-        .\file-folder-closed-sel.gif \
-        .\file-folder-open.gif \
-        .\file-folder-open-sel.gif \
-        .\file-icon.gif \
-        .\file-icon-sel.gif \
-        $(NULL)
-
 MODULE=directory
 
 XPIDLSRCS =                             \
diff --git a/xpfe/components/filepicker/res/Makefile.in b/xpfe/components/filepicker/res/Makefile.in
index 103b1fcd1b0..e69de29bb2d 100644
--- a/xpfe/components/filepicker/res/Makefile.in
+++ b/xpfe/components/filepicker/res/Makefile.in
@@ -1,34 +0,0 @@
-#! gmake
-# 
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is mozilla.org code
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-#    Stuart Parmenter <pavlov@netscape.com>
-#
-
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DIRS = content skin locale
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/xpfe/components/find/resources/Makefile.in b/xpfe/components/find/resources/Makefile.in
index fac891b7641..57ed6019766 100644
--- a/xpfe/components/find/resources/Makefile.in
+++ b/xpfe/components/find/resources/Makefile.in
@@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk
 CHROME_DIR	= global
 CHROME_CONTENT_DIR = content
 CHROME_L10N_DIR = locale
-CHROME_SKIN_DIR = skin
 
 CHROME_CONTENT	= \
 		finddialog.xul \
diff --git a/xpfe/components/find/resources/makefile.win b/xpfe/components/find/resources/makefile.win
index ce931c6a2e6..4b4ad8ad0a1 100644
--- a/xpfe/components/find/resources/makefile.win
+++ b/xpfe/components/find/resources/makefile.win
@@ -28,7 +28,6 @@ DIRS=locale
 CHROME_DIR = global
 CHROME_CONTENT_DIR = content
 CHROME_L10N_DIR = locale
-CHROME_SKIN_DIR = skin
 
 
 CHROME_CONTENT = \
diff --git a/xpfe/components/history/resources/Makefile.in b/xpfe/components/history/resources/Makefile.in
index 61cf174ecbf..b2b8ba0f7a5 100644
--- a/xpfe/components/history/resources/Makefile.in
+++ b/xpfe/components/history/resources/Makefile.in
@@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk
 CHROME_DIR	= communicator
 CHROME_CONTENT_DIR = content/history
 CHROME_L10N_DIR = locale/history
-CHROME_SKIN_DIR = skin/history
 
 CHROME_CONTENT	= \
 		history.xul \
diff --git a/xpfe/components/history/resources/makefile.win b/xpfe/components/history/resources/makefile.win
index 2381c69c820..19d7333de12 100644
--- a/xpfe/components/history/resources/makefile.win
+++ b/xpfe/components/history/resources/makefile.win
@@ -26,7 +26,6 @@ DIRS=locale
 CHROME_DIR          = communicator
 CHROME_CONTENT_DIR = content\history
 CHROME_L10N_DIR = locale\history
-CHROME_SKIN_DIR = skin\history
 
 CHROME_CONTENT = \
 	.\history.xul \
diff --git a/xpfe/components/prefwindow/resources/Makefile.in b/xpfe/components/prefwindow/resources/Makefile.in
index c05853a7b8b..1d58468949a 100644
--- a/xpfe/components/prefwindow/resources/Makefile.in
+++ b/xpfe/components/prefwindow/resources/Makefile.in
@@ -26,7 +26,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS		= content skin locale
+DIRS		= content locale
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/xpfe/components/prefwindow/resources/makefile.win b/xpfe/components/prefwindow/resources/makefile.win
index f00feff34ee..e69de29bb2d 100644
--- a/xpfe/components/prefwindow/resources/makefile.win
+++ b/xpfe/components/prefwindow/resources/makefile.win
@@ -1,29 +0,0 @@
-#!nmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-
-
-DEPTH=..\..\..\..
-
-DIRS= skin content locale
-
-include <$(DEPTH)\config\rules.mak>
-
diff --git a/xpfe/components/regviewer/Makefile.in b/xpfe/components/regviewer/Makefile.in
index 190d6220e8a..35ef1b0cb5a 100644
--- a/xpfe/components/regviewer/Makefile.in
+++ b/xpfe/components/regviewer/Makefile.in
@@ -38,15 +38,12 @@ CPPSRCS		= nsRegistryDataSource.cpp
 CHROME_DIR	= communicator
 CHROME_CONTENT_DIR = content/regviewer
 CHROME_L10N_DIR = locale/regviewer
-CHROME_SKIN_DIR = skin/regviewer
 
 CHROME_CONTENT	= \
 		regviewer.xul \
 		regviewer.js \
 		$(NULL)
 
-CHROME_SKIN	= regviewer.css
-
 EXPORT_RESOURCE_LOCALE	= $(srcdir)/locale/en-US/regviewer.dtd
 
 EXTRA_DSO_LDOPTS = \
diff --git a/xpfe/components/regviewer/makefile.win b/xpfe/components/regviewer/makefile.win
index 5f5d6bd8bea..e9c8fdf5fe7 100644
--- a/xpfe/components/regviewer/makefile.win
+++ b/xpfe/components/regviewer/makefile.win
@@ -26,17 +26,12 @@ DIRS=locale
 CHROME_DIR         = communicator
 CHROME_CONTENT_DIR = content\regviewer
 CHROME_L10N_DIR = locale\regviewer
-CHROME_SKIN_DIR = skin\regviewer
 
 CHROME_CONTENT = \
         .\regviewer.xul \
         .\regviewer.js  \
         $(NULL)
 
-CHROME_SKIN = \
-        .\regviewer.css \
-        $(NULL)
-
 MODULE=regviewer
 
 XPIDLSRCS =                             \
diff --git a/xpfe/components/related/resources/Makefile.in b/xpfe/components/related/resources/Makefile.in
index 778c9b6aff4..7688688028e 100644
--- a/xpfe/components/related/resources/Makefile.in
+++ b/xpfe/components/related/resources/Makefile.in
@@ -29,18 +29,12 @@ include $(DEPTH)/config/autoconf.mk
 CHROME_DIR	= communicator
 CHROME_CONTENT_DIR = content/related
 CHROME_L10N_DIR = locale/related
-CHROME_SKIN_DIR = skin/related
 
 CHROME_CONTENT	= \
 		related-panel.xul \
 		related-panel.js \
 		$(NULL)
 
-CHROME_SKIN	= \
-		related.css \
-		sitemap.gif \
-		$(NULL)
-
 EXPORT_RESOURCE_LOCALE	= $(srcdir)/locale/en-US/related-panel.dtd
 
 include $(topsrcdir)/config/rules.mk
diff --git a/xpfe/components/related/resources/makefile.win b/xpfe/components/related/resources/makefile.win
index 29fa0c4bbf5..b3ffe6a1226 100644
--- a/xpfe/components/related/resources/makefile.win
+++ b/xpfe/components/related/resources/makefile.win
@@ -26,18 +26,12 @@ DIRS=locale
 CHROME_DIR          = communicator
 CHROME_CONTENT_DIR = content\related
 CHROME_L10N_DIR = locale\related
-CHROME_SKIN_DIR = skin\related
 
 CHROME_CONTENT = \
 	.\related-panel.xul \
 	.\related-panel.js \
 	$(NULL)
 
-CHROME_SKIN = \
-	.\related.css \
-	.\sitemap.gif \
-	$(NULL)
-
 include <$(DEPTH)\config\rules.mak>
 
 install::
diff --git a/xpfe/components/search/resources/makefile.win b/xpfe/components/search/resources/makefile.win
index 33cea58af3c..f4b6aeffdb3 100644
--- a/xpfe/components/search/resources/makefile.win
+++ b/xpfe/components/search/resources/makefile.win
@@ -26,7 +26,6 @@ DIRS= locale
 CHROME_DIR          = communicator
 CHROME_CONTENT_DIR = content\search
 CHROME_L10N_DIR = locale\search
-CHROME_SKIN_DIR = skin\search
 CHROME_SOURCE_DIR	= $(srcdir)
 
 CHROME_CONTENT = \
@@ -47,17 +46,6 @@ CHROME_CONTENT = \
 	.\internetresults.xul \
 	$(NULL)
 
-CHROME_SKIN = \
-	.\search.css \
-	.\search-editor.css \
-	.\findresults.css \
-	.\icons.css \
-	.\internet.css \
-	.\internetresults.css \
-	.\category.gif \
-	.\result.gif \
-	$(NULL)
-
 include <$(DEPTH)\config\rules.mak>
 
 install::
diff --git a/xpfe/components/sidebar/resources/Makefile.in b/xpfe/components/sidebar/resources/Makefile.in
index ebbefeab160..d7c5bc30baa 100644
--- a/xpfe/components/sidebar/resources/Makefile.in
+++ b/xpfe/components/sidebar/resources/Makefile.in
@@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk
 CHROME_DIR = communicator
 CHROME_CONTENT_DIR = content/sidebar
 CHROME_L10N_DIR = locale/sidebar
-CHROME_SKIN_DIR = skin/sidebar
 
 CHROME_CONTENT = \
 	customize-panel.js \
@@ -43,28 +42,6 @@ CHROME_CONTENT = \
 	local-panels.rdf \
 	$(NULL)
 
-CHROME_SKIN = \
-	customize.css \
-	preview.css \
-	sidebar.css \
-	sidebarOverlay.css \
-	sidebar-icon.gif \
-	list-down-dis.gif \
-	list-down.gif \
-	list-up-dis.gif \
-	list-up.gif \
-	sbgrippy-left-hover.gif \
-	sbgrippy-left.gif \
-	sbgrippy-right-hover.gif \
-	sbgrippy-right.gif \
-	sidebar-bottomright-cap.gif \
-	sidebar-topright-cap.gif \
-	sidebar-close-hover.gif \
-	sidebar-close.gif \
-	sidebar-open-hover.gif \
-	sidebar-open.gif \
-	$(NULL)
-
 EXPORT_RESOURCE_LOCALE = \
 	locale/en-US/customize.dtd \
 	locale/en-US/preview.dtd \
diff --git a/xpfe/components/sidebar/resources/makefile.win b/xpfe/components/sidebar/resources/makefile.win
index 46e285bb89d..9fc279dea4a 100644
--- a/xpfe/components/sidebar/resources/makefile.win
+++ b/xpfe/components/sidebar/resources/makefile.win
@@ -24,7 +24,6 @@ DEPTH=..\..\..\..
 CHROME_DIR = communicator
 CHROME_CONTENT_DIR = content\sidebar
 CHROME_L10N_DIR = locale\sidebar
-CHROME_SKIN_DIR = skin\sidebar
 
 CHROME_CONTENT = \
         .\customize-panel.js \
@@ -38,28 +37,6 @@ CHROME_CONTENT = \
         .\local-panels.rdf \
         $(NULL)
 
-CHROME_SKIN = \
-        .\customize.css \
-	.\preview.css \
-	.\sidebar.css \
-	.\sidebar-icon.gif \
-	.\sidebarOverlay.css \
-        .\list-down-dis.gif \
-        .\list-down.gif \
-        .\list-up-dis.gif \
-        .\list-up.gif \
-	.\sbgrippy-left-hover.gif \
-	.\sbgrippy-left.gif \
-	.\sbgrippy-right-hover.gif \
-	.\sbgrippy-right.gif \
-	.\sidebar-bottomright-cap.gif \
-	.\sidebar-topright-cap.gif \
-	.\sidebar-close-hover.gif \
-	.\sidebar-close.gif \
-	.\sidebar-open-hover.gif \
-	.\sidebar-open.gif \
-        $(NULL)
-
 include <$(DEPTH)\config\rules.mak>
 
 install::
diff --git a/xpfe/components/ucth/resources/Makefile.in b/xpfe/components/ucth/resources/Makefile.in
index 06e9e2ba468..c4c16849374 100644
--- a/xpfe/components/ucth/resources/Makefile.in
+++ b/xpfe/components/ucth/resources/Makefile.in
@@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk
 CHROME_DIR	= global
 CHROME_CONTENT_DIR = content
 CHROME_L10N_DIR = locale
-CHROME_SKIN_DIR = skin
 
 CHROME_CONTENT	= \
 		unknownContent.xul \
diff --git a/xpfe/components/ucth/resources/makefile.win b/xpfe/components/ucth/resources/makefile.win
index e40857dba22..f4685807d5c 100644
--- a/xpfe/components/ucth/resources/makefile.win
+++ b/xpfe/components/ucth/resources/makefile.win
@@ -28,7 +28,6 @@ DIRS=locale
 CHROME_DIR = global
 CHROME_CONTENT_DIR = content
 CHROME_L10N_DIR = locale
-CHROME_SKIN_DIR = skin
 
 
 CHROME_CONTENT=\
@@ -36,8 +35,6 @@ CHROME_CONTENT=\
     .\unknownContent.js  \
     $(NULL)
 
-CHROME_SKIN=
-
 include <$(DEPTH)\config\rules.mak>
 
 install::
diff --git a/xpfe/components/xfer/resources/Makefile.in b/xpfe/components/xfer/resources/Makefile.in
index f17970bf30f..0ef98b448e1 100644
--- a/xpfe/components/xfer/resources/Makefile.in
+++ b/xpfe/components/xfer/resources/Makefile.in
@@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk
 CHROME_DIR	= global
 CHROME_CONTENT_DIR = content
 CHROME_L10N_DIR = locale
-CHROME_SKIN_DIR = skin
 
 CHROME_CONTENT	= \
 	downloadProgress.xul \
diff --git a/xpfe/components/xfer/resources/makefile.win b/xpfe/components/xfer/resources/makefile.win
index 10e35046aaf..f68bc8f0d57 100644
--- a/xpfe/components/xfer/resources/makefile.win
+++ b/xpfe/components/xfer/resources/makefile.win
@@ -27,7 +27,6 @@ DIRS=locale
 CHROME_DIR = global
 CHROME_CONTENT_DIR = content
 CHROME_L10N_DIR = locale
-CHROME_SKIN_DIR = skin
 
 
 CHROME_CONTENT=\
diff --git a/xpfe/global/resources/skin/makefile.win b/xpfe/global/resources/skin/makefile.win
index f56215017a3..101001961bd 100644
--- a/xpfe/global/resources/skin/makefile.win
+++ b/xpfe/global/resources/skin/makefile.win
@@ -27,127 +27,6 @@ DISTBROWSER=$(DIST)\bin\chrome\global\skin
 DISTXUL=$(DIST)\bin\chrome
 
 CHROME_DIR=global
-CHROME_SKIN_DIR=skin
-
-CHROME_TYPE=skin
-
-CHROME_SKIN = \
-	.\manifest.rdf \
-	.\tasksOverlay.css \
-	.\menu.css \
-	.\toolbar.css \
-	.\global.css \
-	.\splitter.css \
-	.\button.css \
-	.\tabcontrol.css \
-	.\textfield.css \
-	.\formatting.css \
-	.\box.css \
-	.\checkbox.css \
-	.\menubutton.css \
-	.\menulist.css \
-	.\radio.css \
-	.\tree.css \
-	.\scrollbars.css \
-	.\lessCols.gif \
-	.\lessCols_mo.gif \
-	.\lessCols_dis.gif \
-	.\moreCols.gif \
-	.\moreCols_mo.gif \
-	.\moreCols_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 \
-	.\scroll-right.gif \
-	.\scroll-right-hover.gif \
-	.\scroll-right-disabled.gif \
-	.\scroll-thumb-vert.gif \
-	.\scroll-thumb-vert-hover.gif \
-	.\scroll-thumb-vert-disabled.gif \
-	.\scroll-thumb-horiz.gif \
-	.\scroll-thumb-horiz-hover.gif \
-	.\scroll-thumb-horiz-disabled.gif \
-	.\opentwisty.gif \
-	.\opentwisty-selected.gif \
-	.\closedtwisty.gif \
-	.\closedtwisty-selected.gif \
-	.\menu-arrow.gif \
-	.\menu-arrow-hover.gif \
-	.\menu-arrow-disabled.gif \
-	.\menu-check.gif \
-	.\menu-check-hover.gif \
-	.\menu-check-disabled.gif \
-	.\alert-icon.gif \
-	.\error-icon.gif \
-	.\message-icon.gif \
-	.\question-icon.gif \
-	.\return.gif \
-	.\return-disabled.gif \
-	.\grippy-horizontal-after.gif  \
-	.\grippy-horizontal-before.gif  \
-	.\grippy-vertical-after.gif  \
-	.\grippy-vertical-before.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  \
-	.\taskbar-tab-trans.gif  \
-	.\stop.gif \
-	.\print.gif \
-	.\progressmeter-busy.gif \
-	.\button28-bg-active.gif \
-	.\button28-bg-disabled.gif \
-	.\button28-bg-hover.gif \
-	.\button28-bg.gif \
-	.\button32-bg-active.gif \
-	.\button32-bg-disabled.gif \
-	.\button32-bg-hover.gif \
-	.\button32-bg.gif \
-	.\gray-bottomleft.gif \
-	.\gray-bottomright.gif \
-	.\gray-topright.gif \
-	.\otherbutton28-bg-hover.gif \
-	.\otherbutton28-bg-active.gif \
-	.\toolbar-begincap.gif \
-	.\toolbar-dropdown.gif \
-        .\toolbar-dropdown-hover.gif \
-	.\toolbar-endcap.gif \
-        .\toolbar-menu-arrow.gif \
-	.\toolbar-menu-arrow-disabled.gif \
-	.\toolbar-menu-arrow-hover.gif \
-	.\navbar-bg.gif \
-	.\navbar-endcap.gif \
-	.\navbar-bg-begincap.gif \
-	.\n-box-navbar.gif \
-	.\n-box.gif \
-	.\search.gif \
-	.\animthrob.gif \
-	.\animthrob_single.gif \
-	.\wizardOverlay.css \
-	.\commonDialog.css \
-	.\dialogOverlay.css \
-	.\seltab-leftedge.gif \
-	.\seltab-rightedge.gif \
-	.\tab-leftedge.gif \
-	.\tab-rightedge.gif \
-	.\sortAscending.gif \
-	.\sortDescending.gif \
-	.\check-check.gif \
-	.\check-check-disabled.gif \
-	.\check-radio.gif \
-	.\check-radio-disabled.gif \
-	.\loading.gif \
-	$(NULL)
 
 include <$(DEPTH)\config\rules.mak>