Index: src/org/openstreetmap/josm/plugins/buildings_tools/BuildingsToolsPlugin.java
===================================================================
--- src/org/openstreetmap/josm/plugins/buildings_tools/BuildingsToolsPlugin.java	(revision 36045)
+++ src/org/openstreetmap/josm/plugins/buildings_tools/BuildingsToolsPlugin.java	(working copy)
@@ -1,6 +1,8 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.buildings_tools;
 
+import static org.openstreetmap.josm.tools.I18n.tr;
+
 import javax.swing.JMenu;
 
 import org.openstreetmap.josm.data.coor.EastNorth;
@@ -14,6 +16,8 @@
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
+import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.ImageResource;
 
 public class BuildingsToolsPlugin extends Plugin {
     public static final Projection MERCATOR = Projections.getProjectionByCode("EPSG:3857"); // Mercator
@@ -28,11 +32,19 @@
 
     public BuildingsToolsPlugin(PluginInformation info) {
         super(info);
-        JMenu dataMenu = MainApplication.getMenu().dataMenu;
-        MainMenu.add(dataMenu, new BuildingSizeAction());
-        MainMenu.add(dataMenu, new BuildingCircleAction());
-        MainMenu.add(dataMenu, new BuildingRectangleAction());
-        MainMenu.add(dataMenu, new MergeAddrPointsAction());
+        JMenu moreToolsMenu = MainApplication.getMenu().moreToolsMenu;
+        if (moreToolsMenu.getMenuComponentCount() > 0) {
+            moreToolsMenu.addSeparator();
+        }
+        final DrawBuildingAction drawBuildingAction = new DrawBuildingAction();
+        MainMenu.add(moreToolsMenu, drawBuildingAction);
+        JMenu optionMenu = new JMenu(tr("Draw buildings modes"));
+        optionMenu.setIcon(ImageProvider.get("preference_small", ImageProvider.ImageSizes.MENU));
+        moreToolsMenu.add(optionMenu);
+        MainMenu.add(optionMenu, new BuildingSizeAction());
+        MainMenu.add(optionMenu, new BuildingCircleAction());
+        MainMenu.add(optionMenu, new BuildingRectangleAction());
+        MainMenu.add(optionMenu, new MergeAddrPointsAction());
     }
 
     @Override