diff --git a/ChangeLog b/ChangeLog
index 0e6a0bb90824d931c5c50fd1ac277eb338afc6c3..96f3ffcc08b82f0549c1fc6a1d3378fd3d973c74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-17 0:00  nick
+
+	* Improve the icons with some tango ones or the standard icon names. Also remove
+	  the icons that are not needed anymore.
+
 2007-03-14 9:15  nick
 
 	* plugins/tasklist/tasklist.c: Fix previous commit
diff --git a/NEWS b/NEWS
index 8184a61b0dd7bdaa9048e615df598875536ec15e..baf960ee35f7cdf7ad3e607caa53c7727d01b5da 100644
--- a/NEWS
+++ b/NEWS
@@ -7,45 +7,46 @@
   some problems with plugins. Plugin developers should add libxfcegui4
   to the dependencies of their package (including cflags and libadd in
   the makefiles).
+- Some new Tango icons.
 
 
-4.3.99.3 (4.4-RC3)
-==================
-- Update or add blinking for urgent windows in taslist, windowlist and iconbox. 
-  (Jasper)
-- Move test plugin to Xfce Goodies. (Nick)
-- Several fixes for (re)sizing and positioning behavior. (Jasper)
-- Lots of small fixes and polish. (Jasper, Nick, Olivier, Benedikt)
-- Update manual. (Jasper)
-- Many translation updates. (Xfce Translation Team)
-
-
-4.3.99.2 (4.4-RC2)
-==================
-- Adjust the plugin system to improve support for other platforms 
-  (read: windows). (Jasper, Olivier)
-- Many small fixes. (Jasper, Nick, Olivier, Jean-Francois)
-- Translation updates. (Xfce Translation Team)
-
-
-4.3.99.1 (4.4-RC1)
-==================
-- Add helper utility to open windowlist, useful for keyboard shortcuts.
-  Patch by Darren Salt. (Jasper)
-- Create dummy scripts for obsolete xftaskbar4 and xfce4-iconbox.
-- Change unix signal handling to use a pipe with an io watch, instead
-  of a timeout. (Jasper)
-- Add search box to new item dialog. Patch by Benedikt. (Jasper)
-- Fixes and improvements to memory management, and timeout handling.
-  (Nick, Jasper)
-- Translation updates. (Xfce Translation Team)
-
-
-4.3.x (changes from 4.2.x)
-==========================
-- Major rewrite of the panel
-- New plugin API supporting out-of-process plugins
-- Support for multiple panels
+4.3.99.3 (4.4-RC3)
+==================
+- Update or add blinking for urgent windows in taslist, windowlist and iconbox. 
+  (Jasper)
+- Move test plugin to Xfce Goodies. (Nick)
+- Several fixes for (re)sizing and positioning behavior. (Jasper)
+- Lots of small fixes and polish. (Jasper, Nick, Olivier, Benedikt)
+- Update manual. (Jasper)
+- Many translation updates. (Xfce Translation Team)
+
+
+4.3.99.2 (4.4-RC2)
+==================
+- Adjust the plugin system to improve support for other platforms 
+  (read: windows). (Jasper, Olivier)
+- Many small fixes. (Jasper, Nick, Olivier, Jean-Francois)
+- Translation updates. (Xfce Translation Team)
+
+
+4.3.99.1 (4.4-RC1)
+==================
+- Add helper utility to open windowlist, useful for keyboard shortcuts.
+  Patch by Darren Salt. (Jasper)
+- Create dummy scripts for obsolete xftaskbar4 and xfce4-iconbox.
+- Change unix signal handling to use a pipe with an io watch, instead
+  of a timeout. (Jasper)
+- Add search box to new item dialog. Patch by Benedikt. (Jasper)
+- Fixes and improvements to memory management, and timeout handling.
+  (Nick, Jasper)
+- Translation updates. (Xfce Translation Team)
+
+
+4.3.x (changes from 4.2.x)
+==========================
+- Major rewrite of the panel
+- New plugin API supporting out-of-process plugins
+- Support for multiple panels
 - Xinerama and multi-head support
 
 
diff --git a/icons/16x16/Makefile.am b/icons/16x16/Makefile.am
index 94747bbba59c9778391a3025e666fb6cc361a72c..abefd6eb4d7c7e41788ff71518200305a81fdc88 100644
--- a/icons/16x16/Makefile.am
+++ b/icons/16x16/Makefile.am
@@ -3,12 +3,9 @@
 iconsdir = $(datadir)/icons/hicolor/16x16/apps
 
 icons_DATA =								\
-	xfce-system-settings.png					\
 	xfce-system-lock.png						\
-	xfce-system-info.png						\
 	xfce-system-exit.png
 
-
 EXTRA_DIST =								\
 	$(icons_DATA)
 
diff --git a/icons/16x16/xfce-system-info.png b/icons/16x16/xfce-system-info.png
deleted file mode 100644
index 6387e4342795efb936c87f586a65ac509e18b985..0000000000000000000000000000000000000000
Binary files a/icons/16x16/xfce-system-info.png and /dev/null differ
diff --git a/icons/16x16/xfce-system-settings.png b/icons/16x16/xfce-system-settings.png
deleted file mode 100644
index fe39221b55a6e5f6fb759819031bedc6a8806352..0000000000000000000000000000000000000000
Binary files a/icons/16x16/xfce-system-settings.png and /dev/null differ
diff --git a/icons/48x48/Makefile.am b/icons/48x48/Makefile.am
index 4db55338ab11b77fed20614a022a105231a96d80..aed9382ac382e82641fe939fad507b427bc9b788 100644
--- a/icons/48x48/Makefile.am
+++ b/icons/48x48/Makefile.am
@@ -6,6 +6,9 @@ icons_DATA =								\
 	xfce4-panel.png							\
 	xfce4-iconbox.png						\
 	xfce4-taskbar.png						\
