Index: applications/editors/josm/plugins/toms/src/toms/dialogs/SmpDialogAction.java
===================================================================
--- applications/editors/josm/plugins/toms/src/toms/dialogs/SmpDialogAction.java	(revision 23012)
+++ applications/editors/josm/plugins/toms/src/toms/dialogs/SmpDialogAction.java	(revision 23013)
@@ -791,4 +791,8 @@
 						if (!(buoy instanceof BuoySpec)) {
 							buoy = new BuoySpec(dia, n);
+							cbM01TopMark.removeAllItems();
+							cbM01TopMark.addItem("");
+							cbM01TopMark.addItem(Messages.getString("SmpDialogAction.210")); //$NON-NLS-1$
+							cbM01TopMark.addItem(Messages.getString("SmpDialogAction.211")); //$NON-NLS-1$
 						}
 						buoy.setBuoyIndex(type);
@@ -921,5 +925,5 @@
 		if (cbM01TopMark == null) {
 			cbM01TopMark = new JComboBox();
-			cbM01TopMark.setBounds(new Rectangle(100, 170, 70, 20));
+			cbM01TopMark.setBounds(new Rectangle(110, 170, 80, 20));
 			cbM01TopMark.setFont(new Font("Dialog", Font.PLAIN, 12)); //$NON-NLS-1$
 			cbM01TopMark.addActionListener(new ActionListener() {
Index: applications/editors/josm/plugins/toms/src/toms/msg/messages_de.properties
===================================================================
--- applications/editors/josm/plugins/toms/src/toms/msg/messages_de.properties	(revision 23012)
+++ applications/editors/josm/plugins/toms/src/toms/msg/messages_de.properties	(revision 23013)
@@ -67,3 +67,5 @@
 SmpDialogAction.208=Minor Light
 SmpDialogAction.209=Light Float
+SmpDialogAction.210=Yellow X
+SmpDialogAction.211=Red X
 
Index: applications/editors/josm/plugins/toms/src/toms/msg/messages_en.properties
===================================================================
--- applications/editors/josm/plugins/toms/src/toms/msg/messages_en.properties	(revision 23012)
+++ applications/editors/josm/plugins/toms/src/toms/msg/messages_en.properties	(revision 23013)
@@ -72,2 +72,4 @@
 SmpDialogAction.208=Minor Light
 SmpDialogAction.209=Light Float
+SmpDialogAction.210=Yellow X
+SmpDialogAction.211=Red X
Index: applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyCard.java
===================================================================
--- applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyCard.java	(revision 23012)
+++ applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyCard.java	(revision 23013)
@@ -197,6 +197,8 @@
 
 		dlg.cM01TopMark.setSelected(true);
+		dlg.cM01TopMark.setVisible(true);
 		dlg.cM01TopMark.setEnabled(false);
 		dlg.cM01Fired.setEnabled(true);
+		dlg.cM01Fired.setVisible(true);
 
 		String image = "/images/Cardinal";
Index: applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyIsol.java
===================================================================
--- applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyIsol.java	(revision 23012)
+++ applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyIsol.java	(revision 23013)
@@ -113,6 +113,7 @@
 		dlg.tfM01Name.setEnabled(true);
 		dlg.tfM01Name.setText(getName());
+		dlg.cM01TopMark.setEnabled(false);
+		dlg.cM01TopMark.setVisible(false);
 		dlg.cM01Fired.setEnabled(true);
-		dlg.cM01TopMark.setEnabled(false);
 
 		String image = "/images/Cardinal";
Index: applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyLat.java
===================================================================
--- applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyLat.java	(revision 23012)
+++ applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyLat.java	(revision 23013)
@@ -352,6 +352,7 @@
 		dlg.tfM01Name.setEnabled(true);
 		dlg.tfM01Name.setText(getName());
+		dlg.cM01TopMark.setEnabled(true);
+		dlg.cM01TopMark.setVisible(true);
 		dlg.cM01Fired.setEnabled(true);
-		dlg.cM01TopMark.setEnabled(true);
 
 		String image = "/images/Lateral";
Index: applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoySaw.java
===================================================================
--- applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoySaw.java	(revision 23012)
+++ applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoySaw.java	(revision 23013)
@@ -110,6 +110,7 @@
 		dlg.tfM01Name.setEnabled(true);
 		dlg.tfM01Name.setText(getName());
+		dlg.cM01TopMark.setEnabled(true);
+		dlg.cM01TopMark.setVisible(true);
 		dlg.cM01Fired.setEnabled(true);
-		dlg.cM01TopMark.setEnabled(true);
 
 		String image = "/images/Safe_Water";
Index: applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoySpec.java
===================================================================
--- applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoySpec.java	(revision 23012)
+++ applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoySpec.java	(revision 23013)
@@ -23,5 +23,5 @@
 		keys = node.getKeys();
 		setNode(node);
-		
+
 		resetMask();
 
@@ -147,4 +147,11 @@
 		dlg.tfM01Name.setEnabled(true);
 		dlg.tfM01Name.setText(getName());
+		dlg.cM01TopMark.setEnabled(true);
+		dlg.cM01TopMark.setVisible(true);
+		if (hasTopMark()) {
+			dlg.cbM01TopMark.setEnabled(true);
+			dlg.cbM01TopMark.setVisible(true);
+		} else
+			dlg.cbM01TopMark.setVisible(false);
 
 		String image = "/images/Special_Purpose";
@@ -182,5 +189,6 @@
 
 			if (isFired()) {
-				dlg.lM01Icon02.setIcon(new ImageIcon(getClass().getResource("/images/Light_White_120.png")));
+				dlg.lM01Icon02.setIcon(new ImageIcon(getClass().getResource(
+						"/images/Light_White_120.png")));
 				if (getLightChar() != "") {
 					String c;