--- /usr/portage/net-www/mozilla-firefox/mozilla-firefox-1.0-r3.ebuild	2005-01-02 13:13:58.000000000 +0100
+++ /usr/portage/net-www/mozilla-firefox/mozilla-firefox-1.0-r3.ebuild	2005-02-12 18:46:52.141666760 +0100
@@ -121,18 +121,16 @@ 
 	insinto /etc/env.d
 	doins ${FILESDIR}/10MozillaFirefox
 
-	# Fix icons to look the same everywhere
-	insinto /usr/lib/MozillaFirefox/icons
-	doins ${S}/build/package/rpm/SOURCES/mozicon16.xpm
-	doins ${S}/build/package/rpm/SOURCES/mozicon50.xpm
-
-	# Install icon and .desktop for menu entry
-	insinto /usr/share/pixmaps
-	doins ${FILESDIR}/icon/firefox-icon.png
-	# Fix bug 54179: Install .desktop file into /usr/share/applications
-	# instead of /usr/share/gnome/apps/Internet (18 Jun 2004 agriffis)
-	insinto /usr/share/applications
-	doins ${FILESDIR}/icon/mozillafirefox.desktop
+	insinto /usr/share/icons/hicolor/16x16/apps
+	newins ${S}/other-licenses/branding/firefox/mozicon16.xpm firefox.xpm
+	insinto /usr/share/icons/hicolor/32x32/apps
+	newins ${S}/other-licenses/branding/firefox/content/icon32.png firefox.png
+	insinto /usr/share/icons/hicolor/48x48/apps
+	newins ${S}/other-licenses/branding/firefox/mozicon50.xpm firefox.xpm
+
+	# should be corrent this, but make_desktop_entry is not so good
+	# make_desktop_entry "/usr/bin/firefox %U" "Mozilla Firefox" firefox
+	make_desktop_entry firefox "Mozilla Firefox" firefox
 
 	# Normally firefox-0.9 must be run as root once before it can be
 	# run as a normal user.  Drop in some initialized files to avoid