diff -r 3e8b5c9b4033 -r e4198fc2ead4 ui/motif/toolbar.c
--- a/ui/motif/toolbar.c	Sun May 11 10:41:29 2014 +0200
+++ b/ui/motif/toolbar.c	Sun May 11 11:35:33 2014 +0200
@@ -191,7 +191,8 @@
     XmString label = XmStringCreateLocalized(item->label);
     XtSetArg(args[0], XmNlabelString, label);
     XtSetArg(args[1], XmNshadowThickness, 1);
-    Widget button = XmCreatePushButton(parent, "toolbar_button", args, 2);
+    XtSetArg(args[2], XmNtraversalOn, FALSE);
+    Widget button = XmCreatePushButton(parent, "toolbar_button", args, 3);
     
     XmStringFree(label);
     
@@ -224,8 +225,8 @@
     XmString label = XmStringCreateLocalized(stock_item->label);
     XtSetArg(args[0], XmNlabelString, label);
     XtSetArg(args[1], XmNshadowThickness, 1);
-    //XtSetArg(args[2], XmNhighlightThickness, 0);
-    Widget button = XmCreatePushButton(parent, "toolbar_button", args, 2);
+    XtSetArg(args[2], XmNtraversalOn, FALSE);
+    Widget button = XmCreatePushButton(parent, "toolbar_button", args, 3);
     
     XmStringFree(label);
     
@@ -256,8 +257,9 @@
     XmString label = XmStringCreateLocalized(item->label);
     XtSetArg(args[0], XmNlabelString, label);
     XtSetArg(args[1], XmNshadowThickness, 1);
-    XtSetArg(args[2], XmNindicatorOn, XmINDICATOR_NONE);
-    Widget button = XmCreateToggleButton(parent, "toolbar_toggle_button", args, 3);
+    XtSetArg(args[2], XmNtraversalOn, FALSE);
+    XtSetArg(args[3], XmNindicatorOn, XmINDICATOR_NONE);
+    Widget button = XmCreateToggleButton(parent, "toolbar_toggle_button", args, 4);
     
     XmStringFree(label);