diff --git a/src/org/zlibrary/core/resources/ZLTreeResource.java b/src/org/zlibrary/core/resources/ZLTreeResource.java
index 9cac0c60b..54c33b1ee 100644
--- a/src/org/zlibrary/core/resources/ZLTreeResource.java
+++ b/src/org/zlibrary/core/resources/ZLTreeResource.java
@@ -90,13 +90,13 @@ class ZLTreeResource extends ZLResource {
 				String name = attributeValue(attributes, "name");
 				if (name != null) {
 					String value = attributeValue(attributes, "value");
-					Map<String, ZLTreeResource> children = myStack.peek().myChildren;
+					ZLTreeResource peek = myStack.peek();
 					ZLTreeResource node;
-					if (children == null) {
+					if (peek.myChildren == null) {
 						node = null;
-						children = new HashMap<String, ZLTreeResource>();
 					} else {
-						node = children.get(name);
+						node = peek.myChildren.get(name);
+						peek.myChildren = new HashMap<String,ZLTreeResource>();
 					}
 					if (node == null) {
 						if (value != null) {
@@ -104,7 +104,7 @@ class ZLTreeResource extends ZLResource {
 						} else {
 							node = new ZLTreeResource(name);
 						}
-						children.put(name, node);
+						peek.myChildren.put(name, node);
 					} else {
 						if (value != null) {
 							node.setValue(value);
diff --git a/src/org/zlibrary/ui/swing/application/ZLSwingApplicationWindow.java b/src/org/zlibrary/ui/swing/application/ZLSwingApplicationWindow.java
index 91d950ad9..1e74e2908 100644
--- a/src/org/zlibrary/ui/swing/application/ZLSwingApplicationWindow.java
+++ b/src/org/zlibrary/ui/swing/application/ZLSwingApplicationWindow.java
@@ -32,7 +32,7 @@ import org.zlibrary.ui.swing.view.ZLSwingViewWidget;
 public class ZLSwingApplicationWindow extends ZLApplicationWindow {
 	private JFrame myFrame;
 	private JToolBar myToolbar;
-	private Map<Item, Action> myItemActionMap = new HashMap<Item, Action>();
+	private final Map<Item, Action> myItemActionMap = new HashMap<Item, Action>();
 
 	final private ZLIntegerRangeOption myXOption =
 		new ZLIntegerRangeOption(ZLOption.LOOK_AND_FEEL_CATEGORY, "Options", "XPosition", 0, 2000, 10);
@@ -118,11 +118,7 @@ public class ZLSwingApplicationWindow extends ZLApplicationWindow {
 	public void addToolbarItem(Item item) {
 		if (item.getType() == Item.Type.BUTTON) {
 			ButtonItem buttonItem = (ButtonItem)item;
-			String iconFileName = "icons/toolbar/" + buttonItem.getIconName() + ".png";
-			java.net.URL iconURL = getClass().getClassLoader().getResource(iconFileName);
-			ImageIcon icon = (iconURL != null) ? new ImageIcon(iconURL) : new ImageIcon(iconFileName);
 			Action action = new MyButtonAction(buttonItem);
-			action.putValue(Action.SMALL_ICON, icon); 
 			myToolbar.add(action);
 			myItemActionMap.put(item, action);
 		} else {
@@ -131,25 +127,29 @@ public class ZLSwingApplicationWindow extends ZLApplicationWindow {
 	}
 	
 	private class MyButtonAction extends AbstractAction {
-		private ButtonItem item;
+		private ButtonItem myItem;
 		
 		MyButtonAction(ButtonItem item) {
-			this.item = item;
+			myItem = item;
+
+			String iconFileName = "icons/toolbar/" + myItem.getIconName() + ".png";
+			java.net.URL iconURL = getClass().getClassLoader().getResource(iconFileName);
+			ImageIcon icon = (iconURL != null) ? new ImageIcon(iconURL) : new ImageIcon(iconFileName);
+			putValue(Action.SMALL_ICON, icon); 
 		}
 		
 		public void actionPerformed(ActionEvent event) {
-			onButtonPress(item);
+			onButtonPress(myItem);
 		}
 	}
 
 	public void setToolbarItemState(Item item, boolean visible, boolean enabled) {
-		AbstractAction action = (AbstractAction)myItemActionMap.get(item);
+		Action action = myItemActionMap.get(item);
 		if (action != null) {
 			action.setEnabled(enabled);
 		}
 		//setVisible()???		
 		// TODO: implement
-		
 	}
 
 	public void setToggleButtonState(ButtonItem item) {