diff --git a/CHANGES.rst b/CHANGES.rst
index c8331790de..769b1cdc7d 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -13,7 +13,10 @@ New:
 - Add option to show/hide thumbs in site-controlpanel
   https://github.com/plone/Products.CMFPlone/issues/1241
   [fgrcon]
-  
+
+- Add icon fallback for addons in Site Setup (fixes .. _`#1232`)
+  [davilima6]
+
 - Explicitly provide id on search form and not depend on diazo magic
   adding the id in.
   [vangheem]
@@ -47,18 +50,18 @@ New:
   customization.
   [tomgross]
 
-- Add icon fallback for addons in Site Setup
-  [davilima6]
-
 Fixes:
 
+- Update Site Setup link in all control panels (fixes .. _`#1255`)
+  [davilima6]
+
 - Add authenticator token to group portlet links
   [vangheem]
 
 - Fix bbb global status message template rendering escaped html
   [vangheem]
 
-- Avoid AttributeError if registry is not yet there for the 
+- Avoid AttributeError if registry is not yet there for the
   JSRegistryNodeAdapter while migrating from older versions
   https://github.com/plone/Products.CMFPlone/pull/1246
   [frapell]
@@ -997,3 +1000,5 @@ Fixes:
 .. _`#1015`: https://github.com/plone/Products.CMFPlone/issues/1015
 .. _`#1041`: https://github.com/plone/Products.CMFPlone/issues/1041
 .. _`#1053`: https://github.com/plone/Products.CMFPlone/issues/1053
+.. _`#1232`: https://github.com/plone/Products.CMFPlone/issues/1232
+.. _`#1255`: https://github.com/plone/Products.CMFPlone/issues/1255
diff --git a/Products/CMFPlone/controlpanel/tests/test_controlpanel_browser_usergroups_siteadmin_role.py b/Products/CMFPlone/controlpanel/tests/test_controlpanel_browser_usergroups_siteadmin_role.py
index 1b835e61c1..ae41f38236 100644
--- a/Products/CMFPlone/controlpanel/tests/test_controlpanel_browser_usergroups_siteadmin_role.py
+++ b/Products/CMFPlone/controlpanel/tests/test_controlpanel_browser_usergroups_siteadmin_role.py
@@ -98,7 +98,7 @@ def afterSetUp(self):
     def testControlPanelOverview(self):
         # make sure we can view the Site Setup page,
         # at both old and new URLs
-        res = self.publish('/plone/plone_control_panel', 'siteadmin:secret')
+        res = self.publish('/plone/@@overview-controlpanel', 'siteadmin:secret')
         self.assertEqual(200, res.status)
         res = self.publish(
             '/plone/@@overview-controlpanel', 'siteadmin:secret'
diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt
index e5dab004aa..f18d0e8cc5 100644
--- a/docs/HISTORY.txt
+++ b/docs/HISTORY.txt
@@ -23,6 +23,7 @@ For what's new in this release, see CHANGES.txt.
 - Sub-sort timezone by label, not language code when adding a site
   [instification]
 
+
 4.3.3 (unreleased)
 ------------------
 
@@ -53,6 +54,7 @@ For what's new in this release, see CHANGES.txt.
   item.body is an AcquisitionWrapper.
   [alecghica]
 
+
 4.3.2 (unreleased)
 ------------------
 
@@ -80,6 +82,7 @@ For what's new in this release, see CHANGES.txt.
 - Stop unload-protection from popping up needlessly if tinyMCE is used on tabbed forms
   [href]
 
+
 4.3.1 (2013-05-30)
 ------------------