diff --git a/administrator/components/com_menus/presets/joomla.xml b/administrator/components/com_menus/presets/joomla.xml
index cd813caf4c5..d17643c4b2d 100644
--- a/administrator/components/com_menus/presets/joomla.xml
+++ b/administrator/components/com_menus/presets/joomla.xml
@@ -21,35 +21,28 @@
 		>
 		<menuitem
 			title="MOD_MENU_COM_CONTENT_ARTICLE_MANAGER"
-			quicktask-title="MOD_MENU_COM_CONTENT_NEW_ARTICLE"
 			type="component"
 			element="com_content"
 			link="index.php?option=com_content&amp;view=articles"
 			quicktask="index.php?option=com_content&amp;task=article.add"
-		>
-			<menuitem
-				title="MOD_MENU_COM_CONTENT_NEW_ARTICLE"
-				type="component"
-				element="com_content"
-				icon="fa fa-plus"
-				link="index.php?option=com_content&amp;task=article.add"
-			/>
-			<menuitem
-				title="MOD_MENU_COM_CONTENT_FEATURED"
-				type="component"
-				element="com_content"
-				link="index.php?option=com_content&amp;view=featured"
-				class="class:featured"
-			/>
-		</menuitem>
+			quicktask-title="MOD_MENU_COM_CONTENT_NEW_ARTICLE"
+		/>
+
+		<menuitem
+			title="MOD_MENU_COM_CONTENT_FEATURED"
+			type="component"
+			element="com_content"
+			link="index.php?option=com_content&amp;view=featured"
+			class="class:featured"
+		/>
 
 		<menuitem
 			title="MOD_MENU_COM_CONTENT_CATEGORY_MANAGER"
-			quicktask-title="MOD_MENU_COM_CONTENT_NEW_CATEGORY"
 			type="component"
 			element="com_categories"
 			link="index.php?option=com_categories&amp;view=categories&amp;extension=com_content"
 			quicktask="index.php?option=com_categories&amp;extension=com_content&amp;task=category.add"
+			quicktask-title="MOD_MENU_COM_CONTENT_NEW_CATEGORY"
 		/>
 
 		<menuitem
@@ -79,7 +72,7 @@
 		/>
 
 		<menuitem
-				type="separator"
+			type="separator"
 		/>
 
 		<menuitem
@@ -89,6 +82,19 @@
 			link="index.php?option=com_media"
 			class="class:image"
 		/>
+		
+		<menuitem
+			type="separator"
+		/>
+
+		<menuitem
+			title="MOD_MENU_EXTENSIONS_MODULE_MANAGER_MODULES"
+			type="component"
+			element="com_modules"
+			link="index.php?option=com_modules&amp;view=modules&amp;client_id=0"
+			quicktask="index.php?option=com_modules&amp;view=select"
+			quicktask-title="MOD_MENU_COM_CONTENT_NEW_MODULE"
+		/>
 	</menuitem>
 
 	<menuitem
@@ -135,13 +141,13 @@
 			>
 			<menuitem
 				title="{sql:title} "
-				quicktask-title="MOD_MENU_MENU_MANAGER_NEW_MENU_ITEM"
 				type="component"
 				element="com_menus"
 				link="index.php?option=com_menus&amp;view=items&amp;menutype={sql:menutype}"
 				icon="{sql:icon}"
 				class="class:menu"
 				quicktask="index.php?option=com_menus&amp;task=item.add&amp;menutype={sql:menutype}"
+				quicktask-title="MOD_MENU_MENU_MANAGER_NEW_MENU_ITEM"
 			/>
 		</menuitem>
 
@@ -183,11 +189,11 @@
 		>
 		<menuitem
 			title="MOD_MENU_COM_USERS_USER_MANAGER"
-			quicktask-title="MOD_MENU_COM_USERS_ADD_USER"
 			type="component"
 			element="com_users"
 			link="index.php?option=com_users&amp;view=users"
 			quicktask="index.php?option=com_users&amp;task=user.add"
+			quicktask-title="MOD_MENU_COM_USERS_ADD_USER"
 		/>
 
 		<menuitem
@@ -306,14 +312,6 @@
 			element="com_templates"
 			link="index.php?option=com_templates&amp;view=templates&amp;client_id=0"
 		/>
-		<menuitem
-			title="MOD_MENU_EXTENSIONS_MODULE_MANAGER_MODULES"
-			quicktask-title="MOD_MENU_COM_CONTENT_NEW_MODULE"
-			type="component"
-			element="com_modules"
-			link="index.php?option=com_modules&amp;view=modules&amp;client_id=0"
-			quicktask="index.php?option=com_modules&amp;view=select"
-		/>
 		<menuitem
 			title="MOD_MENU_MANAGE_PLUGINS"
 			type="component"
