diff --git a/client-profiles/50-default-CLDG/.gconf/apps/panel/30_top_applets_right/20_applet_glipper/%gconf.xml b/client-profiles/50-default-CLDG/.gconf/apps/panel/30_top_applets_right/10_applet_glipper/%gconf.xml
similarity index 100%
rename from client-profiles/50-default-CLDG/.gconf/apps/panel/30_top_applets_right/20_applet_glipper/%gconf.xml
rename to client-profiles/50-default-CLDG/.gconf/apps/panel/30_top_applets_right/10_applet_glipper/%gconf.xml
diff --git a/client-profiles/50-default-CLDG/.gconf/apps/panel/30_top_applets_right/10_applet_power/%gconf.xml b/client-profiles/50-default-CLDG/.gconf/apps/panel/30_top_applets_right/15_applet_power/%gconf.xml
similarity index 100%
rename from client-profiles/50-default-CLDG/.gconf/apps/panel/30_top_applets_right/10_applet_power/%gconf.xml
rename to client-profiles/50-default-CLDG/.gconf/apps/panel/30_top_applets_right/15_applet_power/%gconf.xml
diff --git a/client-profiles/50-default-CLDG/.gconf/apps/panel/30_top_applets_right/10_applet_power/.calculate_directory b/client-profiles/50-default-CLDG/.gconf/apps/panel/30_top_applets_right/15_applet_power/.calculate_directory
similarity index 100%
rename from client-profiles/50-default-CLDG/.gconf/apps/panel/30_top_applets_right/10_applet_power/.calculate_directory
rename to client-profiles/50-default-CLDG/.gconf/apps/panel/30_top_applets_right/15_applet_power/.calculate_directory
diff --git a/client-profiles/50-default-CLDG/.gconf/apps/panel/30_top_applets_right/10_applet_power/prefs/%gconf.xml b/client-profiles/50-default-CLDG/.gconf/apps/panel/30_top_applets_right/15_applet_power/prefs/%gconf.xml
similarity index 100%
rename from client-profiles/50-default-CLDG/.gconf/apps/panel/30_top_applets_right/10_applet_power/prefs/%gconf.xml
rename to client-profiles/50-default-CLDG/.gconf/apps/panel/30_top_applets_right/15_applet_power/prefs/%gconf.xml
diff --git a/client-profiles/50-default-CLDG/.gconf/apps/panel/30_top_applets_right/15_applet_keylayout/%gconf.xml b/client-profiles/50-default-CLDG/.gconf/apps/panel/30_top_applets_right/20_applet_keylayout/%gconf.xml
similarity index 100%
rename from client-profiles/50-default-CLDG/.gconf/apps/panel/30_top_applets_right/15_applet_keylayout/%gconf.xml
rename to client-profiles/50-default-CLDG/.gconf/apps/panel/30_top_applets_right/20_applet_keylayout/%gconf.xml
diff --git a/client-profiles/50-default-CLDG/.gconf/apps/panel/30_top_applets_right/25_applet_trash/%gconf.xml b/client-profiles/50-default-CLDG/.gconf/apps/panel/30_top_applets_right/25_applet_trash/%gconf.xml
new file mode 100644
index 0000000..12c62e3
--- /dev/null
+++ b/client-profiles/50-default-CLDG/.gconf/apps/panel/30_top_applets_right/25_applet_trash/%gconf.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<gconf>
+	<entry name="attached_toplevel_id" schema="/schemas/apps/panel/objects/attached_toplevel_id"/>
+	#-pop(offsetx)-#
+	<entry name="position" schema="/schemas/apps/panel/objects/position" type="int" value="#-sum(offsetx,offsetx,offsetx+32)-#"/>
+	#-push(offsetx)-#
+	<entry name="use_menu_path" schema="/schemas/apps/panel/objects/use_menu_path"/>
+	<entry name="action_type" schema="/schemas/apps/panel/objects/action_type"/>
+	<entry name="toplevel_id" schema="/schemas/apps/panel/objects/toplevel_id" type="string">
+		<stringvalue>top_panel_screen0</stringvalue>
+	</entry>
+	<entry name="tooltip" schema="/schemas/apps/panel/objects/tooltip"/>
+	<entry name="use_custom_icon" schema="/schemas/apps/panel/objects/use_custom_icon"/>
+	<entry name="object_type" schema="/schemas/apps/panel/objects/object_type" type="string">
+		<stringvalue>bonobo-applet</stringvalue>
+	</entry>
+	<entry name="panel_right_stick" schema="/schemas/apps/panel/objects/panel_right_stick" type="bool" value="true"/>
+	<entry name="locked" schema="/schemas/apps/panel/objects/locked"/>
+	<entry name="custom_icon" schema="/schemas/apps/panel/objects/custom_icon"/>
+	<entry name="bonobo_iid" schema="/schemas/apps/panel/objects/bonobo_iid" type="string">
+		<stringvalue>OAFIID:GNOME_Panel_TrashApplet</stringvalue>
+	</entry>
+	<entry name="launcher_location" schema="/schemas/apps/panel/objects/launcher_location"/>
+	<entry name="menu_path" schema="/schemas/apps/panel/objects/menu_path"/>
+</gconf>
diff --git a/client-profiles/50-default-CLDG/.gconf/apps/panel/general/%gconf.xml b/client-profiles/50-default-CLDG/.gconf/apps/panel/general/%gconf.xml
index 71acbb1..7bdfedc 100644
--- a/client-profiles/50-default-CLDG/.gconf/apps/panel/general/%gconf.xml
+++ b/client-profiles/50-default-CLDG/.gconf/apps/panel/general/%gconf.xml
@@ -93,14 +93,17 @@
 		</li>
 #?hr_laptop!=#
 		<li type="string">
-			<stringvalue>10_applet_power</stringvalue>
+			<stringvalue>10_applet_glipper</stringvalue>
 		</li>
 #hr_laptop#
 		<li type="string">
-			<stringvalue>15_applet_keylayout</stringvalue>
+			<stringvalue>15_applet_power</stringvalue>
 		</li>
 		<li type="string">
-			<stringvalue>20_applet_glipper</stringvalue>
+			<stringvalue>20_applet_keylayout</stringvalue>
+		</li>
+		<li type="string">
+			<stringvalue>25_applet_trash</stringvalue>
 		</li>
 	</entry>
 	<entry name="toplevel_id_list" type="list" ltype="string">