diff --git a/packages/editor/lang/de.json b/packages/editor/lang/de.json
index be9abfc5..2f6c4658 100644
--- a/packages/editor/lang/de.json
+++ b/packages/editor/lang/de.json
@@ -217,5 +217,8 @@
     },
     "shortcut-help-pane.undo": {
       "defaultMessage": "Rückgängerausgabe"
+    },
+    "icon-picker.show-images": {
+      "defaultMessage": "Bilder anzeigen"
     }
 }
\ No newline at end of file
diff --git a/packages/editor/lang/en.json b/packages/editor/lang/en.json
index bae131e0..dabfdf82 100644
--- a/packages/editor/lang/en.json
+++ b/packages/editor/lang/en.json
@@ -122,6 +122,9 @@
   "editor.try-welcome-mobile": {
     "defaultMessage": "This edition space showcases some of the mindmap editor capabilities!"
   },
+  "icon-picker.show-images": {
+    "defaultMessage": "Show images"
+  },
   "link.help_text": {
     "defaultMessage": "Address is not valid"
   },
diff --git a/packages/editor/lang/es.json b/packages/editor/lang/es.json
index 862abed1..c8a51130 100644
--- a/packages/editor/lang/es.json
+++ b/packages/editor/lang/es.json
@@ -211,5 +211,8 @@
     },
     "shortcut-help-pane.undo": {
         "defaultMessage": "Deshacer cambios"
+    },
+    "icon-picker.show-images": {
+        "defaultMessage": "Mostrar imagenes"
     }
 }
\ No newline at end of file
diff --git a/packages/editor/lang/fr.json b/packages/editor/lang/fr.json
index e152efe2..a825a154 100644
--- a/packages/editor/lang/fr.json
+++ b/packages/editor/lang/fr.json
@@ -211,5 +211,8 @@
     },
     "shortcut-help-pane.undo": {
         "defaultMessage": "Annuler l'édition"
+    },
+    "icon-picker.show-images": {
+        "defaultMessage": "Afficher les images"
     }
 }
\ No newline at end of file
diff --git a/packages/editor/src/compiled-lang/de.json b/packages/editor/src/compiled-lang/de.json
index e1fc7c6c..b6e4c908 100644
--- a/packages/editor/src/compiled-lang/de.json
+++ b/packages/editor/src/compiled-lang/de.json
@@ -251,6 +251,12 @@
       "value": "Diese Edition zeigt einige der Mindmap-Funktionen!"
     }
   ],
+  "icon-picker.show-images": [
+    {
+      "type": 0,
+      "value": "Bilder anzeigen"
+    }
+  ],
   "link.help_text": [
     {
       "type": 0,
diff --git a/packages/editor/src/compiled-lang/en.json b/packages/editor/src/compiled-lang/en.json
index f2961de0..b5578df4 100644
--- a/packages/editor/src/compiled-lang/en.json
+++ b/packages/editor/src/compiled-lang/en.json
@@ -245,6 +245,12 @@
       "value": "This edition space showcases some of the mindmap editor capabilities!"
     }
   ],
+  "icon-picker.show-images": [
+    {
+      "type": 0,
+      "value": "Show images"
+    }
+  ],
   "link.help_text": [
     {
       "type": 0,
diff --git a/packages/editor/src/compiled-lang/es.json b/packages/editor/src/compiled-lang/es.json
index 54a2365b..bf33cf0d 100644
--- a/packages/editor/src/compiled-lang/es.json
+++ b/packages/editor/src/compiled-lang/es.json
@@ -245,6 +245,12 @@
       "value": "¡Este espacio de edición muestra algunas de las capacidades de mapas mentales!"
     }
   ],
+  "icon-picker.show-images": [
+    {
+      "type": 0,
+      "value": "Mostrar imagenes"
+    }
+  ],
   "link.help_text": [
     {
       "type": 0,
diff --git a/packages/editor/src/compiled-lang/fr.json b/packages/editor/src/compiled-lang/fr.json
index b63193cc..00f6663a 100644
--- a/packages/editor/src/compiled-lang/fr.json
+++ b/packages/editor/src/compiled-lang/fr.json
@@ -245,6 +245,12 @@
       "value": "Cet espace d'édition présente certaines des fonctionnalités des cartes mentales!"
     }
   ],
