diff --git a/layout-management-webapps/src/main/resources/locale/navigation/group/platform/administrators_en.properties b/layout-management-webapps/src/main/resources/locale/navigation/group/platform/administrators_en.properties
deleted file mode 100644
index ed7d915ea..000000000
--- a/layout-management-webapps/src/main/resources/locale/navigation/group/platform/administrators_en.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Copyright (C) 2009 eXo Platform SAS.
-# 
-# This is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of
-# the License, or (at your option) any later version.
-# 
-# This software is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this software; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-#
-
-administration.application-registry=Application Registry
-administration.pageManagement=Manage Pages
-administration.groupnavigation=Group sites Management
-administration.portalnavigation=Sites Management
-administration.siteManagement=Sites
diff --git a/layout-management-webapps/src/main/resources/locale/navigation/group/platform/administrators_fr.properties b/layout-management-webapps/src/main/resources/locale/navigation/group/platform/administrators_fr.properties
deleted file mode 100644
index 8c03c518c..000000000
--- a/layout-management-webapps/src/main/resources/locale/navigation/group/platform/administrators_fr.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (C) 2009 eXo Platform SAS.
-# 
-# This is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of
-# the License, or (at your option) any later version.
-# 
-# This software is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this software; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-#
-
-administration.application-registry=Gestion des Applications
-administration.pageManagement=Parcourir les Pages
-administration.groupnavigation=Navigation de Groupe
-administration.portalnavigation=Gestion des Sites
diff --git a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_ar.properties b/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_ar.properties
deleted file mode 100644
index 48ebcf28f..000000000
--- a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_ar.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-image.title.ImageUpdated=\u062A\u0645 \u062A\u062D\u062F\u064A\u062B \u0627\u0644\u062E\u0644\u0641\u064A\u0629 \u0628\u0646\u062C\u0627\u062D
-image.title.ImageDeleted=\u062A\u0645 \u062D\u0630\u0641 \u0627\u0644\u062E\u0644\u0641\u064A\u0629 \u0628\u0646\u062C\u0627\u062D
-image.title.deleteImage=\u062D\u0630\u0641 \u0627\u0644\u062E\u0644\u0641\u064A\u0629
-image.title.ChangeImage=\u062A\u063A\u064A\u064A\u0631 \u0627\u0644\u062E\u0644\u0641\u064A\u0629
diff --git a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_aro.properties b/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_aro.properties
deleted file mode 100644
index 48ebcf28f..000000000
--- a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_aro.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-image.title.ImageUpdated=\u062A\u0645 \u062A\u062D\u062F\u064A\u062B \u0627\u0644\u062E\u0644\u0641\u064A\u0629 \u0628\u0646\u062C\u0627\u062D
-image.title.ImageDeleted=\u062A\u0645 \u062D\u0630\u0641 \u0627\u0644\u062E\u0644\u0641\u064A\u0629 \u0628\u0646\u062C\u0627\u062D
-image.title.deleteImage=\u062D\u0630\u0641 \u0627\u0644\u062E\u0644\u0641\u064A\u0629
-image.title.ChangeImage=\u062A\u063A\u064A\u064A\u0631 \u0627\u0644\u062E\u0644\u0641\u064A\u0629
diff --git a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_az.properties b/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_az.properties
deleted file mode 100644
index 6abbddb04..000000000
--- a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_az.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-image.title.ImageUpdated=Background successfully updated
-image.title.ImageDeleted=Background successfully deleted
-image.title.deleteImage=Delete Background
-image.title.ChangeImage=Change background
diff --git a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_ca.properties b/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_ca.properties
deleted file mode 100644
index 6abbddb04..000000000
--- a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_ca.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-image.title.ImageUpdated=Background successfully updated
-image.title.ImageDeleted=Background successfully deleted
-image.title.deleteImage=Delete Background
-image.title.ChangeImage=Change background
diff --git a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_ceb.properties b/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_ceb.properties
deleted file mode 100644
index 6abbddb04..000000000
--- a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_ceb.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-image.title.ImageUpdated=Background successfully updated
-image.title.ImageDeleted=Background successfully deleted
-image.title.deleteImage=Delete Background
-image.title.ChangeImage=Change background
diff --git a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_co.properties b/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_co.properties
deleted file mode 100644
index 6abbddb04..000000000
--- a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_co.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-image.title.ImageUpdated=Background successfully updated
-image.title.ImageDeleted=Background successfully deleted
-image.title.deleteImage=Delete Background
-image.title.ChangeImage=Change background
diff --git a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_cs.properties b/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_cs.properties
deleted file mode 100644
index 6abbddb04..000000000
--- a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_cs.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-image.title.ImageUpdated=Background successfully updated
-image.title.ImageDeleted=Background successfully deleted
-image.title.deleteImage=Delete Background
-image.title.ChangeImage=Change background
diff --git a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_de.properties b/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_de.properties
deleted file mode 100644
index d1851a959..000000000
--- a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_de.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-image.title.ImageUpdated=Hintergrund erfolgreich aktualisiert
-image.title.ImageDeleted=Hintergrund erfolgreich gel\u00F6scht
-image.title.deleteImage=Hintergrund l\u00F6schen
-image.title.ChangeImage=Hintergrundbild \u00E4ndern
diff --git a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_el.properties b/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_el.properties
deleted file mode 100644
index 6abbddb04..000000000
--- a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_el.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-image.title.ImageUpdated=Background successfully updated
-image.title.ImageDeleted=Background successfully deleted
-image.title.deleteImage=Delete Background
-image.title.ChangeImage=Change background
diff --git a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_en.properties b/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_en.properties
deleted file mode 100644
index 6abbddb04..000000000
--- a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_en.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-image.title.ImageUpdated=Background successfully updated
-image.title.ImageDeleted=Background successfully deleted
-image.title.deleteImage=Delete Background
-image.title.ChangeImage=Change background
diff --git a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_es_ES.properties b/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_es_ES.properties
deleted file mode 100644
index 6abbddb04..000000000
--- a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_es_ES.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-image.title.ImageUpdated=Background successfully updated
-image.title.ImageDeleted=Background successfully deleted
-image.title.deleteImage=Delete Background
-image.title.ChangeImage=Change background
diff --git a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_eu.properties b/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_eu.properties
deleted file mode 100644
index 6abbddb04..000000000
--- a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_eu.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-image.title.ImageUpdated=Background successfully updated
-image.title.ImageDeleted=Background successfully deleted
-image.title.deleteImage=Delete Background
-image.title.ChangeImage=Change background
diff --git a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_fa.properties b/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_fa.properties
deleted file mode 100644
index 6abbddb04..000000000
--- a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_fa.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-image.title.ImageUpdated=Background successfully updated
-image.title.ImageDeleted=Background successfully deleted
-image.title.deleteImage=Delete Background
-image.title.ChangeImage=Change background
diff --git a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_fi.properties b/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_fi.properties
deleted file mode 100644
index 6abbddb04..000000000
--- a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_fi.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-image.title.ImageUpdated=Background successfully updated
-image.title.ImageDeleted=Background successfully deleted
-image.title.deleteImage=Delete Background
-image.title.ChangeImage=Change background
diff --git a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_fil.properties b/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_fil.properties
deleted file mode 100644
index 6abbddb04..000000000
--- a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_fil.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-image.title.ImageUpdated=Background successfully updated
-image.title.ImageDeleted=Background successfully deleted
-image.title.deleteImage=Delete Background
-image.title.ChangeImage=Change background
diff --git a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_fr.properties b/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_fr.properties
deleted file mode 100644
index 546c95309..000000000
--- a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_fr.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-image.title.ImageUpdated=L'image a \u00E9t\u00E9 mise \u00E0 jour avec succ\u00E8s
-image.title.ImageDeleted=L'image a \u00E9t\u00E9 supprim\u00E9e avec succ\u00E8s
-image.title.deleteImage=Supprimer l'image
-image.title.ChangeImage=Changer l'image
diff --git a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_hi.properties b/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_hi.properties
deleted file mode 100644
index 6abbddb04..000000000
--- a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_hi.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-image.title.ImageUpdated=Background successfully updated
-image.title.ImageDeleted=Background successfully deleted
-image.title.deleteImage=Delete Background
-image.title.ChangeImage=Change background
diff --git a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_hu.properties b/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_hu.properties
deleted file mode 100644
index 6abbddb04..000000000
--- a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_hu.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-image.title.ImageUpdated=Background successfully updated
-image.title.ImageDeleted=Background successfully deleted
-image.title.deleteImage=Delete Background
-image.title.ChangeImage=Change background
diff --git a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_id.properties b/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_id.properties
deleted file mode 100644
index 46f8eda2d..000000000
--- a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_id.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-image.title.ImageUpdated=Background telah diperbarui
-image.title.ImageDeleted=Background telah dihapus
-image.title.deleteImage=Hapus latar belakang
-image.title.ChangeImage=Ubah latar belakang
diff --git a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_in.properties b/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_in.properties
deleted file mode 100644
index 6abbddb04..000000000
--- a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_in.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-image.title.ImageUpdated=Background successfully updated
-image.title.ImageDeleted=Background successfully deleted
-image.title.deleteImage=Delete Background
-image.title.ChangeImage=Change background
diff --git a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_it.properties b/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_it.properties
deleted file mode 100644
index 1f44c59b1..000000000
--- a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_it.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-image.title.ImageUpdated=Sfondo aggiornato con successo
-image.title.ImageDeleted=Sfondo eliminato con successo
-image.title.deleteImage=Eliminare lo Sfondo
-image.title.ChangeImage=Cambiare il sfondo
diff --git a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_ja.properties b/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_ja.properties
deleted file mode 100644
index 6abbddb04..000000000
--- a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_ja.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-image.title.ImageUpdated=Background successfully updated
-image.title.ImageDeleted=Background successfully deleted
-image.title.deleteImage=Delete Background
-image.title.ChangeImage=Change background
diff --git a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_ko.properties b/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_ko.properties
deleted file mode 100644
index 6abbddb04..000000000
--- a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_ko.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-image.title.ImageUpdated=Background successfully updated
-image.title.ImageDeleted=Background successfully deleted
-image.title.deleteImage=Delete Background
-image.title.ChangeImage=Change background
diff --git a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_lt.properties b/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_lt.properties
deleted file mode 100644
index 6abbddb04..000000000
--- a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_lt.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-image.title.ImageUpdated=Background successfully updated
-image.title.ImageDeleted=Background successfully deleted
-image.title.deleteImage=Delete Background
-image.title.ChangeImage=Change background
diff --git a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_ms.properties b/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_ms.properties
deleted file mode 100644
index 6abbddb04..000000000
--- a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_ms.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-image.title.ImageUpdated=Background successfully updated
-image.title.ImageDeleted=Background successfully deleted
-image.title.deleteImage=Delete Background
-image.title.ChangeImage=Change background
diff --git a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_nl.properties b/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_nl.properties
deleted file mode 100644
index 6abbddb04..000000000
--- a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_nl.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-image.title.ImageUpdated=Background successfully updated
-image.title.ImageDeleted=Background successfully deleted
-image.title.deleteImage=Delete Background
-image.title.ChangeImage=Change background
diff --git a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_no.properties b/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_no.properties
deleted file mode 100644
index 6abbddb04..000000000
--- a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_no.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-image.title.ImageUpdated=Background successfully updated
-image.title.ImageDeleted=Background successfully deleted
-image.title.deleteImage=Delete Background
-image.title.ChangeImage=Change background
diff --git a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_pcm.properties b/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_pcm.properties
deleted file mode 100644
index 6abbddb04..000000000
--- a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_pcm.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-image.title.ImageUpdated=Background successfully updated
-image.title.ImageDeleted=Background successfully deleted
-image.title.deleteImage=Delete Background
-image.title.ChangeImage=Change background
diff --git a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_pl.properties b/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_pl.properties
deleted file mode 100644
index 6abbddb04..000000000
--- a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_pl.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-image.title.ImageUpdated=Background successfully updated
-image.title.ImageDeleted=Background successfully deleted
-image.title.deleteImage=Delete Background
-image.title.ChangeImage=Change background
diff --git a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_pt_BR.properties b/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_pt_BR.properties
deleted file mode 100644
index 6abbddb04..000000000
--- a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_pt_BR.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-image.title.ImageUpdated=Background successfully updated
-image.title.ImageDeleted=Background successfully deleted
-image.title.deleteImage=Delete Background
-image.title.ChangeImage=Change background
diff --git a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_pt_PT.properties b/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_pt_PT.properties
deleted file mode 100644
index 6abbddb04..000000000
--- a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_pt_PT.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-image.title.ImageUpdated=Background successfully updated
-image.title.ImageDeleted=Background successfully deleted
-image.title.deleteImage=Delete Background
-image.title.ChangeImage=Change background
diff --git a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_ro.properties b/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_ro.properties
deleted file mode 100644
index 6abbddb04..000000000
--- a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_ro.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-image.title.ImageUpdated=Background successfully updated
-image.title.ImageDeleted=Background successfully deleted
-image.title.deleteImage=Delete Background
-image.title.ChangeImage=Change background
diff --git a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_ru.properties b/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_ru.properties
deleted file mode 100644
index 6abbddb04..000000000
--- a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_ru.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-image.title.ImageUpdated=Background successfully updated
-image.title.ImageDeleted=Background successfully deleted
-image.title.deleteImage=Delete Background
-image.title.ChangeImage=Change background
diff --git a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_sk.properties b/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_sk.properties
deleted file mode 100644
index 6abbddb04..000000000
--- a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_sk.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-image.title.ImageUpdated=Background successfully updated
-image.title.ImageDeleted=Background successfully deleted
-image.title.deleteImage=Delete Background
-image.title.ChangeImage=Change background
diff --git a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_sl.properties b/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_sl.properties
deleted file mode 100644
index 6abbddb04..000000000
--- a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_sl.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-image.title.ImageUpdated=Background successfully updated
-image.title.ImageDeleted=Background successfully deleted
-image.title.deleteImage=Delete Background
-image.title.ChangeImage=Change background
diff --git a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_sq.properties b/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_sq.properties
deleted file mode 100644
index 5944cc772..000000000
--- a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_sq.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-image.title.ImageUpdated=crwdns7083901:0crwdne7083901:0
-image.title.ImageDeleted=crwdns7083903:0crwdne7083903:0
-image.title.deleteImage=crwdns7083905:0crwdne7083905:0
-image.title.ChangeImage=crwdns7083907:0crwdne7083907:0
diff --git a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_sv_SE.properties b/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_sv_SE.properties
deleted file mode 100644
index 6abbddb04..000000000
--- a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_sv_SE.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-image.title.ImageUpdated=Background successfully updated
-image.title.ImageDeleted=Background successfully deleted
-image.title.deleteImage=Delete Background
-image.title.ChangeImage=Change background
diff --git a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_th.properties b/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_th.properties
deleted file mode 100644
index 6abbddb04..000000000
--- a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_th.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-image.title.ImageUpdated=Background successfully updated
-image.title.ImageDeleted=Background successfully deleted
-image.title.deleteImage=Delete Background
-image.title.ChangeImage=Change background
diff --git a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_tl.properties b/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_tl.properties
deleted file mode 100644
index 6abbddb04..000000000
--- a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_tl.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-image.title.ImageUpdated=Background successfully updated
-image.title.ImageDeleted=Background successfully deleted
-image.title.deleteImage=Delete Background
-image.title.ChangeImage=Change background
diff --git a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_tr.properties b/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_tr.properties
deleted file mode 100644
index 6abbddb04..000000000
--- a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_tr.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-image.title.ImageUpdated=Background successfully updated
-image.title.ImageDeleted=Background successfully deleted
-image.title.deleteImage=Delete Background
-image.title.ChangeImage=Change background
diff --git a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_uk.properties b/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_uk.properties
deleted file mode 100644
index 6abbddb04..000000000
--- a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_uk.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-image.title.ImageUpdated=Background successfully updated
-image.title.ImageDeleted=Background successfully deleted
-image.title.deleteImage=Delete Background
-image.title.ChangeImage=Change background
diff --git a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_ur_IN.properties b/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_ur_IN.properties
deleted file mode 100644
index 6abbddb04..000000000
--- a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_ur_IN.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-image.title.ImageUpdated=Background successfully updated
-image.title.ImageDeleted=Background successfully deleted
-image.title.deleteImage=Delete Background
-image.title.ChangeImage=Change background
diff --git a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_vi.properties b/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_vi.properties
deleted file mode 100644
index 6abbddb04..000000000
--- a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_vi.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-image.title.ImageUpdated=Background successfully updated
-image.title.ImageDeleted=Background successfully deleted
-image.title.deleteImage=Delete Background
-image.title.ChangeImage=Change background
diff --git a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_zh_CN.properties b/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_zh_CN.properties
deleted file mode 100644
index 6abbddb04..000000000
--- a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_zh_CN.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-image.title.ImageUpdated=Background successfully updated
-image.title.ImageDeleted=Background successfully deleted
-image.title.deleteImage=Delete Background
-image.title.ChangeImage=Change background
diff --git a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_zh_TW.properties b/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_zh_TW.properties
deleted file mode 100644
index 6abbddb04..000000000
--- a/layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_zh_TW.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-image.title.ImageUpdated=Background successfully updated
-image.title.ImageDeleted=Background successfully deleted
-image.title.deleteImage=Delete Background
-image.title.ChangeImage=Change background
diff --git a/layout-management-webapps/src/main/webapp/WEB-INF/conf/configuration.xml b/layout-management-webapps/src/main/webapp/WEB-INF/conf/configuration.xml
index 717cd8a33..1f5b74fc8 100644
--- a/layout-management-webapps/src/main/webapp/WEB-INF/conf/configuration.xml
+++ b/layout-management-webapps/src/main/webapp/WEB-INF/conf/configuration.xml
@@ -27,6 +27,5 @@
 
   <import>war:/conf/layout-management/portal-configuration.xml</import>
   <import>war:/conf/layout-management/dynamic-container-configuration.xml</import>