@@ -322,6 +320,10 @@
 			permission="core.manage;com_plugins"
 		/>
 
+		<menuitem
+			type="separator"
+		/>
+
 		<menuitem
 			title="MOD_MENU_INSTALL"
 			type="heading"
@@ -400,140 +402,132 @@
 			/>
 		</menuitem>		
 
-		<menuitem
-			type="separator"
-		/>
-
 		<menuitem
 			title="MOD_MENU_MANAGE"
 			type="heading"
 			icon="tasks"
 		>
-		<menuitem
-			title="MOD_MENU_MANAGE_EXTENSIONS"
-			type="component"
-			element="com_installer"
-			link="index.php?option=com_installer&amp;view=manage"
-			permission="core.manage;com_installer"
-		/>
-
-		<menuitem
-			title="MOD_MENU_MANAGE_LANGUAGES"
-			type="component"
-			element="com_language"
-			link="index.php?option=com_languages&amp;view=installed"
-			permission="core.manage;com_language"
-		/>
+			<menuitem
+				title="MOD_MENU_MANAGE_EXTENSIONS"
+				type="component"
+				element="com_installer"
+				link="index.php?option=com_installer&amp;view=manage"
+				permission="core.manage;com_installer"
+			/>
 
-		<menuitem
-			title="MOD_MENU_MANAGE_LANGUAGES_CONTENT"
-			type="component"
-			element="com_language"
-			link="index.php?option=com_languages&amp;view=languages"
-			permission="core.manage;com_language"
-		/>
+			<menuitem
+				title="MOD_MENU_MANAGE_LANGUAGES"
+				type="component"
+				element="com_language"
+				link="index.php?option=com_languages&amp;view=installed"
+				permission="core.manage;com_language"
+			/>
 
-		<menuitem
-			title="MOD_MENU_MANAGE_LANGUAGES_OVERRIDES"
-			type="component"
-			element="com_language"
-			link="index.php?option=com_languages&amp;view=overrides"
-			permission="core.manage;com_language"
-		/>
+			<menuitem
+				title="MOD_MENU_MANAGE_LANGUAGES_CONTENT"
+				type="component"
+				element="com_language"
+				link="index.php?option=com_languages&amp;view=languages"
+				permission="core.manage;com_language"
+			/>
 
-		<menuitem
-			title="MOD_MENU_MANAGE_CSP"
-			type="component"
-			element="com_csp"
-			link="index.php?option=com_csp"
-			permission="core.manage;com_csp"
-		/>
+			<menuitem
+				title="MOD_MENU_MANAGE_LANGUAGES_OVERRIDES"
+				type="component"
+				element="com_language"
+				link="index.php?option=com_languages&amp;view=overrides"
+				permission="core.manage;com_language"
+			/>
 
-		<menuitem
-			title="MOD_MENU_MANAGE_REDIRECTS"
-			type="component"
-			element="com_redirect"
-			link="index.php?option=com_redirect"
-			permission="core.manage;com_redirect"
-		/>
-	</menuitem>
+			<menuitem
+				title="MOD_MENU_MANAGE_CSP"
+				type="component"
+				element="com_csp"
+				link="index.php?option=com_csp"
+				permission="core.manage;com_csp"
+			/>
 
-	<menuitem
-		type="separator"
-	/>
+			<menuitem
+				title="MOD_MENU_MANAGE_REDIRECTS"
+				type="component"
+				element="com_redirect"
+				link="index.php?option=com_redirect"
+				permission="core.manage;com_redirect"
+			/>
+		</menuitem>
 
-	<menuitem
-		title="MOD_MENU_UPDATE"
-		type="heading"
-		icon="sync"
-		>
 		<menuitem
-			title="MOD_MENU_UPDATE_JOOMLA"
-			type="component"
-			element="com_joomlaupdate"
-			link="index.php?option=com_joomlaupdate"
-			permission="core.manage;com_joomlaupdate"
-			ajax-badge="index.php?option=com_joomlaupdate&amp;task=getMenuBadgeData&amp;format=json"
-		/>
+			title="MOD_MENU_UPDATE"
+			type="heading"
+			icon="sync"
+			>
+			<menuitem
+				title="MOD_MENU_UPDATE_JOOMLA"
+				type="component"
+				element="com_joomlaupdate"
+				link="index.php?option=com_joomlaupdate"
+				permission="core.manage;com_joomlaupdate"
+				ajax-badge="index.php?option=com_joomlaupdate&amp;task=getMenuBadgeData&amp;format=json"
+			/>
 
