Index: /applications/editors/josm/plugins/toms/src/toms/dialogs/SmpDialogAction.java
===================================================================
--- /applications/editors/josm/plugins/toms/src/toms/dialogs/SmpDialogAction.java	(revision 23057)
+++ /applications/editors/josm/plugins/toms/src/toms/dialogs/SmpDialogAction.java	(revision 23058)
@@ -116,8 +116,9 @@
 	public JRadioButton rbM01RegionA = null;
 	public JRadioButton rbM01RegionB = null;
-	public JLabel lM01Icon = null;
-	public JLabel lM02Icon = null;
-	public JLabel lM03Icon = null;
-	public JLabel lM04Icon = null;
+	public JLabel lM01Icon = null;	// Shape
+	public JLabel lM02Icon = null;	// Light
+	public JLabel lM03Icon = null;	// Reflector
+	public JLabel lM04Icon = null;	// Racon
+	public JLabel lM05Icon = null;	// Fog
 	public JLabel lM01FireMark = null;
 	private JLabel lM01TypeOfMark = null;
@@ -525,4 +526,9 @@
 			lM04Icon.setText(""); //$NON-NLS-1$
 
+			lM05Icon = new JLabel();
+			lM05Icon.setBounds(new Rectangle(210, 20, 150, 200));
+			lM05Icon.setIcon(null);
+			lM05Icon.setText(""); //$NON-NLS-1$
+
 			lM01FireMark = new JLabel();
 			lM01FireMark.setBounds(new Rectangle(300, 85, 95, 20));
@@ -676,4 +682,5 @@
 			pM01SeaMap.add(lM03Icon, null);
 			pM01SeaMap.add(lM04Icon, null);
+			pM01SeaMap.add(lM05Icon, null);
 			pM01SeaMap.add(getCbM01TypeOfMark(), null);
 			pM01SeaMap.add(lM01TypeOfMark, null);
@@ -830,5 +837,4 @@
 							cbM01CatOfMark.addItem(Messages.getString("SmpDialogAction.207")); //$NON-NLS-1$
 							cbM01CatOfMark.addItem(Messages.getString("SmpDialogAction.208")); //$NON-NLS-1$
-							cbM01CatOfMark.addItem(Messages.getString("SmpDialogAction.209")); //$NON-NLS-1$
 						}
 						break;
@@ -1044,4 +1050,10 @@
 			cM01Fog.setFont(new Font("Dialog", Font.PLAIN, 12)); //$NON-NLS-1$
 			cM01Fog.setText(Messages.getString("SmpDialogAction.174")); //$NON-NLS-1$
+			cM01Fog.addActionListener(new ActionListener() {
+				public void actionPerformed(ActionEvent e) {
+					buoy.setFog(cM01Fog.isSelected());
+					buoy.paintSign();
+				}
+			});
 		}
 		return cM01Fog;
Index: /applications/editors/josm/plugins/toms/src/toms/seamarks/SeaMark.java
===================================================================
--- /applications/editors/josm/plugins/toms/src/toms/seamarks/SeaMark.java	(revision 23057)
+++ /applications/editors/josm/plugins/toms/src/toms/seamarks/SeaMark.java	(revision 23058)
@@ -64,5 +64,4 @@
 	public final static int LIGHT_MAJOR = 2;
 	public final static int LIGHT_MINOR = 3;
