Index: /applications/editors/josm/plugins/toms/src/toms/dialogs/SmpDialogAction.java
===================================================================
--- /applications/editors/josm/plugins/toms/src/toms/dialogs/SmpDialogAction.java	(revision 23049)
+++ /applications/editors/josm/plugins/toms/src/toms/dialogs/SmpDialogAction.java	(revision 23050)
@@ -814,5 +814,5 @@
 							buoy = new BuoySpec(dia, n);
 							cbM01TopMark.removeAllItems();
-							cbM01TopMark.addItem("");
+							cbM01TopMark.addItem(Messages.getString("SmpDialogAction.212"));
 							cbM01TopMark.addItem(Messages.getString("SmpDialogAction.210")); //$NON-NLS-1$
 							cbM01TopMark.addItem(Messages.getString("SmpDialogAction.211")); //$NON-NLS-1$
Index: /applications/editors/josm/plugins/toms/src/toms/msg/messages.properties
===================================================================
--- /applications/editors/josm/plugins/toms/src/toms/msg/messages.properties	(revision 23049)
+++ /applications/editors/josm/plugins/toms/src/toms/msg/messages.properties	(revision 23050)
@@ -63,5 +63,4 @@
 SmpDialogAction.28=Please select only one node
 SmpDialogAction.4=Edit OpenSeaMap
-SmpDialogAction.82=Parse-Error: Invalid colour
 SmpDialogAction.9=Seamap Editor
 SmpDialogAction.91=Seamark not set
@@ -74,3 +73,4 @@
 SmpDialogAction.210=Yellow X
 SmpDialogAction.211=Red X
+SmpDialogAction.212=Not set
 
Index: /applications/editors/josm/plugins/toms/src/toms/seamarks/SeaMark.java
===================================================================
--- /applications/editors/josm/plugins/toms/src/toms/seamarks/SeaMark.java	(revision 23049)
+++ /applications/editors/josm/plugins/toms/src/toms/seamarks/SeaMark.java	(revision 23050)
@@ -112,7 +112,7 @@
 	
 	public final static int UNKNOWN_RATYP = 0;
-	public final static int RATYP_RACON = 0;
-	public final static int RATYP_RAMARK = 0;
-	public final static int RATYP_LEADING = 0;
+	public final static int RATYP_RACON = 1;
+	public final static int RATYP_RAMARK = 2;
+	public final static int RATYP_LEADING = 3;
 
 	/**
Index: /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/Buoy.java
===================================================================
--- /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/Buoy.java	(revision 23049)
+++ /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/Buoy.java	(revision 23050)
@@ -277,6 +277,17 @@
 			dlg.lM04Icon.setIcon(new ImageIcon(getClass().getResource("/images/Radar_Station.png")));
 			dlg.cbM01Racon.setVisible(true);
-		} else 
+			if (getRatyp() == RATYP_RACON) {
+				dlg.lM01Racon.setVisible(true);
+				dlg.tfM01Racon.setVisible(true);
+				dlg.tfM01Racon.setEnabled(true);
+			} else {
+				dlg.lM01Racon.setVisible(false);
+				dlg.tfM01Racon.setVisible(false);
+			}
+		} else {
 			dlg.cbM01Racon.setVisible(false);
+			dlg.lM01Racon.setVisible(false);
+			dlg.tfM01Racon.setVisible(false);
+		}
 		
 		if (isFired()) {
Index: /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoySaw.java
===================================================================
--- /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoySaw.java	(revision 23049)
+++ /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoySaw.java	(revision 23050)
@@ -140,9 +140,8 @@
 
 		if (!image.equals("/images/Safe_Water")) {
+			if (hasTopMark())
+				image += "_Sphere";
 			image += ".png";
 			dlg.lM01Icon.setIcon(new ImageIcon(getClass().getResource(image)));
-
-			if (hasTopMark())
-				image += "_Sphere";
 
 			if (isFired()) {