diff --git a/src/gui/dialog/ButtonConfigGui.cpp b/src/gui/dialog/ButtonConfigGui.cpp
index d2ca4fd6..e79f3f4d 100644
--- a/src/gui/dialog/ButtonConfigGui.cpp
+++ b/src/gui/dialog/ButtonConfigGui.cpp
@@ -107,13 +107,13 @@ ButtonConfigGui::ButtonConfigGui(SettingsDialog* dlg, GtkWidget* w,  Settings* s
 	// DRAWING_TYPE_DEFAULT
 	gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(this->cbDrawingType), _C("Normal drawing"));
 	// DRAWING_TYPE_RULER
-	gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(this->cbDrawingType), _C("Ruler"));
+	gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(this->cbDrawingType), _C("Draw Line"));
 	// DRAWING_TYPE_RECTANGLE
-	gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(this->cbDrawingType), _C("Rectangle"));
+	gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(this->cbDrawingType), _C("Draw Rectangle"));
 	// DRAWING_TYPE_CIRCLE
-	gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(this->cbDrawingType), _C("Circle"));
+	gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(this->cbDrawingType), _C("Draw Circle"));
 	// DRAWING_TYPE_ARROW
-	gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(this->cbDrawingType), _C("Arrow"));
+	gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(this->cbDrawingType), _C("Draw Arrow"));
 	// DRAWING_TYPE_STROKE_RECOGNIZER
 	gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(this->cbDrawingType), _C("Stroke recognizer"));
 
diff --git a/src/gui/toolbarMenubar/ToolDrawCombocontrol.cpp b/src/gui/toolbarMenubar/ToolDrawCombocontrol.cpp
index 33179087..3328d7b9 100644
--- a/src/gui/toolbarMenubar/ToolDrawCombocontrol.cpp
+++ b/src/gui/toolbarMenubar/ToolDrawCombocontrol.cpp
@@ -35,11 +35,11 @@ ToolDrawCombocontrol::ToolDrawCombocontrol(ToolMenuHandler* toolMenuHandler, Act
 	this->iconWidget = NULL;
 	setPopupMenu(gtk_menu_new());
 
-	drawTypes.push_back(new ToolDrawType(_("Draw Rectangle"),  "rect-draw.svg",        ACTION_TOOL_DRAW_RECT   ));
-	drawTypes.push_back(new ToolDrawType(_("Draw Circle"),     "circle-draw.svg",      ACTION_TOOL_DRAW_CIRCLE ));
-	drawTypes.push_back(new ToolDrawType(_("Draw Arrow"),      "arrow-draw.svg",       ACTION_TOOL_DRAW_ARROW  ));
-	drawTypes.push_back(new ToolDrawType(_("Draw Line"),       "ruler.svg",            ACTION_RULER            ));
-	drawTypes.push_back(new ToolDrawType(_("Recognize Lines"), "shape_recognizer.svg", ACTION_SHAPE_RECOGNIZER ));
+	drawTypes.push_back(new ToolDrawType(_("Draw Rectangle"),		"rect-draw.svg",		ACTION_TOOL_DRAW_RECT   ));
+	drawTypes.push_back(new ToolDrawType(_("Draw Circle"),			"circle-draw.svg",		ACTION_TOOL_DRAW_CIRCLE ));
+	drawTypes.push_back(new ToolDrawType(_("Draw Arrow"),			"arrow-draw.svg",		ACTION_TOOL_DRAW_ARROW  ));
+	drawTypes.push_back(new ToolDrawType(_("Draw Line"),			"ruler.svg",			ACTION_RULER            ));
+	drawTypes.push_back(new ToolDrawType(_C("Stroke recognizer"),	"shape_recognizer.svg",	ACTION_SHAPE_RECOGNIZER ));
 
 	for (ToolDrawType* t : drawTypes)
 	{
diff --git a/ui/main.glade b/ui/main.glade
index 251c915e..a31d0865 100644
--- a/ui/main.glade
+++ b/ui/main.glade
@@ -87,8 +87,8 @@
                         <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
-                        <accelerator key="u" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                         <accelerator key="s" signal="activate" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
+                        <accelerator key="u" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                       </object>
                     </child>
                     <child>
@@ -112,8 +112,8 @@
                         <property name="can_focus">False</property>
                         <property name="label" translatable="yes">Export as...</property>
                         <property name="use_underline">True</property>
-                        <accelerator key="i" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                         <accelerator key="e" signal="activate" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
+                        <accelerator key="i" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                       </object>
                     </child>
                     <child>
@@ -291,16 +291,14 @@
                         <accelerator key="F11" signal="activate"/>
                       </object>
                     </child>
-
                     <child>
                       <object class="GtkCheckMenuItem" id="menuRecStop">
+                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="label" translatable="yes">Rec-Stop</property>
                       </object>
                     </child>
-
                     <child>
                       <object class="GtkCheckMenuItem" id="menuViewSidebarVisible">
                         <property name="visible">True</property>
@@ -365,8 +363,8 @@
                         <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
-                        <accelerator key="KP_Add" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                         <accelerator key="plus" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+                        <accelerator key="KP_Add" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                       </object>
                     </child>
                     <child>
@@ -376,8 +374,8 @@
                         <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
-                        <accelerator key="KP_Subtract" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                         <accelerator key="minus" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+                        <accelerator key="KP_Subtract" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                       </object>
                     </child>
                     <child>
@@ -792,7 +790,7 @@
                       <object class="GtkCheckMenuItem" id="menuToolsRuler">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Ru_ler</property>
+                        <property name="label" translatable="yes">Draw _Line</property>
                         <property name="use_underline">True</property>
                         <accelerator key="l" signal="activate" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
                       </object>
@@ -842,18 +840,16 @@
                         <accelerator key="v" signal="activate" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
                       </object>
                     </child>
-
                     <child>
                       <object class="GtkCheckMenuItem" id="menuToolsPlayObject">
+                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="label" translatable="yes">Play Object</property>
                         <property name="use_underline">True</property>
                         <property name="draw_as_radio">True</property>
                       </object>
                     </child>
-
                     <child>
                       <object class="GtkCheckMenuItem" id="menuToolsHand">
                         <property name="visible">True</property>