Index: applications/editors/josm/plugins/toms/src/toms/dialogs/SmpDialogAction.java
===================================================================
--- applications/editors/josm/plugins/toms/src/toms/dialogs/SmpDialogAction.java	(revision 23222)
+++ applications/editors/josm/plugins/toms/src/toms/dialogs/SmpDialogAction.java	(revision 23223)
@@ -123,4 +123,5 @@
     public JLabel lM04Icon = null; // Racon
     public JLabel lM05Icon = null; // Fog
+    public JLabel lM06Icon = null; // Topmark
     public JLabel lM01FireMark = null;
     private JLabel lM01TypeOfMark = null;
@@ -535,4 +536,9 @@
             lM05Icon.setText(""); //$NON-NLS-1$
 
+            lM06Icon = new JLabel();
+            lM06Icon.setBounds(new Rectangle(210, 20, 150, 200));
+            lM06Icon.setIcon(null);
+            lM06Icon.setText(""); //$NON-NLS-1$
+
             lM01FireMark = new JLabel();
             lM01FireMark.setBounds(new Rectangle(300, 85, 95, 20));
@@ -690,4 +696,5 @@
             pM01SeaMap.add(lM04Icon, null);
             pM01SeaMap.add(lM05Icon, null);
+            pM01SeaMap.add(lM06Icon, null);
             pM01SeaMap.add(getCbM01TypeOfMark(), null);
             pM01SeaMap.add(lM01TypeOfMark, null);
Index: applications/editors/josm/plugins/toms/src/toms/plug/PluginApp.java
===================================================================
--- applications/editors/josm/plugins/toms/src/toms/plug/PluginApp.java	(revision 23222)
+++ applications/editors/josm/plugins/toms/src/toms/plug/PluginApp.java	(revision 23223)
@@ -28,5 +28,5 @@
         // wait
         try {
-            Thread.sleep(10000);
+            Thread.sleep(1000);
         } catch (InterruptedException e) {
             e.printStackTrace();
Index: applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/Buoy.java
===================================================================
--- applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/Buoy.java	(revision 23222)
+++ applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/Buoy.java	(revision 23223)
@@ -499,4 +499,5 @@
         dlg.lM04Icon.setIcon(null);
         dlg.lM05Icon.setIcon(null);
+		dlg.lM06Icon.setIcon(null);
 
         dlg.rbM01RegionA.setSelected(!getRegion());
@@ -965,4 +966,6 @@
         dlg.lM03Icon.setIcon(null);
         dlg.lM04Icon.setIcon(null);
+		dlg.lM05Icon.setIcon(null);
+		dlg.lM06Icon.setIcon(null);
 
         dlg.rbM01RegionA.setEnabled(false);
Index: applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyLat.java
===================================================================
--- applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyLat.java	(revision 23222)
+++ applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyLat.java	(revision 23223)
@@ -613,5 +613,5 @@
             if (!image.equals("/images/Lateral")) { //$NON-NLS-1$
 
-                if (hasTopMark()) {
+/*                if (hasTopMark()) {
                     if (cat == PORT_HAND || cat == PREF_PORT_HAND)
                         image += "_Can"; //$NON-NLS-1$
@@ -619,5 +619,5 @@
                         image += "_Cone"; //$NON-NLS-1$
                 }
-                image += ".png"; //$NON-NLS-1$
+*/                image += ".png"; //$NON-NLS-1$
                 dlg.lM01Icon.setIcon(new ImageIcon(getClass().getResource(image)));
 
Index: applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoySaw.java
===================================================================
--- applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoySaw.java	(revision 23222)
+++ applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoySaw.java	(revision 23223)
@@ -174,6 +174,6 @@
 
             if (!image.equals("/images/Safe_Water")) { //$NON-NLS-1$
-                if (hasTopMark())
-                    image += "_Sphere"; //$NON-NLS-1$
+//                if (hasTopMark())
+//                    image += "_Sphere"; //$NON-NLS-1$
                 image += ".png"; //$NON-NLS-1$
                 dlg.lM01Icon.setIcon(new ImageIcon(getClass().getResource(image)));
@@ -238,5 +238,5 @@
         default:
         }
-        saveTopMarkData("spherical", "red"); //$NON-NLS-1$ //$NON-NLS-2$
+        saveTopMarkData("sphere", "red"); //$NON-NLS-1$ //$NON-NLS-2$
         saveLightData(); //$NON-NLS-1$
         saveRadarFogData();