+	xfce4-clock.png							\
+	xfce4-separator.png						\
+	xfce4-systray.png						\
 	xfce-mouse.png
 
 EXTRA_DIST =								\
diff --git a/icons/48x48/xfce4-clock.png b/icons/48x48/xfce4-clock.png
new file mode 100644
index 0000000000000000000000000000000000000000..e898c3728223bcf5204acee7df5414f0b64d6e79
Binary files /dev/null and b/icons/48x48/xfce4-clock.png differ
diff --git a/icons/48x48/xfce4-separator.png b/icons/48x48/xfce4-separator.png
new file mode 100644
index 0000000000000000000000000000000000000000..4ec5d51ef596fc2267d615cae69a8df37127c192
Binary files /dev/null and b/icons/48x48/xfce4-separator.png differ
diff --git a/icons/48x48/xfce4-systray.png b/icons/48x48/xfce4-systray.png
new file mode 100644
index 0000000000000000000000000000000000000000..dc578189bd006d8d8b60b56876d872b4abe27799
Binary files /dev/null and b/icons/48x48/xfce4-systray.png differ
diff --git a/plugins/actions/actions.desktop.in.in b/plugins/actions/actions.desktop.in.in
index 83e16dacb20ad344c8fc373a6b2c2b0d7c9bd823..68f18cbac596b753c52e658d7323a8e8ec085a42 100644
--- a/plugins/actions/actions.desktop.in.in
+++ b/plugins/actions/actions.desktop.in.in
@@ -3,7 +3,7 @@ Type=X-XFCE-PanelPlugin
 Encoding=UTF-8
 _Name=Action Buttons
 _Comment=Log out or lock the screen
-Icon=xfce-system-exit
+Icon=system-log-out
 X-XFCE-Module=actions
 X-XFCE-Module-Path=@libdir@/xfce4/panel-plugins
 
diff --git a/plugins/clock/clock.desktop.in.in b/plugins/clock/clock.desktop.in.in
index 526ec96b9e505ca4b32090e024f3deb107401485..5d3336517642431212e476d10da11f5223bb44ea 100644
--- a/plugins/clock/clock.desktop.in.in
+++ b/plugins/clock/clock.desktop.in.in
@@ -3,7 +3,7 @@ Type=X-XFCE-PanelPlugin
 Encoding=UTF-8
 _Name=Clock
 _Comment=What time is it?
-Icon=xfce-schedule
+Icon=xfce4-clock
 X-XFCE-Module=clock
 X-XFCE-Module-Path=@libdir@/xfce4/panel-plugins
 
diff --git a/plugins/pager/pager.desktop.in.in b/plugins/pager/pager.desktop.in.in
index 814287d7f22a82d4fd102ac3d3db997613095b86..a2b1633df5a04ccfa564f08a977a0f541ed93aee 100644
--- a/plugins/pager/pager.desktop.in.in
+++ b/plugins/pager/pager.desktop.in.in
@@ -3,7 +3,7 @@ Type=X-XFCE-PanelPlugin
 Encoding=UTF-8
 _Name=Pager
 _Comment=Miniature view of all virtual desktops
-Icon=wksp
+Icon=xfce4-workspaces
 X-XFCE-Module=pager
 X-XFCE-Module-Path=@libdir@/xfce4/panel-plugins
 
diff --git a/plugins/separator/separator.desktop.in.in b/plugins/separator/separator.desktop.in.in
index 37d047e0faa256d1b4aee6c8a0dd4f4acdebee86..cb855cd995a6082b283b76093493db4298c029b7 100644
--- a/plugins/separator/separator.desktop.in.in
+++ b/plugins/separator/separator.desktop.in.in
@@ -3,6 +3,7 @@ Type=X-XFCE-PanelPlugin
 Encoding=UTF-8
 _Name=Separator or Spacing
 _Comment=Adds a space or a line between panel items
+Icon=xfce4-separator
 X-XFCE-Module=separator
 X-XFCE-Module-Path=@libdir@/xfce4/panel-plugins
 
diff --git a/plugins/systray/systray.desktop.in.in b/plugins/systray/systray.desktop.in.in
index 6109d250d2e13fdf100a95c1e27ba23400904ef7..2bd30092ad7d54b5aede27de8e0b2d7c278f4da6 100644
--- a/plugins/systray/systray.desktop.in.in
+++ b/plugins/systray/systray.desktop.in.in
@@ -3,7 +3,7 @@ Type=X-XFCE-PanelPlugin
 Encoding=UTF-8
 _Name=System Tray
 _Comment=Show notification icons
-Icon=xfce-system-info
+Icon=xfce4-systray
 X-XFCE-Module=systray
 X-XFCE-Module-Path=@libdir@/xfce4/panel-plugins
 
diff --git a/plugins/windowlist/windowlist.desktop.in.in b/plugins/windowlist/windowlist.desktop.in.in
index 56dee136fd33e949b8ff811b699621983c6ef86e..12c3b6cf3fda1b3210e03b038291b3706214b9e2 100644
--- a/plugins/windowlist/windowlist.desktop.in.in
+++ b/plugins/windowlist/windowlist.desktop.in.in
@@ -3,7 +3,7 @@ Type=X-XFCE-PanelPlugin
 Encoding=UTF-8
 _Name=Window List
 _Comment=Show list of available windows
-Icon=xfce-windowlist
+Icon=preferences-system-windows
 X-XFCE-Module=windowlist
 X-XFCE-Module-Path=@libdir@/xfce4/panel-plugins