diff --git a/schemas/linux/window.gschema.xml.in b/schemas/linux/window.gschema.xml.in
index 20cc4d5..1e63335 100644
--- a/schemas/linux/window.gschema.xml.in
+++ b/schemas/linux/window.gschema.xml.in
@@ -111,7 +111,7 @@
     </key>
 
     <key name="header-action-names" type="s">
-      <default>'app.new.tab:menu.open-menu,win.disconnect,win.reconnect'</default>
+      <default>'app.tab.new:menu.open-menu,win.disconnect,win.reconnect'</default>
       <summary>The title bar action list</summary>
       <description></description>
     </key>
diff --git a/src/objects/application/actions/window.c b/src/objects/application/actions/window.c
index 92470de..9673c6d 100644
--- a/src/objects/application/actions/window.c
+++ b/src/objects/application/actions/window.c
@@ -63,7 +63,7 @@ GAction * pw3270_quit_action_new() {
 	action->name = "quit";
 	action->label = _( "Quit" );
 	action->tooltip = _( "Close all windows and exit application" );
-	action->icon_name = "gtk-quit";
+	action->icon_name = "application-exit";
 	action->activate = quit_activated;
 
 	return G_ACTION(action);
@@ -80,7 +80,7 @@ GAction * pw3270_new_tab_action_new() {
 
 	PW3270Action * action = pw3270_action_new();
 
-	action->name = "new.tab";
+	action->name = "tab.new";
 	action->label = _( "New tab" );
 	action->tooltip = _( "New tab with default session" );
 	action->icon_name = "tab-new";
@@ -100,7 +100,7 @@ GAction * pw3270_new_window_action_new() {
 
 	PW3270Action * action = pw3270_action_new();
 
-	action->name = "new.window";
+	action->name = "window.new";
 	action->label = _( "New window" );
 	action->tooltip = _( "New window with default session" );
 	action->icon_name = "window-new";
diff --git a/ui/application.xml b/ui/application.xml
index 27992c4..9eadced 100644
--- a/ui/application.xml
+++ b/ui/application.xml
@@ -103,7 +103,7 @@
 
 				<item>
 					<attribute name="label" translatable="yes">Window with default session</attribute>
-					<attribute name="action">app.new.window</attribute>
+					<attribute name="action">app.window.new</attribute>
 				</item>
 
 				<item>
diff --git a/ui/window.xml b/ui/window.xml
index 6bd16e0..eb11df3 100644
--- a/ui/window.xml
+++ b/ui/window.xml
@@ -38,7 +38,7 @@
 
 			<item>
 				<attribute name="label" translatable="yes">Window with default session</attribute>
-				<attribute name="action">app.new.window</attribute>
+				<attribute name="action">app.window.new</attribute>
 			</item>
 
 			<item>
--
libgit2 0.21.2