-		<menuitem
-			title="MOD_MENU_UPDATE_EXTENSIONS"
-			type="component"
-			element="com_installer"
-			link="index.php?option=com_installer&amp;view=update"
-			permission="core.manage;com_installer"
-			ajax-badge="index.php?option=com_installer&amp;task=update.getMenuBadgeData&amp;format=json"
-		/>
+			<menuitem
+				title="MOD_MENU_UPDATE_EXTENSIONS"
+				type="component"
+				element="com_installer"
+				link="index.php?option=com_installer&amp;view=update"
+				permission="core.manage;com_installer"
+				ajax-badge="index.php?option=com_installer&amp;task=update.getMenuBadgeData&amp;format=json"
+			/>
 
-		<menuitem
-			title="MOD_MENU_UPDATE_SOURCES"
-			type="component"
-			element="com_installer"
-			link="index.php?option=com_installer&amp;view=updatesites"
-			permission="core.manage;com_installer"
-		/>
-	</menuitem>
+			<menuitem
+				title="MOD_MENU_UPDATE_SOURCES"
+				type="component"
+				element="com_installer"
+				link="index.php?option=com_installer&amp;view=updatesites"
+				permission="core.manage;com_installer"
+			/>
+		</menuitem>
 
-	<menuitem
-		title="MOD_MENU_INFORMATION"
-		type="heading"
-		icon="info-circle"
-		>
 		<menuitem
-			title="MOD_MENU_INFORMATION_WARNINGS"
-			type="component"
-			element="com_installer"
-			link="index.php?option=com_installer&amp;view=warnings"
-			permission="core.manage;com_installer"
-			ajax-badge="index.php?option=com_installer&amp;task=getMenuBadgeData&amp;format=json"
-		/>
+			title="MOD_MENU_INFORMATION"
+			type="heading"
+			icon="info-circle"
+			>
+			<menuitem
+				title="MOD_MENU_INFORMATION_WARNINGS"
+				type="component"
+				element="com_installer"
+				link="index.php?option=com_installer&amp;view=warnings"
+				permission="core.manage;com_installer"
+				ajax-badge="index.php?option=com_installer&amp;task=getMenuBadgeData&amp;format=json"
+			/>
 
-		<menuitem
-			title="MOD_MENU_INFORMATION_POST_INSTALL_MESSAGES"
-			type="component"
-			element="com_postinstall"
-			link="index.php?option=com_postinstall"
-			permission="core.manage;com_postinstall"
-			ajax-badge="index.php?option=com_postinstall&amp;task=getMenuBadgeData&amp;format=json"
-		/>
+			<menuitem
+				title="MOD_MENU_INFORMATION_POST_INSTALL_MESSAGES"
+				type="component"
+				element="com_postinstall"
+				link="index.php?option=com_postinstall"
+				permission="core.manage;com_postinstall"
+				ajax-badge="index.php?option=com_postinstall&amp;task=getMenuBadgeData&amp;format=json"
+			/>
 
-		<menuitem
-			title="MOD_MENU_SYSTEM_INFORMATION_SYSINFO"
-			type="component"
-			element="com_admin"
-			link="index.php?option=com_admin&amp;view=sysinfo"
-			permission="core.admin"
-		/>
+			<menuitem
+				title="MOD_MENU_SYSTEM_INFORMATION_SYSINFO"
+				type="component"
+				element="com_admin"
+				link="index.php?option=com_admin&amp;view=sysinfo"
+				permission="core.admin"
+			/>
 
-		<menuitem
-			title="MOD_MENU_SYSTEM_INFORMATION_DATABASE"
-			type="component"
-			element="com_installer"
-			link="index.php?option=com_installer&amp;view=database"
-			permission="core.manage;com_installer"
-			ajax-badge="index.php?option=com_installer&amp;task=database.getMenuBadgeData&amp;format=json"
-		/>
-	</menuitem>
+			<menuitem
+				title="MOD_MENU_SYSTEM_INFORMATION_DATABASE"
+				type="component"
+				element="com_installer"
+				link="index.php?option=com_installer&amp;view=database"
+				permission="core.manage;com_installer"
+				ajax-badge="index.php?option=com_installer&amp;task=database.getMenuBadgeData&amp;format=json"
+			/>
+		</menuitem>
 	</menuitem>
 
 	<menuitem