Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/AbstractAddressEditAction.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/AbstractAddressEditAction.java	(revision 27906)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/AbstractAddressEditAction.java	(revision 27907)
@@ -52,6 +52,6 @@
 	 * @param icon
 	 */
-	public AbstractAddressEditAction(String name, String iconName, String tooltip) {
-		super(name, iconName, tooltip, null, true);
+	public AbstractAddressEditAction(String name, String iconName, String tooltip, String toolbar) {
+		super(name, iconName, tooltip, null, true, toolbar, true);
 
 		setEnabled(false);
@@ -62,5 +62,5 @@
 	 */
 	public AbstractAddressEditAction(String name) {
-		this(name, null, "");
+		this(name, null, "", null);
 	}
 
Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/ApplyAllGuessesAction.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/ApplyAllGuessesAction.java	(revision 27906)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/ApplyAllGuessesAction.java	(revision 27907)
@@ -44,5 +44,6 @@
 	 */
 	public ApplyAllGuessesAction(String tag) {
-		super(tr("Apply"), "applyguesses_24", tr("Turns all guesses into the corresponding tag values."));
+		super(tr("Apply"), "applyguesses_24", tr("Turns all guesses into the corresponding tag values."),
+			"fixaddresses/applyallguesses");
 		this.tag = tag;
 	}
Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/AssignAddressToStreetAction.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/AssignAddressToStreetAction.java	(revision 27906)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/AssignAddressToStreetAction.java	(revision 27907)
@@ -34,5 +34,6 @@
 	public AssignAddressToStreetAction() {
 		super(tr("Assign address to street"), "assignstreet_24",
-				tr("Assign the selected address(es) to the selected street."));
+			tr("Assign the selected address(es) to the selected street."),
+			"fixaddresses/assignaddresstostreet");
 	}
 
Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/ConvertAllToRelationAction.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/ConvertAllToRelationAction.java	(revision 27906)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/ConvertAllToRelationAction.java	(revision 27907)
@@ -24,5 +24,6 @@
 	public ConvertAllToRelationAction() {
 		super(tr("Convert ALL streets."), "convert2rel_24",
-				tr("Create relation between street and related addresses for ALL streets in the current layer."));
+			tr("Create relation between street and related addresses for ALL streets in the current layer."),
+			"fixaddresses/convertalltorelation");
 	}
 
Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/ConvertToRelationAction.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/ConvertToRelationAction.java	(revision 27906)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/ConvertToRelationAction.java	(revision 27907)
@@ -31,5 +31,6 @@
 	public ConvertToRelationAction() {
 		super(tr("Convert to relation."), "convert2rel_24",
-				tr("Create relation between street and related addresses."));
+			tr("Create relation between street and related addresses."),
+			"fixaddresses/converttorelation");
 	}
 
@@ -41,6 +42,6 @@
 	 * @param tooltip the tool tip to show on hover
 	 */
-	public ConvertToRelationAction(String name, String iconName, String tooltip) {
-		super(name, iconName, tooltip);
+	public ConvertToRelationAction(String name, String iconName, String tooltip, String toolbar) {
+		super(name, iconName, tooltip, toolbar);
 	}
 
Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/GuessAddressDataAction.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/GuessAddressDataAction.java	(revision 27906)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/GuessAddressDataAction.java	(revision 27907)
@@ -39,5 +39,6 @@
 	 */
 	public GuessAddressDataAction() {
-		super(tr("Guess"), "guessstreets_24", tr("Tries to guess address data by picking the name of the closest object with according tag."));
+		super(tr("Guess"), "guessstreets_24", tr("Tries to guess address data by picking the name of the closest object with according tag."),
+			"fixaddresses/guessaddressdata");
 	}
 
Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/RemoveAddressTagsAction.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/RemoveAddressTagsAction.java	(revision 27906)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/RemoveAddressTagsAction.java	(revision 27907)
@@ -24,5 +24,6 @@
 
 	public RemoveAddressTagsAction() {
-		super(tr("Remove"), "removeaddrtags_24", tr("Removes address related tags from the object."));
+		super(tr("Remove"), "removeaddrtags_24", tr("Removes address related tags from the object."),
+			"fixaddresses/removeaddresstags");
 	}
 
Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java	(revision 27906)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java	(revision 27907)
@@ -53,5 +53,6 @@
 	 */
 	public SelectAddressesInMapAction() {
-		super(tr("Select"), "selectall", tr("Marks selected addresses in the map"));
+		super(tr("Select"), "selectall", tr("Marks selected addresses in the map"),
+			"fixaddresses/selectaddressesinmap");
 	}