diff --git a/client/src/org/compiere/apps/AEnv.java b/client/src/org/compiere/apps/AEnv.java
index 134a9d9c83..cf16c3f745 100644
--- a/client/src/org/compiere/apps/AEnv.java
+++ b/client/src/org/compiere/apps/AEnv.java
@@ -907,6 +907,14 @@ public final class AEnv
 			{
 				if (updated.contains(f)) continue;
 				SwingUtilities.updateComponentTreeUI(f);
+				f.validate();
+				RepaintManager mgr = RepaintManager.currentManager(f);
+				Component childs[] = f.getComponents();
+				for (Component c : childs) {
+					if (c instanceof JComponent)
+						mgr.markCompletelyDirty((JComponent)c);
+				}
+				f.repaint();
 				updated.add(f);
 			}
 		}
diff --git a/client/src/org/compiere/apps/APanel.java b/client/src/org/compiere/apps/APanel.java
index 585a53dbc5..03dbf8438c 100644
--- a/client/src/org/compiere/apps/APanel.java
+++ b/client/src/org/compiere/apps/APanel.java
@@ -149,7 +149,7 @@ public final class APanel extends CPanel
 		northPanel.setLayout(northLayout);
 		northLayout.setAlignment(FlowLayout.LEFT);
 		toolBar.putClientProperty("JToolBar.isRollover", Boolean.TRUE);
-		//toolBar.setBorderPainted(false);
+		toolBar.setBorderPainted(false);
 		northPanel.add(toolBar, null);
 	}	//	jbInit
 
diff --git a/client/src/org/compiere/apps/Preference.java b/client/src/org/compiere/apps/Preference.java
index 21e1d9cd83..93e6d6a5a3 100644
--- a/client/src/org/compiere/apps/Preference.java
+++ b/client/src/org/compiere/apps/Preference.java
@@ -559,8 +559,9 @@ public final class Preference extends CDialog
 					String sTheme = theme.getValue();
 					if (sTheme != null && sTheme.length() > 0 && !sTheme.equals(themeClass))
 					{
-						ValueNamePair plaf = new ValueNamePair(UIManager.getLookAndFeel().getName(),
-								UIManager.getLookAndFeel().getClass().getName());
+						ValueNamePair plaf = new ValueNamePair(
+								UIManager.getLookAndFeel().getClass().getName(),
+								UIManager.getLookAndFeel().getName());
 						AdempierePLAF.setPLAF(plaf, theme, true);
 						AEnv.updateUI();
 					}