Index: applications/editors/josm/plugins/toms/src/toms/dialogs/SmpDialogAction.java
===================================================================
--- applications/editors/josm/plugins/toms/src/toms/dialogs/SmpDialogAction.java	(revision 23037)
+++ applications/editors/josm/plugins/toms/src/toms/dialogs/SmpDialogAction.java	(revision 23038)
@@ -949,4 +949,5 @@
 				public void actionPerformed(ActionEvent e) {
 					int top = cbM01TopMark.getSelectedIndex();
+					buoy.paintSign();
 				}
 			});
Index: applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/Buoy.java
===================================================================
--- applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/Buoy.java	(revision 23037)
+++ applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/Buoy.java	(revision 23038)
@@ -245,4 +245,9 @@
 
 	public void paintSign() {
+
+		dlg.lM01Icon.setIcon(null);
+		dlg.lM02Icon.setIcon(null);
+		dlg.lM03Icon.setIcon(null);
+		dlg.lM04Icon.setIcon(null);
 		
 		dlg.cM01TopMark.setSelected(hasTopMark());
@@ -252,4 +257,14 @@
 
 		dlg.tfM01Name.setText(getName());
+		
+		if (hasRadar()) {
+			dlg.lM03Icon.setIcon(new ImageIcon(getClass().getResource("/images/Radar_Reflector.png")));
+		}
+		
+		if (hasRacon()) {
+			dlg.lM04Icon.setIcon(new ImageIcon(getClass().getResource("/images/Radar_Station.png")));
+			dlg.cbM01Racon.setVisible(true);
+		} else 
+			dlg.cbM01Racon.setVisible(false);
 		
 		if (isFired()) {
@@ -287,9 +302,4 @@
 			dlg.lM01FireMark.setText("");
 		}
-
-		dlg.lM01Icon.setIcon(null);
-		dlg.lM02Icon.setIcon(null);
-		dlg.lM03Icon.setIcon(null);
-		dlg.lM04Icon.setIcon(null);
 	}
 
Index: applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyCard.java
===================================================================
--- applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyCard.java	(revision 23037)
+++ applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyCard.java	(revision 23038)
@@ -191,7 +191,4 @@
 
 		dlg.sM01StatusBar.setText(getErrMsg());
-		dlg.lM02Icon.setIcon(null);
-		dlg.lM03Icon.setIcon(null);
-		dlg.lM04Icon.setIcon(null);
 
 		dlg.tfM01Name.setEnabled(true);
@@ -205,11 +202,4 @@
 		dlg.cM01Racon.setEnabled(true);
 		dlg.cM01Racon.setVisible(true);
-		if (hasRacon()) {
-			dlg.cbM01Racon.setEnabled(true);
-			dlg.cbM01Racon.setVisible(true);
-			dlg.lM04Icon.setIcon(new ImageIcon(getClass().getResource("/images/Radar_Station.png")));
-		} else {
-			dlg.cbM01Racon.setVisible(false);
-		}
 		dlg.cM01Fired.setEnabled(true);
 		dlg.cM01Fired.setVisible(true);
@@ -262,8 +252,4 @@
 			image += ".png";
 			dlg.lM01Icon.setIcon(new ImageIcon(getClass().getResource(image)));
