diff --git a/client-profiles/50-default-CLDG/.gconf/apps/panel/50_bottom_objects/60_object_dictionary/%gconf.xml b/client-profiles/50-default-CLDG/.gconf/apps/panel/50_bottom_objects/60_object_dictionary/%gconf.xml
index fdabbe0..67b2db4 100644
--- a/client-profiles/50-default-CLDG/.gconf/apps/panel/50_bottom_objects/60_object_dictionary/%gconf.xml
+++ b/client-profiles/50-default-CLDG/.gconf/apps/panel/50_bottom_objects/60_object_dictionary/%gconf.xml
@@ -19,7 +19,7 @@
 	<entry name="custom_icon" schema="/schemas/apps/panel/objects/custom_icon"/>
 	<entry name="bonobo_iid" schema="/schemas/apps/panel/objects/bonobo_iid"/>
 	<entry name="launcher_location" schema="/schemas/apps/panel/objects/launcher_location" type="string">
-		<stringvalue>gnome-dictionary.desktop</stringvalue>
+		<stringvalue>stardict.desktop</stringvalue>
 	</entry>
 	<entry name="menu_path" schema="/schemas/apps/panel/objects/menu_path"/>
 </gconf>
diff --git a/client-profiles/50-default-CLDG/.gnome2/panel2.d/default/launchers/mozilla-firefox-3.6.desktop b/client-profiles/50-default-CLDG/.gnome2/panel2.d/default/launchers/mozilla-firefox-3.6.desktop
deleted file mode 100644
index f6c112b..0000000
--- a/client-profiles/50-default-CLDG/.gnome2/panel2.d/default/launchers/mozilla-firefox-3.6.desktop
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/mozilla-firefox-3.6.desktop mirror
-
-[Desktop Entry]
-Icon=/usr/share/icons/gnome/scalable/apps/web-browser.svg
diff --git a/client-profiles/50-default-CLDG/.gnome2/panel2.d/default/launchers/calculate-community.desktop b/client-profiles/50-default-CLDG/.local/share/applications/calculate-community.desktop
similarity index 100%
rename from client-profiles/50-default-CLDG/.gnome2/panel2.d/default/launchers/calculate-community.desktop
rename to client-profiles/50-default-CLDG/.local/share/applications/calculate-community.desktop
diff --git a/client-profiles/50-default-CLDG/.gnome2/panel2.d/default/launchers/calculate-install.desktop b/client-profiles/50-default-CLDG/.local/share/applications/calculate-install.desktop
similarity index 100%
rename from client-profiles/50-default-CLDG/.gnome2/panel2.d/default/launchers/calculate-install.desktop
rename to client-profiles/50-default-CLDG/.local/share/applications/calculate-install.desktop
diff --git a/client-profiles/50-default-CLDG/.local/applications/mozilla-firefox-3.5.desktop b/client-profiles/50-default-CLDG/.local/share/applications/mozilla-firefox-3.6.desktop
similarity index 100%
rename from client-profiles/50-default-CLDG/.local/applications/mozilla-firefox-3.5.desktop
rename to client-profiles/50-default-CLDG/.local/share/applications/mozilla-firefox-3.6.desktop