+  "icon-picker.show-images": [
+    {
+      "type": 0,
+      "value": "Afficher les images"
+    }
+  ],
   "link.help_text": [
     {
       "type": 0,
diff --git a/packages/editor/src/components/action-widget/pane/icon-picker/index.tsx b/packages/editor/src/components/action-widget/pane/icon-picker/index.tsx
index 8c5ec6d4..798c7620 100644
--- a/packages/editor/src/components/action-widget/pane/icon-picker/index.tsx
+++ b/packages/editor/src/components/action-widget/pane/icon-picker/index.tsx
@@ -23,6 +23,7 @@ import IconImageTab from './image-icon-tab';
 import Switch from '@mui/material/Switch';
 import FormGroup from '@mui/material/FormGroup';
 import FormControlLabel from '@mui/material/FormControlLabel';
+import { FormattedMessage } from 'react-intl';
 
 type IconPickerProp = {
   triggerClose: () => void;
@@ -53,7 +54,10 @@ const IconPicker = ({ triggerClose, iconModel }: IconPickerProp): ReactElement =
   return (
     <div style={{ padding: '5px' }}>
       <FormGroup>
-        <FormControlLabel label="Show Images" control={<Switch onChange={handleCheck} />} />
+        <FormControlLabel
+          label={<FormattedMessage id="icon-picker.show-images" defaultMessage="Show images" />}
+          control={<Switch onChange={handleCheck} />}
+        />
       </FormGroup>
 
       {checked && (
diff --git a/packages/webapp/lang/de.json b/packages/webapp/lang/de.json
index 1f4f9946..3b7eb193 100644
--- a/packages/webapp/lang/de.json
+++ b/packages/webapp/lang/de.json
@@ -512,5 +512,8 @@
     },
     "footer.team": {
         "defaultMessage": "Team"
+    },
+    "dialog.loading": {
+        "defaultMessage": "Wird geladen ..."
     }
 }
\ No newline at end of file
diff --git a/packages/webapp/lang/en.json b/packages/webapp/lang/en.json
index 56d60063..28941073 100644
--- a/packages/webapp/lang/en.json
+++ b/packages/webapp/lang/en.json
@@ -116,6 +116,9 @@
   "deletem.title": {
     "defaultMessage": "All selected maps will be deleted"
   },
+  "dialog.loading": {
+    "defaultMessage": "Loading ..."
+  },
   "duplicate.title": {
     "defaultMessage": "Duplicate"
   },
@@ -152,6 +155,9 @@
   "footer.contactus": {
     "defaultMessage": "Contact Us"
   },
+  "footer.donations": {
+    "defaultMessage": "Donations"
+  },
   "footer.faq": {
     "defaultMessage": "F.A.Q."
   },
@@ -173,9 +179,6 @@
   "footer.team": {
     "defaultMessage": "Our Team"
   },
-  "footer.donations": {
-    "defaultMessage": "Donations"
-  },
   "footer.termsandconditions": {
     "defaultMessage": "Term And Conditions"
   },
@@ -221,12 +224,12 @@
   "import.description": {
     "defaultMessage": "You can import WiseMapping and Freemind maps to your list of maps. Select the file you want to import."
   },
+  "import.error-file": {
+    "defaultMessage": "Import error {error}"
+  },
   "import.title": {
     "defaultMessage": "Import existing mindmap"
   },
-  "import.error-file": {
-    "defaultMessage": "Import failed: {error}"
-  },
   "info.basic-info": {
     "defaultMessage": "Basic Info"
   },
@@ -311,10 +314,6 @@
   "login.forgotpwd": {
     "defaultMessage": "Forgot Password ?"
   },
-  "login.hsqldbcofig": {
-    "defaultMessage": "Although HSQLDB is bundled with WiseMapping by default during the installation, we do not recommend this database for production use. Please consider using MySQL 5.7 instead. You can find more information how to configure MySQL",
-    "description": "Missing production database configured"
-  },
   "login.page-title": {
     "defaultMessage": "Login | WiseMapping"
   },
diff --git a/packages/webapp/lang/es.json b/packages/webapp/lang/es.json
index 17876d6a..5fa1f76d 100644
--- a/packages/webapp/lang/es.json
+++ b/packages/webapp/lang/es.json
@@ -488,5 +488,8 @@
     },
     "editor.try-welcome-description": {
         "defaultMessage": "Regístrese para comenzar a crear, compartir y publicar una cantidad ilimitada de mapas mentales de forma gratuita."
+    },
+    "dialog.loading": {
+      "defaultMessage": "Cargando ..."
     }
 }
\ No newline at end of file
diff --git a/packages/webapp/lang/fr.json b/packages/webapp/lang/fr.json
index 3bb4b62c..8ef4fa15 100644
--- a/packages/webapp/lang/fr.json
+++ b/packages/webapp/lang/fr.json
@@ -515,5 +515,8 @@
     },
     "footer.team": {
         "defaultMessage": "Equipe"
+    },
+    "dialog.loading": {
+        "defaultMessage": "Chargement ..."
     }
 }
