diff --git a/src/objects/window/actions/setcolors.c b/src/objects/window/actions/setcolors.c
index 4d9b6a1..93ada66 100644
--- a/src/objects/window/actions/setcolors.c
+++ b/src/objects/window/actions/setcolors.c
@@ -42,7 +42,8 @@
 
 	action->parent.name = "set.colors";
 	action->icon_name = "gtk-select-color";
-	action->label = N_("Colors");
+	action->label = _("Colors");
+	action->tooltip = _("Change terminal colors");
 
 	return G_ACTION(action);
 
diff --git a/ui/application.xml b/ui/application.xml
index 4e8afdf..f2f82bc 100644
--- a/ui/application.xml
+++ b/ui/application.xml
@@ -184,7 +184,7 @@
 					<attribute name="action">win.file.transfer</attribute>
 				</item>
 
-				<submenu>
+				<!-- submenu>
 
 					<attribute name='label' translatable='yes'>Preferences</attribute>
 
@@ -198,7 +198,7 @@
 						<attribute name="action">win.session.properties</attribute>
 					</item>
 
-				</submenu>
+				</submenu -->
 
 				<item>
 					<attribute name="label" translatable="yes">Close window</attribute>
@@ -355,10 +355,10 @@
 
 			<attribute name='label' translatable='yes'>_Network</attribute>
 
-			<item>
+			<!-- item>
 				<attribute name="label" translatable="yes">Host properties</attribute>
-				<attribute name="action">win.set.host</attribute>
-			</item>
+				<attribute name="action">win.host.properties</attribute>
+			</item -->
 
 			<item>
 				<attribute name="label" translatable="yes">_Connect</attribute>
@@ -376,9 +376,19 @@
 
 			<attribute name='label' translatable='yes'>Settings</attribute>
 
-			<item>
+			<!-- item>
 				<attribute name="label" translatable="yes">Colors</attribute>
 				<attribute name="action">win.set.colors</attribute>
+			</item -->
+
+			<item>
+				<attribute name="label" translatable="yes">Application</attribute>
+				<attribute name="action">app.preferences</attribute>
+			</item>
+
+			<item>
+				<attribute name="label" translatable="yes">Current session</attribute>
+				<attribute name="action">win.session.properties</attribute>
 			</item>
 
 			<submenu>
--
libgit2 0.21.2