diff --git a/designer_form/src/com/fr/design/mainframe/ComponentTree.java b/designer_form/src/com/fr/design/mainframe/ComponentTree.java
index 6779dfa037..21cb02f095 100644
--- a/designer_form/src/com/fr/design/mainframe/ComponentTree.java
+++ b/designer_form/src/com/fr/design/mainframe/ComponentTree.java
@@ -29,8 +29,8 @@ public class ComponentTree extends JTree {
     private ComponentTreeModel model;
     private UITreeUI uiTreeUI = new UITreeUI();
     private PopupPreviewPane previewPane;
-    private static final int PADDING_LEFT = 10;
-    private static final int PADDING_TOP = 8;
+    private static final int PADDING_LEFT = 5;
+    private static final int PADDING_TOP = 5;
 
     public ComponentTree(FormDesigner designer) {
         this.designer = designer;
diff --git a/designer_form/src/com/fr/design/mainframe/FormHierarchyTreePane.java b/designer_form/src/com/fr/design/mainframe/FormHierarchyTreePane.java
index e133e100ed..212fe33897 100644
--- a/designer_form/src/com/fr/design/mainframe/FormHierarchyTreePane.java
+++ b/designer_form/src/com/fr/design/mainframe/FormHierarchyTreePane.java
@@ -13,6 +13,7 @@ import com.fr.design.gui.controlpane.ShortCut4JControlPane;
 import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.design.gui.itoolbar.UIToolBarUI;
 import com.fr.design.gui.itoolbar.UIToolbar;
+import com.fr.design.gui.style.BorderPane;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.menu.ShortCut;
 import com.fr.design.menu.ToolBarDef;
@@ -33,6 +34,7 @@ public class FormHierarchyTreePane extends FormDockView implements HierarchyTree
 	private static final int PARA = 0;
 	private static final int BODY = 1;
     private static final int SHORTS_SEPARATOR_POS = 4;
+    private static final int TOOLBAR_PADDING_RIGHT = 10;
 
 	private ShortCut4JControlPane[] shorts;
 	private ComponentTree componentTree;
@@ -114,12 +116,11 @@ public class FormHierarchyTreePane extends FormDockView implements HierarchyTree
 		shorts = createShortcuts();
 
 		JPanel widgetPane = new JPanel();
-		widgetPane.setBorder(BorderFactory.createLineBorder(UIConstants.RULER_LINE_COLOR));
 		widgetPane.setLayout(FRGUIPaneFactory.createBorderLayout());
 
 		widgetPane.add(getToolBarPane(), BorderLayout.CENTER);
 		UIScrollPane scrollPane = new UIScrollPane(componentTree);
-        scrollPane.setBorder(BorderFactory.createMatteBorder(1, 0, 0, 0, UIConstants.RULER_LINE_COLOR));
+		scrollPane.setBorder(BorderFactory.createEmptyBorder());
 		scrollPane.setPreferredSize(new Dimension(210, 170));
 		widgetPane.add(scrollPane, BorderLayout.SOUTH);
 		return widgetPane;
@@ -144,7 +145,11 @@ public class FormHierarchyTreePane extends FormDockView implements HierarchyTree
 
 		JPanel toolBarPane = new JPanel(new BorderLayout());
 		toolBarPane.add(toolBar, BorderLayout.CENTER);
-		return toolBarPane;
+		toolBarPane.setBorder(BorderFactory.createMatteBorder(0, 0, 1, 0, UIConstants.BARNOMAL));
+		JPanel toolBarPaneWrapper = new JPanel(new BorderLayout());
+		toolBarPaneWrapper.add(toolBarPane, BorderLayout.CENTER);
+		toolBarPaneWrapper.setBorder(BorderFactory.createEmptyBorder(1, 0, 2, TOOLBAR_PADDING_RIGHT));
+		return toolBarPaneWrapper;
 	}
 
 	protected ShortCut4JControlPane[] createShortcuts() {
diff --git a/designer_form/src/com/fr/design/parameter/ParameterPropertyPane.java b/designer_form/src/com/fr/design/parameter/ParameterPropertyPane.java
index 45593e99d3..6ce5a2ff9e 100644
--- a/designer_form/src/com/fr/design/parameter/ParameterPropertyPane.java
+++ b/designer_form/src/com/fr/design/parameter/ParameterPropertyPane.java
@@ -118,7 +118,7 @@ public class ParameterPropertyPane extends JPanel{
 	private void setEditor(FormDesigner editor) {
 		if (formHierarchyTreePaneWrapper == null) {
 			formHierarchyTreePaneWrapper = new JPanel(new BorderLayout());
-			formHierarchyTreePaneWrapper.setBorder(BorderFactory.createEmptyBorder(PADDING_MIDDLE, PADDING_MIDDLE, 0, PADDING_MIDDLE));
+			formHierarchyTreePaneWrapper.setBorder(BorderFactory.createEmptyBorder(0, PADDING_MIDDLE, 0, 0));
 			this.add(formHierarchyTreePaneWrapper, BorderLayout.SOUTH);
 		}
 		formHierarchyTreePaneWrapper.remove(FormHierarchyTreePane.getInstance());