\ No newline at end of file
diff --git a/packages/webapp/src/compiled-lang/de.json b/packages/webapp/src/compiled-lang/de.json
index 250a88ea..5dfab2b8 100644
--- a/packages/webapp/src/compiled-lang/de.json
+++ b/packages/webapp/src/compiled-lang/de.json
@@ -233,6 +233,12 @@
       "value": "Alle ausgewählten Mindmaps werden gelöscht"
     }
   ],
+  "dialog.loading": [
+    {
+      "type": 0,
+      "value": "Wird geladen ..."
+    }
+  ],
   "duplicate.title": [
     {
       "type": 0,
diff --git a/packages/webapp/src/compiled-lang/en.json b/packages/webapp/src/compiled-lang/en.json
index 834713c1..99d5dfe5 100644
--- a/packages/webapp/src/compiled-lang/en.json
+++ b/packages/webapp/src/compiled-lang/en.json
@@ -233,6 +233,12 @@
       "value": "All selected maps will be deleted"
     }
   ],
+  "dialog.loading": [
+    {
+      "type": 0,
+      "value": "Loading ..."
+    }
+  ],
   "duplicate.title": [
     {
       "type": 0,
@@ -446,7 +452,7 @@
   "import.error-file": [
     {
       "type": 0,
-      "value": "Import failed: "
+      "value": "Import error "
     },
     {
       "type": 1,
@@ -631,12 +637,6 @@
       "value": "Forgot Password ?"
     }
   ],
-  "login.hsqldbcofig": [
-    {
-      "type": 0,
-      "value": "Although HSQLDB is bundled with WiseMapping by default during the installation, we do not recommend this database for production use. Please consider using MySQL 5.7 instead. You can find more information how to configure MySQL"
-    }
-  ],
   "login.page-title": [
     {
       "type": 0,
diff --git a/packages/webapp/src/compiled-lang/es.json b/packages/webapp/src/compiled-lang/es.json
index b5ec0f4d..89a82e7a 100644
--- a/packages/webapp/src/compiled-lang/es.json
+++ b/packages/webapp/src/compiled-lang/es.json
@@ -227,6 +227,12 @@
       "value": "Todos los mapas seleccionados serán eliminados"
     }
   ],
+  "dialog.loading": [
+    {
+      "type": 0,
+      "value": "Cargando ..."
+    }
+  ],
   "duplicate.title": [
     {
       "type": 0,
diff --git a/packages/webapp/src/compiled-lang/fr.json b/packages/webapp/src/compiled-lang/fr.json
index 292f8d34..a950b9f7 100644
--- a/packages/webapp/src/compiled-lang/fr.json
+++ b/packages/webapp/src/compiled-lang/fr.json
@@ -233,6 +233,12 @@
       "value": "Toutes les cartes sélectionnées seront supprimées"
     }
   ],
+  "dialog.loading": [
+    {
+      "type": 0,
+      "value": "Chargement ..."
+    }
+  ],
   "duplicate.title": [
     {
       "type": 0,