Index: applications/editors/josm/plugins/smed/src/smed/menu/file/TabManager.java
===================================================================
--- applications/editors/josm/plugins/smed/src/smed/menu/file/TabManager.java	(revision 23393)
+++ applications/editors/josm/plugins/smed/src/smed/menu/file/TabManager.java	(revision 23419)
@@ -3,5 +3,5 @@
 
 import javax.swing.DefaultListModel;
-import javax.swing.Icon;
+import javax.swing.ImageIcon;
 import javax.swing.JComponent;
 import javax.swing.JDialog;
@@ -16,6 +16,4 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.awt.event.KeyEvent;
-import java.io.IOException;
 import java.util.List;
 
@@ -334,5 +332,4 @@
 			int i = 0;
 			JTabbedPane tabbedPane = SmedTabbedPane.getTabbedPane();
-			Icon icon = null;
 			
 			if(plugins != null) {
@@ -352,11 +349,12 @@
 			
 				tabbedPane.removeAll();
- 
 				JComponent panel = null;
+				ImageIcon icon = null;
 			
 				for(SmedPluggable p : plugins) {
 					if(splugDir.isVisible(p.getFileName()) && !splugDir.isDeleted(p.getFileName())) {
 						panel = p.getComponent();
-        			
+						icon = p.getIcon();
+
 						tabbedPane.addTab(p.getName(),icon, panel, p.getInfo());
 					}
Index: applications/editors/josm/plugins/smed/src/smed/plug/ifc/SmedPluggable.java
===================================================================
--- applications/editors/josm/plugins/smed/src/smed/plug/ifc/SmedPluggable.java	(revision 23393)
+++ applications/editors/josm/plugins/smed/src/smed/plug/ifc/SmedPluggable.java	(revision 23419)
@@ -1,4 +1,5 @@
 package smed.plug.ifc;
 
+import javax.swing.ImageIcon;
 import javax.swing.JComponent;
 
@@ -10,4 +11,5 @@
     String getName();
     String getFileName();
+    ImageIcon getIcon();
     String getInfo();
     JComponent getComponent();
Index: applications/editors/josm/plugins/smed/src/smed/tabs/SmedTabAction.java
===================================================================
--- applications/editors/josm/plugins/smed/src/smed/tabs/SmedTabAction.java	(revision 23393)
+++ applications/editors/josm/plugins/smed/src/smed/tabs/SmedTabAction.java	(revision 23419)
@@ -68,4 +68,11 @@
 
         //Display the window.
+        frame.addWindowListener(new java.awt.event.WindowAdapter() {
+        	public void windowClosing(java.awt.event.WindowEvent e) {
+        		osmItem.setEnabled(true);
+        		
+        		closeDialog();
+        	}
+        });
         frame.setSize(new Dimension(420, 460));
         // frame.pack();
Index: applications/editors/josm/plugins/smed/src/smed/tabs/SmedTabbedPane.java
===================================================================
--- applications/editors/josm/plugins/smed/src/smed/tabs/SmedTabbedPane.java	(revision 23393)
+++ applications/editors/josm/plugins/smed/src/smed/tabs/SmedTabbedPane.java	(revision 23419)
@@ -8,5 +8,5 @@
 import java.util.List;
 
-import javax.swing.Icon;
+import javax.swing.ImageIcon;
 import javax.swing.JComponent;
 import javax.swing.JPanel;
@@ -38,7 +38,7 @@
 
             if(plugins != null) {
-            	Icon icon = null;
+            	ImageIcon icon = null;
             	tabbedPane = new JTabbedPane();
-            	
+
             	JComponent panel;
             	int i = 0;
@@ -48,4 +48,5 @@
             		if(splugDir.isVisible(p.getFileName())) {
             			panel = p.getComponent();
+            			icon  = p.getIcon();
             			
             			tabbedPane.addTab(p.getName(),icon, panel, p.getInfo());