diff --git a/designer_base/src/com/fr/design/constants/UIConstants.java b/designer_base/src/com/fr/design/constants/UIConstants.java
index aa27ea2ecf..3df47f30a4 100644
--- a/designer_base/src/com/fr/design/constants/UIConstants.java
+++ b/designer_base/src/com/fr/design/constants/UIConstants.java
@@ -74,7 +74,7 @@ public interface UIConstants {
     public static final Color SKY_BLUE = new Color(164, 192, 220);
     public static final Color OCEAN_BLUE = new Color(141, 179, 217);
     public static final Color DARK_BLUE = new Color(0, 88, 144);
-    public static final Color NORMAL_BACKGROUND = new Color(212, 212, 216);
+    public static final Color NORMAL_BACKGROUND = new Color(0xe0e0e3);
     public static final Color TREE_BACKGROUND = new Color(245, 245, 247);
     public static final Color TOOL_PANE_BACKGROUND = new Color(232, 232, 223);
     public static final Color SELECT_TAB = new Color(245, 245, 247);
@@ -111,9 +111,9 @@ public interface UIConstants {
     public static final Color TITLED_BORDER_COLOR = new Color(0xe8e8e9);
     public static final Color GRID_ROW_DETAILS_BACKGROUND = new Color(0xe8e8e9);
     public static final Color GRID_COLUMN_DETAILS_BACKGROUND = GRID_ROW_DETAILS_BACKGROUND;
-    public static final Color TEMPLATE_TAB_PANE_BACKGROUND = new Color(0xe0e0e3);
+    public static final Color TEMPLATE_TAB_PANE_BACKGROUND = NORMAL_BACKGROUND;
     public static final Color LOG_MESSAGE_BAR_BACKGROUND = TEMPLATE_TAB_PANE_BACKGROUND;
-    public static final Color UI_MENU_BACKGOURND = TEMPLATE_TAB_PANE_BACKGROUND;
+    public static final Color UI_MENU_BACKGOURND = LOG_MESSAGE_BAR_BACKGROUND;
     public static final Color POP_DIALOG_BORDER = new Color(218, 218, 221);
     public static final Color PROPERTY_DIALOG_BORDER = new Color(0xc9c9cd);
     public static final Color TAB_BUTTON_HOVER = new Color(231, 230, 235);
diff --git a/designer_base/src/com/fr/design/gui/imenu/UIMenu.java b/designer_base/src/com/fr/design/gui/imenu/UIMenu.java
index ecce5059c0..9c905a83f4 100644
--- a/designer_base/src/com/fr/design/gui/imenu/UIMenu.java
+++ b/designer_base/src/com/fr/design/gui/imenu/UIMenu.java
@@ -25,6 +25,7 @@ public class UIMenu extends JMenu {
 
 	public JPopupMenu getPopupMenu() {
 		JPopupMenu popupMenu = super.getPopupMenu();
+		popupMenu.setBackground(UIConstants.NORMAL_BACKGROUND);
 		popupMenu.setBorder(new Border() {
 
 			@Override
diff --git a/designer_base/src/com/fr/design/gui/imenu/UIMenuBarUI.java b/designer_base/src/com/fr/design/gui/imenu/UIMenuBarUI.java
index 04d5d3b0b1..3fe90dc98d 100644
--- a/designer_base/src/com/fr/design/gui/imenu/UIMenuBarUI.java
+++ b/designer_base/src/com/fr/design/gui/imenu/UIMenuBarUI.java
@@ -24,7 +24,7 @@ public class UIMenuBarUI extends BasicMenuBarUI {
             return;
         }
         Color oldColor = g.getColor();
-        g.setColor(UIConstants.TEMPLATE_TAB_PANE_BACKGROUND);
+        g.setColor(UIConstants.UI_MENU_BACKGOURND);
         g.fillRect(0, 0, c.getWidth(), c.getHeight());
         g.setColor(oldColor);
     }
diff --git a/designer_base/src/com/fr/design/gui/imenu/UIMenuUI.java b/designer_base/src/com/fr/design/gui/imenu/UIMenuUI.java
index fdda1a6120..9e79ecd659 100644
--- a/designer_base/src/com/fr/design/gui/imenu/UIMenuUI.java
+++ b/designer_base/src/com/fr/design/gui/imenu/UIMenuUI.java
@@ -19,7 +19,7 @@ public class UIMenuUI extends BasicMenuUI {
         int menuHeight = menuItem.getHeight();
         if (menuItem.isOpaque()) {
             if (menuItem.getParent() instanceof JPopupMenu && model.isSelected()) {
-                g.setColor(UIConstants.NORMAL_BACKGROUND);
+                g.setColor(UIConstants.UI_MENU_BACKGOURND);
                 g.fillRect(0, 0, menuWidth, menuHeight);
                 GUIPaintUtils.fillPaint((Graphics2D) g, 30, 0, menuWidth - 30, menuHeight, true, Constants.NULL, UIConstants.FLESH_BLUE, 7);
             } else if (model.isSelected()) {
@@ -37,7 +37,7 @@ public class UIMenuUI extends BasicMenuUI {
 
     protected void paintPressed(Graphics g, int w, int h) {
         Graphics2D g2d = (Graphics2D) g;
-        g2d.setColor(UIConstants.NORMAL_BACKGROUND);
+        g2d.setColor(UIConstants.UI_MENU_BACKGOURND);
         g2d.fillRect(0, 0, w, h);
         g2d.setColor(UIConstants.LINE_COLOR);
         g2d.drawLine(0, 0, 0, h - 1);
diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/authorityedit_disabled.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/authorityedit_disabled.png
index 3e10353330..49bd32545b 100644
Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/authorityedit_disabled.png and b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/authorityedit_disabled.png differ
diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/authorityedit_normal.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/authorityedit_normal.png
index d2e0a2b430..0d6fb5dc71 100644
Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/authorityedit_normal.png and b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/authorityedit_normal.png differ
diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/authorityedit_selected.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/authorityedit_selected.png
index c4b71b8533..6485213d88 100644
Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/authorityedit_selected.png and b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/authorityedit_selected.png differ
diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellattr_disabled.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellattr_disabled.png
index 7ea07bb9a1..d708498415 100644
Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellattr_disabled.png and b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellattr_disabled.png differ
diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellattr_normal.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellattr_normal.png
index 73ee5b87a7..d708498415 100644
Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellattr_normal.png and b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellattr_normal.png differ
diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellattr_selected.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellattr_selected.png
index 87c812f794..562300d4a9 100644
Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellattr_selected.png and b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellattr_selected.png differ
diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellelement_disabled.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellelement_disabled.png
index 2e450c35bc..b82ef7fd01 100644
Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellelement_disabled.png and b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellelement_disabled.png differ
diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellelement_normal.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellelement_normal.png
index 22fb4eb688..c87076aa7e 100644
Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellelement_normal.png and b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellelement_normal.png differ
diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellelement_selected.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellelement_selected.png
index 11e5aefbf1..8067e295f5 100644
Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellelement_selected.png and b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellelement_selected.png differ
diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/conditionattr_disabled.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/conditionattr_disabled.png
index 70b2dbd9b4..4e97bb9ba9 100644
Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/conditionattr_disabled.png and b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/conditionattr_disabled.png differ
diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/conditionattr_normal.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/conditionattr_normal.png
index 14ff765e43..f80c5683ff 100644
Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/conditionattr_normal.png and b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/conditionattr_normal.png differ
diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/conditionattr_selected.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/conditionattr_selected.png
index 082dce2e82..3287573a97 100644
Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/conditionattr_selected.png and b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/conditionattr_selected.png differ
diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/configuredroles_disabled.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/configuredroles_disabled.png
index 136dc65685..3c41b0ad8d 100644
Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/configuredroles_disabled.png and b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/configuredroles_disabled.png differ
diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/configuredroles_normal.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/configuredroles_normal.png
index 1cbf981535..b2f8221b2b 100644
Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/configuredroles_normal.png and b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/configuredroles_normal.png differ
diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/configuredroles_selected.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/configuredroles_selected.png
index f9cea74c9b..527f2fb39f 100644
Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/configuredroles_selected.png and b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/configuredroles_selected.png differ
diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/floatelement_disabled.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/floatelement_disabled.png
index 5525977557..0f2bd67bdf 100644
Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/floatelement_disabled.png and b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/floatelement_disabled.png differ
diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/floatelement_normal.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/floatelement_normal.png
index a84c636d34..ec3bffbbc3 100644
Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/floatelement_normal.png and b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/floatelement_normal.png differ
diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/floatelement_selected.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/floatelement_selected.png
index 477e9d448d..3547eb694a 100644
Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/floatelement_selected.png and b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/floatelement_selected.png differ
diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/hyperlink_disabled.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/hyperlink_disabled.png
index cde4d783a5..edbf8ae1df 100644
Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/hyperlink_disabled.png and b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/hyperlink_disabled.png differ
diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/hyperlink_normal.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/hyperlink_normal.png
index b81a666d5a..9c48ffdcbd 100644
Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/hyperlink_normal.png and b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/hyperlink_normal.png differ
diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/hyperlink_selected.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/hyperlink_selected.png
index 80135b0465..96845bf6c3 100644
Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/hyperlink_selected.png and b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/hyperlink_selected.png differ
diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetlib_disabled.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetlib_disabled.png
index ac9163d6c4..8cfb4dbcaf 100644
Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetlib_disabled.png and b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetlib_disabled.png differ
diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetlib_normal.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetlib_normal.png
index 38979ca5f9..8e1bc886b3 100644
Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetlib_normal.png and b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetlib_normal.png differ
diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetlib_selected.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetlib_selected.png
index 88315dc208..f8cfde0a0e 100644
Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetlib_selected.png and b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetlib_selected.png differ
diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetsettings_disabled.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetsettings_disabled.png
new file mode 100644
index 0000000000..e75e2f461a
Binary files /dev/null and b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetsettings_disabled.png differ
diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetsettings_normal.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetsettings_normal.png
index f67375cdea..e84ac6361a 100644
Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetsettings_normal.png and b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetsettings_normal.png differ
diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetsettings_selected.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetsettings_selected.png
index c36f293f99..31e5ec6c01 100644
Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetsettings_selected.png and b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetsettings_selected.png differ