-  <import>war:/conf/layout-management/navigation-categories-configuration.xml</import>
 
 </configuration>
diff --git a/layout-management-webapps/src/main/webapp/WEB-INF/conf/layout-management/navigation-categories-configuration.xml b/layout-management-webapps/src/main/webapp/WEB-INF/conf/layout-management/navigation-categories-configuration.xml
deleted file mode 100644
index b6a310562..000000000
--- a/layout-management-webapps/src/main/webapp/WEB-INF/conf/layout-management/navigation-categories-configuration.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
-    Copyright (C) 2003-2022 eXo Platform SAS.
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Affero General Public License
-    as published by the Free Software Foundation; either version 3
-    of the License, or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, see<http://www.gnu.org/licenses/>.
-
--->
-<configuration
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"
-    xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd">
-  <component>
-    <key>EditNavigationFeatureProperties</key>
-    <type>org.exoplatform.container.ExtendedPropertyConfigurator</type>
-    <init-params>
-      <properties-param>
-        <name>EditNavigationFeatureProperties</name>
-        <description>Edit Navigation Feature flags</description>
-        <property name="exo.feature.oldEditNavigationMenu.enabled" value="${exo.feature.oldEditNavigationMenu.enabled:false}" />
-      </properties-param>
-    </init-params>
-  </component>
-  <external-component-plugins>
-    <target-component>org.exoplatform.portal.config.NavigationCategoryService</target-component>
-    <component-plugin>
-      <name>NavigationCategoryPlugin</name>
-      <set-method>addPlugin</set-method>
-      <type>org.exoplatform.portal.config.NavigationCategoryPlugin</type>
-      <init-params>
-        <value-param>
-          <name>category.order</name>
-          <value>100</value>
-        </value-param>
-        <value-param>
-          <name>category</name>
-          <value>portal</value>
-        </value-param>
-        <value-param>
-          <name>uri</name>
-          <value>portalnavigation</value>
-        </value-param>
-      </init-params>
-    </component-plugin>
-    <component-plugin>
-      <name>NavigationCategoryPlugin</name>
-      <set-method>addPlugin</set-method>
-      <type>org.exoplatform.portal.config.NavigationCategoryPlugin</type>
-      <init-params>
-        <value-param>
-          <name>category.order</name>
-          <value>100</value>
-        </value-param>
-        <value-param>
-          <name>category</name>
-          <value>portal</value>
-        </value-param>
-        <value-param>
-          <name>uri</name>
-          <value>groupnavigation</value>
-        </value-param>
-      </init-params>
-    </component-plugin>
-    <component-plugin>
-      <name>NavigationCategoryPlugin</name>
-      <set-method>addPlugin</set-method>
-      <type>org.exoplatform.portal.config.NavigationCategoryPlugin</type>
-      <init-params>
-        <value-param>
-          <name>category.order</name>
-          <value>100</value>
-        </value-param>
-        <value-param>
-          <name>category</name>
-          <value>portal</value>
-        </value-param>
-        <value-param>
-          <name>uri</name>
-          <value>administration/pageManagement</value>
-        </value-param>
-      </init-params>
-    </component-plugin>
-    <component-plugin>
-      <name>NavigationCategoryPlugin</name>
-      <set-method>addPlugin</set-method>
-      <type>org.exoplatform.portal.config.NavigationCategoryPlugin</type>
-      <init-params>
-        <value-param>
-          <name>category.order</name>
-          <value>100</value>
-        </value-param>
-        <value-param>
-          <name>category</name>
-          <value>portal</value>
-        </value-param>
-        <value-param>
-          <name>uri</name>
-          <value>administration/registry</value>
-        </value-param>
-      </init-params>
-    </component-plugin>
-    <component-plugin>
-      <name>NavigationCategoryPlugin</name>
-      <set-method>addPlugin</set-method>
-      <type>org.exoplatform.portal.config.NavigationCategoryPlugin</type>
-      <init-params>
-        <value-param>
-          <name>category.order</name>
-          <value>10</value>
-        </value-param>
-        <value-param>
-          <name>category</name>
-          <value>usersAndSpaces</value>
-        </value-param>
-        <value-param>
-          <name>uri</name>
-          <value>siteManagement</value>
-        </value-param>
-      </init-params>
-    </component-plugin>
-  </external-component-plugins>
-
-</configuration>
diff --git a/layout-management-webapps/src/main/webapp/WEB-INF/conf/layout-management/portal-configuration.xml b/layout-management-webapps/src/main/webapp/WEB-INF/conf/layout-management/portal-configuration.xml
index 7aa271204..ef080229c 100644
--- a/layout-management-webapps/src/main/webapp/WEB-INF/conf/layout-management/portal-configuration.xml
+++ b/layout-management-webapps/src/main/webapp/WEB-INF/conf/layout-management/portal-configuration.xml
@@ -21,6 +21,18 @@
 -->
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_2.xsd http://www.exoplaform.org/xml/ns/kernel_1_2.xsd" xmlns="http://www.exoplaform.org/xml/ns/kernel_1_2.xsd">
 
