diff --git a/public/locales/en/layout/modals/icon-picker.json b/public/locales/en/layout/modals/icon-picker.json
new file mode 100644
index 000000000..84f17ce54
--- /dev/null
+++ b/public/locales/en/layout/modals/icon-picker.json
@@ -0,0 +1,7 @@
+{
+  "iconPicker": {
+    "textInputPlaceholder": "Search something...",
+    "searchLimitationTitle": "Limited to 30 results",
+    "searchLimitationMessage": "Search results were limited to 30 because there were too many matches"
+  }
+}
\ No newline at end of file
diff --git a/src/components/Dashboard/Modals/EditAppModal/Tabs/AppereanceTab/AppereanceTab.tsx b/src/components/Dashboard/Modals/EditAppModal/Tabs/AppereanceTab/AppereanceTab.tsx
index 94da0611a..f74ab7d60 100644
--- a/src/components/Dashboard/Modals/EditAppModal/Tabs/AppereanceTab/AppereanceTab.tsx
+++ b/src/components/Dashboard/Modals/EditAppModal/Tabs/AppereanceTab/AppereanceTab.tsx
@@ -33,7 +33,7 @@ export const AppearanceTab = ({
           label={t('appearance.icon.label')}
           description={t('appearance.icon.description')}
           variant="default"
-          data={data.files ?? []}
+          data={data?.files ?? []}
           withAsterisk
           required
           {...form.getInputProps('appearance.iconUrl')}
diff --git a/src/components/Dashboard/Modals/EditAppModal/Tabs/AppereanceTab/IconSelector/IconSelector.tsx b/src/components/Dashboard/Modals/EditAppModal/Tabs/AppereanceTab/IconSelector/IconSelector.tsx
index 8ec13cbb3..ee853678a 100644
--- a/src/components/Dashboard/Modals/EditAppModal/Tabs/AppereanceTab/IconSelector/IconSelector.tsx
+++ b/src/components/Dashboard/Modals/EditAppModal/Tabs/AppereanceTab/IconSelector/IconSelector.tsx
@@ -31,7 +31,7 @@ interface IconSelectorProps {
 }
 
 export const IconSelector = ({ onChange, allowAppNamePropagation, form }: IconSelectorProps) => {
-  const { t } = useTranslation('layout/tools');
+  const { t } = useTranslation('layout/modals/icon-picker');
 
   const { data, isLoading } = useRepositoryIconsQuery<WalkxcodeRepositoryIcon>({
     url: 'https://api.github.com/repos/walkxcode/Dashboard-Icons/contents/png',
diff --git a/src/tools/translation-namespaces.ts b/src/tools/translation-namespaces.ts
index facb3cbd4..6748c77dc 100644
--- a/src/tools/translation-namespaces.ts
+++ b/src/tools/translation-namespaces.ts
@@ -1,9 +1,9 @@
 export const dashboardNamespaces = [
   'common',
-  'layout/tools',
   'layout/element-selector/selector',
   'layout/modals/add-app',
   'layout/modals/change-position',
+  'layout/modals/icon-picker',
   'layout/modals/about',
   'layout/header/actions/toggle-edit-mode',
   'layout/mobile/drawer',