-			
-			if (hasRadar()) {
-				dlg.lM03Icon.setIcon(new ImageIcon(getClass().getResource("/images/Radar_Reflector.png")));
-			}
 			
 			if (isFired()) {
Index: applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyIsol.java
===================================================================
--- applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyIsol.java	(revision 23037)
+++ applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyIsol.java	(revision 23038)
@@ -40,6 +40,4 @@
 		dlg.cbM01Kennung.addItem("Fl(2)");
 
-		dlg.cM01TopMark.setSelected(true);
-
 		setColour(SeaMark.BLACK_RED_BLACK);
 		setLightColour("W");
@@ -109,14 +107,13 @@
 
 		dlg.sM01StatusBar.setText(getErrMsg());
-		dlg.lM02Icon.setIcon(null);
-		dlg.lM03Icon.setIcon(null);
-		dlg.lM04Icon.setIcon(null);
 
 		dlg.tfM01Name.setEnabled(true);
 		dlg.tfM01Name.setText(getName());
 		dlg.cM01TopMark.setEnabled(false);
-		dlg.cM01TopMark.setVisible(false);
+		dlg.cM01TopMark.setVisible(true);
 		dlg.cM01Radar.setEnabled(true);
 		dlg.cM01Radar.setVisible(true);
+		dlg.cM01Racon.setEnabled(true);
+		dlg.cM01Racon.setVisible(true);
 		dlg.cM01Fired.setEnabled(true);
 
@@ -146,17 +143,4 @@
 			dlg.lM01Icon.setIcon(new ImageIcon(getClass().getResource(image)));
 
-			if (hasRadar()) {
-				dlg.lM03Icon.setIcon(new ImageIcon(getClass().getResource("/images/Radar_Reflector.png")));
-			}
-			dlg.cM01Racon.setEnabled(true);
-			dlg.cM01Racon.setVisible(true);
-			if (hasRacon()) {
-				dlg.cbM01Racon.setEnabled(true);
-				dlg.cbM01Racon.setVisible(true);
-				dlg.lM04Icon.setIcon(new ImageIcon(getClass().getResource("/images/Radar_Station.png")));
-			} else {
-				dlg.cbM01Racon.setVisible(false);
-			}
-			
 			if (isFired()) {
 				dlg.lM02Icon.setIcon(new ImageIcon(getClass().getResource(
Index: applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyLat.java
===================================================================
--- applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyLat.java	(revision 23037)
+++ applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyLat.java	(revision 23038)
@@ -348,7 +348,4 @@
 
 		dlg.sM01StatusBar.setText(getErrMsg());
-		dlg.lM02Icon.setIcon(null);
-		dlg.lM03Icon.setIcon(null);
-		dlg.lM04Icon.setIcon(null);
 
 		dlg.tfM01Name.setEnabled(true);
@@ -360,11 +357,4 @@
 		dlg.cM01Racon.setEnabled(true);
 		dlg.cM01Racon.setVisible(true);
-		if (hasRacon()) {
-			dlg.cbM01Racon.setEnabled(true);
-			dlg.cbM01Racon.setVisible(true);
-			dlg.lM04Icon.setIcon(new ImageIcon(getClass().getResource("/images/Radar_Station.png")));
-		} else {
-			dlg.cbM01Racon.setVisible(false);
-		}
 		dlg.cM01Fired.setEnabled(true);
 
Index: applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyNota.java
===================================================================
--- applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyNota.java	(revision 23037)
+++ applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyNota.java	(revision 23038)
@@ -50,7 +50,4 @@
 
 		dlg.sM01StatusBar.setText(getErrMsg());
-		dlg.lM02Icon.setIcon(null);
-		dlg.lM03Icon.setIcon(null);
-		dlg.lM04Icon.setIcon(null);
 
 		switch (getStyleIndex()) {
Index: applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoySaw.java
===================================================================
--- applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoySaw.java	(revision 23037)
+++ applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoySaw.java	(revision 23038)
@@ -106,7 +106,4 @@
 
 		dlg.sM01StatusBar.setText(getErrMsg());
-		dlg.lM02Icon.setIcon(null);
-		dlg.lM03Icon.setIcon(null);
-		dlg.lM04Icon.setIcon(null);
 
 		dlg.tfM01Name.setEnabled(true);
@@ -116,4 +113,6 @@
 		dlg.cM01Radar.setEnabled(true);
 		dlg.cM01Radar.setVisible(true);
+		dlg.cM01Racon.setEnabled(true);
+		dlg.cM01Racon.setVisible(true);
 		dlg.cM01Fired.setEnabled(true);
 
@@ -146,17 +145,4 @@
 				image += "_Sphere";
 
-			if (hasRadar()) {
-				dlg.lM03Icon.setIcon(new ImageIcon(getClass().getResource("/images/Radar_Reflector.png")));
-			}
-			dlg.cM01Racon.setEnabled(true);
-			dlg.cM01Racon.setVisible(true);
-			if (hasRacon()) {
-				dlg.cbM01Racon.setEnabled(true);
-				dlg.cbM01Racon.setVisible(true);
-				dlg.lM04Icon.setIcon(new ImageIcon(getClass().getResource("/images/Radar_Station.png")));
-			} else {
-				dlg.cbM01Racon.setVisible(false);
-			}
-			
 			if (isFired()) {
 				dlg.lM02Icon.setIcon(new ImageIcon(getClass().getResource("/images/Light_White_120.png")));
Index: applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoySpec.java
===================================================================
--- applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoySpec.java	(revision 23037)
+++ applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoySpec.java	(revision 23038)
@@ -143,10 +143,12 @@
 
 		dlg.sM01StatusBar.setText(getErrMsg());
-		dlg.lM02Icon.setIcon(null);
-		dlg.lM03Icon.setIcon(null);
-		dlg.lM04Icon.setIcon(null);
 
 		dlg.tfM01Name.setEnabled(true);
 		dlg.tfM01Name.setText(getName());
+		dlg.cM01Radar.setEnabled(true);
+		dlg.cM01Radar.setVisible(true);
+		dlg.cM01Racon.setEnabled(true);
+		dlg.cM01Racon.setVisible(true);
+		
 		dlg.cM01TopMark.setEnabled(true);
 		dlg.cM01TopMark.setVisible(true);
@@ -154,6 +156,7 @@
 			dlg.cbM01TopMark.setEnabled(true);
 			dlg.cbM01TopMark.setVisible(true);
-		} else
+		} else {
 			dlg.cbM01TopMark.setVisible(false);
+		}
 
 		String image = "/images/Special_Purpose";
@@ -190,17 +193,4 @@
 			dlg.lM01Icon.setIcon(new ImageIcon(getClass().getResource(image)));
 
-			if (hasRadar()) {
-				dlg.lM03Icon.setIcon(new ImageIcon(getClass().getResource("/images/Radar_Reflector.png")));
-			}
-			dlg.cM01Racon.setEnabled(true);
-			dlg.cM01Racon.setVisible(true);
-			if (hasRacon()) {
-				dlg.cbM01Racon.setEnabled(true);
-				dlg.cbM01Racon.setVisible(true);
-				dlg.lM04Icon.setIcon(new ImageIcon(getClass().getResource("/images/Radar_Station.png")));
-			} else {
-				dlg.cbM01Racon.setVisible(false);
-			}
-			
 			if (isFired()) {
 				dlg.lM02Icon.setIcon(new ImageIcon(getClass().getResource(