+  <component>
+    <key>EditNavigationFeatureProperties</key>
+    <type>org.exoplatform.container.ExtendedPropertyConfigurator</type>
+    <init-params>
+      <properties-param>
+        <name>EditNavigationFeatureProperties</name>
+        <description>Edit Navigation Feature flags</description>
+        <property name="exo.feature.oldEditNavigationMenu.enabled" value="${exo.feature.oldEditNavigationMenu.enabled:false}" />
+      </properties-param>
+    </init-params>
+  </component>
+  
   <external-component-plugins>
     <target-component>org.exoplatform.portal.config.UserPortalConfigService</target-component>
     <component-plugin>
diff --git a/translations.properties b/translations.properties
index a0b3925a6..b153f7e8c 100644
--- a/translations.properties
+++ b/translations.properties
@@ -28,5 +28,4 @@ portlet/GroupNavigationPortlet.properties=layout-management-webapps/src/main/res
 portlet/PortalNavigationPortlet.properties=layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/PortalNavigationPortlet_en.properties
 portlet/SiteNavigationPortlet.properties=layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/SiteNavigationPortlet_en.properties
 portlet/SiteManagementPortlet.properties=layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/SiteManagementPortlet_en.properties
-portlet/ImagesPortlet.properties=layout-management-webapps/src/main/resources/locale/portlet/layoutManagement/ImagesPortlet_en.properties
 portal/webui.properties=layout-management-webapps/src/main/resources/locale/portal/webui_en.properties
\ No newline at end of file