diff --git a/src/components/Dashboard/Modals/EditAppModal/Tabs/AppereanceTab/AppereanceTab.tsx b/src/components/Dashboard/Modals/EditAppModal/Tabs/AppereanceTab/AppereanceTab.tsx
index da5dfd738..8e46d0f51 100644
--- a/src/components/Dashboard/Modals/EditAppModal/Tabs/AppereanceTab/AppereanceTab.tsx
+++ b/src/components/Dashboard/Modals/EditAppModal/Tabs/AppereanceTab/AppereanceTab.tsx
@@ -23,7 +23,6 @@ export const AppearanceTab = ({
     <Tabs.Panel value="appearance" pt="lg">
       <Flex gap={5}>
         <TextInput
-          defaultValue={form.values.appearance.iconUrl}
           className={classes.textInput}
           icon={<DebouncedAppIcon form={form} width={20} height={20} />}
           label={t('appearance.icon.label')}
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 d1c8ed6de..8a39ed21d 100644
--- a/src/components/Dashboard/Modals/EditAppModal/Tabs/AppereanceTab/IconSelector/IconSelector.tsx
+++ b/src/components/Dashboard/Modals/EditAppModal/Tabs/AppereanceTab/IconSelector/IconSelector.tsx
@@ -31,6 +31,8 @@ interface IconSelectorProps {
 }
 
 export const IconSelector = ({ onChange, allowAppNamePropagation, form }: IconSelectorProps) => {
+  const { t } = useTranslation('layout/tools');
+
   const { data, isLoading } = useRepositoryIconsQuery<WalkxcodeRepositoryIcon>({
     url: 'https://api.github.com/repos/walkxcode/Dashboard-Icons/contents/png',
     converter: (item) => ({
@@ -73,8 +75,6 @@ export const IconSelector = ({ onChange, allowAppNamePropagation, form }: IconSe
   const isTruncated =
     slicedFilteredItems.length > 0 && slicedFilteredItems.length !== filteredItems.length;
 
-  const { t } = useTranslation('layout/tools');
-
   return (
     <Popover width={310}>
       <Popover.Target>
diff --git a/src/components/Dashboard/Modals/SelectElement/Components/Overview/AvailableElementsOverview.tsx b/src/components/Dashboard/Modals/SelectElement/Components/Overview/AvailableElementsOverview.tsx
index 1738568c9..3fb523569 100644
--- a/src/components/Dashboard/Modals/SelectElement/Components/Overview/AvailableElementsOverview.tsx
+++ b/src/components/Dashboard/Modals/SelectElement/Components/Overview/AvailableElementsOverview.tsx
@@ -1,5 +1,6 @@
 import { Group, Space, Stack, Text, UnstyledButton } from '@mantine/core';
 import { closeModal } from '@mantine/modals';
+import { showNotification } from '@mantine/notifications';
 import { IconBox, IconBoxAlignTop, IconStack } from '@tabler/icons';
 import { useTranslation } from 'next-i18next';
 import { ReactNode } from 'react';
@@ -9,6 +10,7 @@ import { useConfigStore } from '../../../../../../config/store';
 import { openContextModalGeneric } from '../../../../../../tools/mantineModalManagerExtensions';
 import { AppType } from '../../../../../../types/app';
 import { appTileDefinition } from '../../../../Tiles/Apps/AppTile';
+import { CategoryEditModalInnerProps } from '../../../../Wrappers/Category/CategoryEditModal';
 import { useStyles } from '../Shared/styles';
 
 interface AvailableElementTypesProps {
@@ -28,33 +30,50 @@ export const AvailableElementTypes = ({
   const getLowestWrapper = () => config?.wrappers.sort((a, b) => a.position - b.position)[0];
 
   const onClickCreateCategory = async () => {
-    if (!configName) {
-      return;
-    }
+    openContextModalGeneric<CategoryEditModalInnerProps>({
+      modal: 'categoryEditModal',
+      title: 'Name of new category',
+      withCloseButton: false,
+      innerProps: {
+        category: {
+          id: uuidv4(),
+          name: 'New category',
+          position: 0,
+        },
+        onSuccess: async (category) => {
+          if (!configName) return;
 
-    await updateConfig(configName, (previousConfig) => ({
-      ...previousConfig,
-      wrappers:
-        previousConfig.wrappers.length <= previousConfig.categories.length
-          ? [
-              ...previousConfig.wrappers,
+          await updateConfig(configName, (previousConfig) => ({
+            ...previousConfig,
+            wrappers:
+              previousConfig.wrappers.length <= previousConfig.categories.length
+                ? [
+                    ...previousConfig.wrappers,
+                    {
+                      id: uuidv4(),
+                      position: previousConfig.categories.length,
+                    },
+                  ]
+                : previousConfig.wrappers,
+            categories: [
+              ...previousConfig.categories,
               {
                 id: uuidv4(),
+                name: category.name,
                 position: previousConfig.categories.length,
               },
-            ]
-          : previousConfig.wrappers,
-      categories: [
-        ...previousConfig.categories,
-        {
-          id: uuidv4(),
-          name: `Category ${previousConfig.categories.length + 1}`,
-          position: previousConfig.categories.length,
+            ],
+          })).then(() => {
+            closeModal(modalId);
+            showNotification({
+              title: 'Category created',
+              message: `The category ${category.name} has been created`,
+              color: 'teal',
+            });
+          });
         },
-      ],
-    }));
-
-    closeModal(modalId);
+      },
+    });
   };
 
   return (
diff --git a/src/components/Dashboard/Wrappers/Category/CategoryEditModal.tsx b/src/components/Dashboard/Wrappers/Category/CategoryEditModal.tsx
index 18a2b6d19..0c23d45a6 100644
--- a/src/components/Dashboard/Wrappers/Category/CategoryEditModal.tsx
+++ b/src/components/Dashboard/Wrappers/Category/CategoryEditModal.tsx
@@ -36,7 +36,7 @@ export const CategoryEditModal = ({
 
   return (
     <form onSubmit={form.onSubmit(handleSubmit)}>
-      <TextInput data-autoFocus {...form.getInputProps('name')} label="Name of category" />
+      <TextInput data-autoFocus {...form.getInputProps('name')} autoFocus />
 
       <Group mt="md" grow>
         <Button onClick={() => context.closeModal(id)} variant="filled" color="gray">
diff --git a/src/components/Dashboard/Wrappers/Category/useCategoryActions.tsx b/src/components/Dashboard/Wrappers/Category/useCategoryActions.tsx
index abd1496ec..0c9b68bb6 100644
--- a/src/components/Dashboard/Wrappers/Category/useCategoryActions.tsx
+++ b/src/components/Dashboard/Wrappers/Category/useCategoryActions.tsx
@@ -210,6 +210,7 @@ export const useCategoryActions = (configName: string | undefined, category: Cat
   const edit = async () => {
     openContextModalGeneric<CategoryEditModalInnerProps>({
       modal: 'categoryEditModal',
+      withCloseButton: false,
       innerProps: {
         category,
         onSuccess: async (category) => {
diff --git a/src/components/layout/header/Actions/ToggleEditMode/ToggleEditMode.tsx b/src/components/layout/header/Actions/ToggleEditMode/ToggleEditMode.tsx
index 8d725a993..087352a7b 100644
--- a/src/components/layout/header/Actions/ToggleEditMode/ToggleEditMode.tsx
+++ b/src/components/layout/header/Actions/ToggleEditMode/ToggleEditMode.tsx
@@ -59,14 +59,14 @@ export const ToggleEditModeAction = () => {
   );
 
   return (
-    <Tooltip label={t('tooltip')} withinPortal>
-      <Popover
-        opened={enabled && !smallerThanSm && !popoverManuallyHidden}
-        width={250}
-        zIndex={199}
-        withArrow
-      >
-        <Popover.Target>
+    <Popover
+      opened={enabled && !smallerThanSm && !popoverManuallyHidden}
+      width={250}
+      zIndex={199}
+      withArrow
+    >
+      <Popover.Target>
+        <Tooltip label={t('tooltip')} withinPortal>
           {smallerThanSm ? (
             enabled ? (
               <Group style={{ flexWrap: 'nowrap' }}>
@@ -84,22 +84,22 @@ export const ToggleEditModeAction = () => {
           ) : (
             <ToggleButtonDesktop />
           )}
-        </Popover.Target>
+        </Tooltip>
+      </Popover.Target>
 
-        <Popover.Dropdown p={4} px={6}>
-          <div style={{ position: 'absolute', top: 2, right: 2 }}>
-            <ActionIcon onClick={() => setPopoverManuallyHidden(true)}>
-              <IconX size={18} />
-            </ActionIcon>
-          </div>
-          <Text align="center" size="sm">
-            <Text weight="bold">{t('popover.title')}</Text>
-            <Text>
-              <Trans i18nKey="layout/header/actions/toggle-edit-mode:popover.text" />
-            </Text>
+      <Popover.Dropdown p={4} px={6}>
+        <div style={{ position: 'absolute', top: 2, right: 2 }}>
+          <ActionIcon onClick={() => setPopoverManuallyHidden(true)}>
+            <IconX size={18} />
+          </ActionIcon>
+        </div>
+        <Text align="center" size="sm">
+          <Text weight="bold">{t('popover.title')}</Text>
+          <Text>
+            <Trans i18nKey="layout/header/actions/toggle-edit-mode:popover.text" />
           </Text>
-        </Popover.Dropdown>
-      </Popover>
-    </Tooltip>
+        </Text>
+      </Popover.Dropdown>
+    </Popover>
   );
 };
diff --git a/src/components/layout/header/SettingsMenu.tsx b/src/components/layout/header/SettingsMenu.tsx
index 05990cbeb..301da2e91 100644
--- a/src/components/layout/header/SettingsMenu.tsx
+++ b/src/components/layout/header/SettingsMenu.tsx
@@ -13,35 +13,33 @@ export function SettingsMenu({ newVersionAvailable }: { newVersionAvailable: str
 
   return (
     <>
-      <Tooltip label="Open Menu">
-        <Menu width={250}>
-          <Menu.Target>
-            <ActionIcon variant="default" radius="md" size="xl" color="blue">
-              <IconMenu2 />
-            </ActionIcon>
-          </Menu.Target>
-          <Menu.Dropdown>
-            <ColorSchemeSwitch />
-            <Menu.Divider />
-            <Menu.Item icon={<IconSettings strokeWidth={1.2} size={18} />} onClick={drawer.open}>
-              {t('sections.settings')}
-            </Menu.Item>
-            <Menu.Item
-              icon={<IconInfoCircle strokeWidth={1.2} size={18} />}
-              rightSection={
-                newVersionAvailable && (
-                  <Badge variant="light" color="blue">
-                    New
-                  </Badge>
-                )
-              }
-              onClick={() => aboutModal.open()}
-            >
-              {t('about')}
-            </Menu.Item>
-          </Menu.Dropdown>
-        </Menu>
-      </Tooltip>
+      <Menu width={250}>
+        <Menu.Target>
+          <ActionIcon variant="default" radius="md" size="xl" color="blue">
+            <IconMenu2 />
+          </ActionIcon>
+        </Menu.Target>
+        <Menu.Dropdown>
+          <ColorSchemeSwitch />
+          <Menu.Divider />
+          <Menu.Item icon={<IconSettings strokeWidth={1.2} size={18} />} onClick={drawer.open}>
+            {t('sections.settings')}
+          </Menu.Item>
+          <Menu.Item
+            icon={<IconInfoCircle strokeWidth={1.2} size={18} />}
+            rightSection={
+              newVersionAvailable && (
+                <Badge variant="light" color="blue">
+                  New
+                </Badge>
+              )
+            }
+            onClick={() => aboutModal.open()}
+          >
+            {t('about')}
+          </Menu.Item>
+        </Menu.Dropdown>
+      </Menu>
       <SettingsDrawer
         opened={drawerOpened}
         closeDrawer={drawer.close}