Index: /applications/editors/josm/plugins/alignways/build.xml
===================================================================
--- /applications/editors/josm/plugins/alignways/build.xml	(revision 27809)
+++ /applications/editors/josm/plugins/alignways/build.xml	(revision 27810)
@@ -35,5 +35,5 @@
         with
     -->
-    <property name="plugin.main.version" value="4847"/>
+    <property name="plugin.main.version" value="4928"/>
     <!--
         ************************************************ ** should not be
Index: /applications/editors/josm/plugins/alignways/src/com/tilusnet/josm/plugins/alignways/AlignWaysAction.java
===================================================================
--- /applications/editors/josm/plugins/alignways/src/com/tilusnet/josm/plugins/alignways/AlignWaysAction.java	(revision 27809)
+++ /applications/editors/josm/plugins/alignways/src/com/tilusnet/josm/plugins/alignways/AlignWaysAction.java	(revision 27810)
@@ -33,5 +33,5 @@
                         + "around a chosen pivot."), 
 				Shortcut.registerShortcut("tools:alignways", tr("Tool: {0}", tr("Align Ways")),
-                                KeyEvent.VK_SPACE, Shortcut.GROUP_DIRECT, Shortcut.SHIFT_DEFAULT)
+                                KeyEvent.VK_SPACE, Shortcut.GROUP_DIRECT+Shortcut.GROUPS_ALT1)
 				, true);
         setEnabled(false);
Index: /applications/editors/josm/plugins/alignways/src/com/tilusnet/josm/plugins/alignways/AlignWaysCmdKeepLength.java
===================================================================
--- /applications/editors/josm/plugins/alignways/src/com/tilusnet/josm/plugins/alignways/AlignWaysCmdKeepLength.java	(revision 27809)
+++ /applications/editors/josm/plugins/alignways/src/com/tilusnet/josm/plugins/alignways/AlignWaysCmdKeepLength.java	(revision 27810)
@@ -11,5 +11,5 @@
 import java.util.Map;
 
-import javax.swing.JLabel;
+import javax.swing.Icon;
 import javax.swing.JOptionPane;
 import javax.swing.SwingConstants;
@@ -189,7 +189,11 @@
 
     @Override
-    public JLabel getDescription() {
-        return new JLabel(tr("Align way segment"), ImageProvider.get("",
-                "alignways"), SwingConstants.HORIZONTAL);
+    public String getDescriptionText() {
+        return tr("Align way segment");
+    }
+
+    @Override
+    public Icon getDescriptionIcon() {
+        return ImageProvider.get("alignways");
     }
 
Index: /applications/editors/josm/plugins/alignways/src/com/tilusnet/josm/plugins/alignways/AlignWaysMode.java
===================================================================
--- /applications/editors/josm/plugins/alignways/src/com/tilusnet/josm/plugins/alignways/AlignWaysMode.java	(revision 27809)
+++ /applications/editors/josm/plugins/alignways/src/com/tilusnet/josm/plugins/alignways/AlignWaysMode.java	(revision 27810)
@@ -45,5 +45,5 @@
                 Shortcut.registerShortcut("mapmode:alignways",
                         tr("Mode: {0}", tr("Align Ways")),
-                        KeyEvent.VK_N, Shortcut.GROUP_EDIT, Shortcut.SHIFT_DEFAULT),
+                        KeyEvent.VK_N, Shortcut.GROUP_EDIT+Shortcut.GROUPS_ALT1),
                         mapFrame, Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
         noneSelected = new AlignWaysSelNoneState();