-	public final static int LIGHT_FLOAT = 4;
 
 	/**
Index: /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/Buoy.java
===================================================================
--- /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/Buoy.java	(revision 23057)
+++ /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/Buoy.java	(revision 23058)
@@ -259,4 +259,5 @@
 		dlg.lM03Icon.setIcon(null);
 		dlg.lM04Icon.setIcon(null);
+		dlg.lM05Icon.setIcon(null);
 		
 		dlg.rbM01RegionA.setSelected(!getRegion());
@@ -289,4 +290,8 @@
 			dlg.lM01Racon.setVisible(false);
 			dlg.tfM01Racon.setVisible(false);
+		}
+		
+		if (hasFog()) {
+			dlg.lM05Icon.setIcon(new ImageIcon(getClass().getResource("/images/Fog_Signal.png")));
 		}
 		
@@ -418,9 +423,9 @@
 		dlg.cM01Racon.setVisible(false);
 		dlg.cbM01Racon.setVisible(false);
-		setRatyp(0);
 		dlg.tfM01Racon.setText("");
 		dlg.tfM01Racon.setVisible(false);
 		dlg.lM01Racon.setVisible(false);
 		setRacon(false);
+		setRatyp(0);
 		dlg.cM01Fog.setSelected(false);
 		dlg.cM01Fog.setVisible(false);
Index: /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyCard.java
===================================================================
--- /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyCard.java	(revision 23057)
+++ /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyCard.java	(revision 23058)
@@ -203,4 +203,7 @@
 		dlg.cM01Racon.setEnabled(true);
 		dlg.cM01Racon.setVisible(true);
+		dlg.cM01Fog.setEnabled(true);
+		dlg.cM01Fog.setVisible(true);
+
 		dlg.cM01Fired.setEnabled(true);
 		dlg.cM01Fired.setVisible(true);
Index: /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyIsol.java
===================================================================
--- /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyIsol.java	(revision 23057)
+++ /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyIsol.java	(revision 23058)
@@ -117,4 +117,8 @@
 		dlg.cM01Racon.setEnabled(true);
 		dlg.cM01Racon.setVisible(true);
+		dlg.cM01Fog.setEnabled(true);
+		dlg.cM01Fog.setVisible(true);
+
+		dlg.cM01Fired.setVisible(true);
 		dlg.cM01Fired.setEnabled(true);
 
Index: /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyLat.java
===================================================================
--- /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyLat.java	(revision 23057)
+++ /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyLat.java	(revision 23058)
@@ -358,4 +358,8 @@
 		dlg.cM01Racon.setEnabled(true);
 		dlg.cM01Racon.setVisible(true);
+		dlg.cM01Fog.setEnabled(true);
+		dlg.cM01Fog.setVisible(true);
+
+		dlg.cM01Fired.setVisible(true);
 		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 23057)
+++ /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyNota.java	(revision 23058)
@@ -52,5 +52,17 @@
 		dlg.sM01StatusBar.setText(getErrMsg());
 
-		switch (getStyleIndex()) {
+		dlg.cM01Radar.setEnabled(true);
+		dlg.cM01Radar.setVisible(true);
+		dlg.cM01Racon.setEnabled(true);
+		dlg.cM01Racon.setVisible(true);
+
+		dlg.cM01Fog.setEnabled(true);
+		dlg.cM01Fog.setVisible(true);
+
+		dlg.cM01Fired.setVisible(true);
+		dlg.cM01Fired.setEnabled(false);
+		dlg.cM01Fired.setSelected(true);
+
+		switch (getBuoyIndex()) {
 		case SeaMark.LIGHT_HOUSE:
 			dlg.lM01Icon.setIcon(new ImageIcon(getClass().getResource(
@@ -66,9 +78,4 @@
 			dlg.lM01Icon.setIcon(new ImageIcon(getClass().getResource(
 					"/images/Light_Minor.png")));
-			break;
-
-		case SeaMark.LIGHT_FLOAT:
-//			dlg.lM01Icon01.setIcon(new ImageIcon(getClass().getResource(
-//					"/images/Light_Float.png")));
 			break;
 
Index: /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoySaw.java
===================================================================
--- /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoySaw.java	(revision 23057)
+++ /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoySaw.java	(revision 23058)
@@ -118,4 +118,10 @@
 		dlg.cM01Fired.setEnabled(true);
 
+		dlg.cM01Fog.setEnabled(true);
+		dlg.cM01Fog.setVisible(true);
+
+		dlg.cM01Fired.setVisible(true);
+		dlg.cM01Fired.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 23057)
+++ /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoySpec.java	(revision 23058)
@@ -158,4 +158,10 @@
 		}
 
+		dlg.cM01Fog.setEnabled(true);
+		dlg.cM01Fog.setVisible(true);
+
+		dlg.cM01Fired.setVisible(true);
+		dlg.cM01Fired.setEnabled(true);
+
 		String image = "/images/Special_Purpose";