diff --git a/admin/inc/class.uicategories.inc.php b/admin/inc/class.uicategories.inc.php
index e897e546e3..20eaf59c9b 100644
--- a/admin/inc/class.uicategories.inc.php
+++ b/admin/inc/class.uicategories.inc.php
@@ -113,7 +113,7 @@
 
 			if ($GLOBALS['appname'])
 			{
-				$this->template->set_var('title_categories',lang('%1 global categories',$GLOBALS['phpgw_info']['apps'][$GLOBALS['appname']]['title']));
+				$this->template->set_var('title_categories',$GLOBALS['phpgw_info']['apps'][$GLOBALS['appname']]['title'] . ' ' . lang('global categories'));
 			}
 			else
 			{
@@ -185,15 +185,37 @@
 				$this->template->set_var('add_sub',$GLOBALS['phpgw']->link('/index.php',$link_data));
 				$this->template->set_var('lang_sub_entry',lang('Add sub'));
 
-				$link_data['cat_id'] = $id;
-				$link_data['menuaction'] = 'admin.uicategories.edit';
-				$this->template->set_var('edit',$GLOBALS['phpgw']->link('/index.php',$link_data));
-				$this->template->set_var('lang_edit_entry',lang('Edit'));
+				if ($GLOBALS['appname'] && $categories[$i]['app_name'] == $GLOBALS['appname'])
+				{
+					$show_edit_del = True;
+				}
+				elseif(!$GLOBALS['appname'] && $categories[$i]['app_name'] == 'phpgw')
+				{
+					$show_edit_del = True;
+				}
+				else
+				{
+					$show_edit_del = False;
+				}
 
-				$link_data['menuaction'] = 'admin.uicategories.delete';
-				$this->template->set_var('delete',$GLOBALS['phpgw']->link('/index.php',$link_data));
-				$this->template->set_var('lang_delete_entry',lang('Delete'));
+				if ($show_edit_del)
+				{
+					$link_data['cat_id'] = $id;
+					$link_data['menuaction'] = 'admin.uicategories.edit';
+					$this->template->set_var('edit',$GLOBALS['phpgw']->link('/index.php',$link_data));
+					$this->template->set_var('lang_edit_entry',lang('Edit'));
 
+					$link_data['menuaction'] = 'admin.uicategories.delete';
+					$this->template->set_var('delete',$GLOBALS['phpgw']->link('/index.php',$link_data));
+					$this->template->set_var('lang_delete_entry',lang('Delete'));
+				}
+				else
+				{
+					$this->template->set_var('edit','');
+					$this->template->set_var('lang_edit_entry',' ');
+					$this->template->set_var('delete','');
+					$this->template->set_var('lang_delete_entry',' ');
+				}
 				$this->template->fp('list','cat_list',True);
 			}
 
@@ -232,7 +254,7 @@
 
 			if ($GLOBALS['appname'])
 			{
-				$this->template->set_var('title_categories',lang('Add global category for %1',$GLOBALS['phpgw_info']['apps'][$GLOBALS['appname']]['title']));
+				$this->template->set_var('title_categories',lang('Add global category for x',$GLOBALS['phpgw_info']['apps'][$GLOBALS['appname']]['title']));
 			}
 			else
 			{
@@ -343,7 +365,7 @@
 
 			if ($GLOBALS['appname'])
 			{
-				$this->template->set_var('title_categories',lang('Edit global category for %1',$GLOBALS['phpgw_info']['apps'][$GLOBALS['appname']]['title']));
+				$this->template->set_var('title_categories',lang('Edit global category for x',$GLOBALS['phpgw_info']['apps'][$GLOBALS['appname']]['title']));
 			}
 			else
 			{
diff --git a/admin/setup/phpgw_de.lang b/admin/setup/phpgw_de.lang
index 9cd20e76b1..f228cbc8d8 100644
--- a/admin/setup/phpgw_de.lang
+++ b/admin/setup/phpgw_de.lang
@@ -6,9 +6,10 @@ account preferences	admin	de	Einstellungen der Benutzerkonten
 account permissions	admin	de	Zugriffsrechte
 action	admin	de	Aktion
 add global category	admin	de	Globale Kategorie hinzufügen
-add new account	admin	de	Neues Konto hinzufügen
+add global category for x	admin	de	Globale Kategorie für %1 hinzufügen
+add new account	admin	de	Neues Konto hinzufügen
 add new application	admin	de	Neue Anwendung hinzufügen
-all records and account information will be lost!	admin	de	Alle Datensätze und Kontoinformationen sind dann verloren!
+all records and account information will be lost!	admin	de	Alle Datensätze und Kontoinformationen sind dann verloren!
 allow anonymous access to this app	admin	de	Anonymen Zugriff auf diese Anwendung zulassen
 anonymous user 	admin	de	Anonymer Benutzer
 application name	admin	de	Name der Anwendung
@@ -25,6 +26,7 @@ display	admin	de	Bezeichnung
 do you also want to delete all global subcategories ?	admin	de	wollen Sie auch alle globalen Unterkategorien löschen ?
 edit application	admin	de	Anwendung bearbeiten
 edit global category	admin	de	Globale Kategorie bearbeiten
+edit global category for x	admin	de	Globale Kategorie für %1 bearbeiten
 edit group	admin	de	Gruppe bearbeiten
 edit user account	admin	de	Benutzerkonto bearbeiten
 enabled - hidden from navbar	admin	de	Verfügbar, aber nicht in der Navigationsleiste
diff --git a/admin/setup/phpgw_en.lang b/admin/setup/phpgw_en.lang
index 6cc3519d29..f1fa6407a0 100644
--- a/admin/setup/phpgw_en.lang
+++ b/admin/setup/phpgw_en.lang
@@ -10,6 +10,7 @@ action	admin	en	Action
 add a new account.	admin	en	Add a new account.
 add auto-created users to this group ('Default' will be attempted if this is empty.)	admin	en	Add auto-created users to this group ('Default' will be attempted if this is empty.)
 add global category	admin	en	Add global category
+add global category for x	admin	en	Add global category for %1
 add new account	admin	en	Add new account
 add new application	admin	en	Add new application
 add peer server	admin	en	Add Peer Server
@@ -55,6 +56,7 @@ display	admin	en	Display
 do you also want to delete all global subcategories ?	admin	en	Do you also want to delete all global subcategories ?
 edit application	admin	en	Edit application
 edit global category	admin	en	Edit global category
+edit global category for x	admin	en	Edit global category for %1
 edit group	admin	en	Edit Group
 edit login screen message	admin	en	Edit login screen message
 edit main screen message	admin	en	Edit main screen message