diff --git a/package-lock.json b/package-lock.json
index bf2f523e0c..677fc6ac54 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,7 +10,7 @@
         "@adraffy/ens-normalize": "^1.10.1",
         "@apollo/client": "^3.7.10",
         "@chakra-ui/react": "^2.8.2",
-        "@decent-org/fractal-ui": "^0.2.5",
+        "@decent-org/fractal-ui": "^0.3.0",
         "@emotion/react": "^11.10.6",
         "@emotion/styled": "^11.10.6",
         "@ethersproject/abstract-signer": "^5.7.0",
@@ -3428,9 +3428,9 @@
       }
     },
     "node_modules/@decent-org/fractal-ui": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/@decent-org/fractal-ui/-/fractal-ui-0.2.5.tgz",
-      "integrity": "sha512-yZ36jooF79NH9moBQCZG7S1VdToCLVk7tL9V/nFDJXBrAcRSK0jeHsuzzFwPZLsmyRfRiBYegnmciiEC7CD6tg==",
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@decent-org/fractal-ui/-/fractal-ui-0.3.0.tgz",
+      "integrity": "sha512-FBzepg8+ykXdTI9K8lTbdj1l5IuxplSetKECErlCuBdyU4ZLV04gVMKVfD7X8/FLCP+UzpBtf2XXF+cePpyUTA==",
       "peerDependencies": {
         "@chakra-ui/react": "^2.3.4",
         "@phosphor-icons/react": "^2.1.4",
diff --git a/package.json b/package.json
index ef86591c06..bd4c5b3a7c 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
     "@adraffy/ens-normalize": "^1.10.1",
     "@apollo/client": "^3.7.10",
     "@chakra-ui/react": "^2.8.2",
-    "@decent-org/fractal-ui": "^0.2.5",
+    "@decent-org/fractal-ui": "^0.3.0",
     "@emotion/react": "^11.10.6",
     "@emotion/styled": "^11.10.6",
     "@ethersproject/abstract-signer": "^5.7.0",
diff --git a/src/components/ui/menus/OptionMenu/index.tsx b/src/components/ui/menus/OptionMenu/index.tsx
index ebc030a2e3..3a5862e431 100644
--- a/src/components/ui/menus/OptionMenu/index.tsx
+++ b/src/components/ui/menus/OptionMenu/index.tsx
@@ -41,7 +41,6 @@ export function OptionMenu({
       >
         <MenuButton
           as={buttonAs}
-          h="fit-content"
           onClick={(event: MouseEvent<HTMLButtonElement>) => {
             event.stopPropagation();
           }}
diff --git a/src/components/ui/page/Header/index.tsx b/src/components/ui/page/Header/index.tsx
index 1d07eaf4cb..ac92f0645a 100644
--- a/src/components/ui/page/Header/index.tsx
+++ b/src/components/ui/page/Header/index.tsx
@@ -3,7 +3,6 @@ import {
   Drawer,
   DrawerCloseButton,
   DrawerContent,
-  DrawerOverlay,
   Flex,
   Hide,
   IconButton,
@@ -20,7 +19,6 @@ import { useFractal } from '../../../../providers/App/AppProvider';
 import { AccountDisplay } from '../../menus/AccountDisplay';
 import { DAOSearch } from '../../menus/DAOSearch';
 import { FavoritesMenu } from '../../menus/FavoritesMenu';
-import Divider from '../../utils/Divider';
 import { NavigationLinks } from '../Navigation/NavigationLinks';
 
 function HeaderLogo() {
@@ -66,39 +64,54 @@ function HeaderLogo() {
             size="full"
             isFullHeight
           >
-            <DrawerOverlay />
             <DrawerContent
-              bg="chocolate.900"
+              bg="#221D25D6" // TODO get this into `decent-ui` repo
               border="none"
+              backdropFilter="auto"
+              backdropBlur="10px"
             >
-              <DrawerCloseButton
-                size="lg"
-                zIndex="banner"
-              />
+              <Flex
+                mt={4}
+                justifyContent="space-between"
+              >
+                <Link
+                  data-testid="navigationLogo-homeLink"
+                  to={BASE_ROUTES.landing}
+                  aria-label={t('ariaLabelFractalBrand')}
+                  onClick={onClose}
+                >
+                  <DecentLogo
+                    aria-hidden
+                    h="2.5rem"
+                    w="2.125rem"
+                    ml="1.75rem"
+                  />
+                </Link>
+                <DrawerCloseButton
+                  size="lg"
+                  zIndex="banner"
+                  color="lilac-0"
+                  position="relative"
+                  top="0px"
+                />
+              </Flex>
 
               <Box
-                mt={12}
-                px={8}
-                position="relative"
+                mt={8}
+                px={6}
               >
                 <DAOSearch closeDrawer={onClose} />
               </Box>
-              <Flex
-                alignItems="center"
-                direction="column"
-                justifyContent={showDAOLinks ? 'space-evenly' : 'flex-start'}
-                flexGrow={1}
-                overflowY="auto"
-                px={8}
+              <Box
+                px={6}
                 pt={8}
               >
-                <Divider />
                 <NavigationLinks
                   showDAOLinks={showDAOLinks}
                   address={daoAddress}
                   closeDrawer={onClose}
                 />
-              </Flex>
+              </Box>
             </DrawerContent>
           </Drawer>
         </>
diff --git a/src/components/ui/page/Layout/index.tsx b/src/components/ui/page/Layout/index.tsx
index 1098e8ac30..48686fbb0e 100644
--- a/src/components/ui/page/Layout/index.tsx
+++ b/src/components/ui/page/Layout/index.tsx
@@ -1,10 +1,15 @@
-import { Box, Container, Grid, GridItem } from '@chakra-ui/react';
+import { Box, Container, Grid, GridItem, Show } from '@chakra-ui/react';
 import { Outlet } from 'react-router-dom';
 import { CONTENT_HEIGHT, HEADER_HEIGHT } from '../../../../constants/common';
+import { useFractal } from '../../../../providers/App/AppProvider';
 import Header from '../Header';
-import Navigation from '../Navigation';
+import { NavigationLinks } from '../Navigation/NavigationLinks';
 
 export default function Layout() {
+  const {
+    node: { daoAddress },
+  } = useFractal();
+
   return (
     <Grid
       templateAreas={{
@@ -47,12 +52,16 @@ export default function Layout() {
         area={'nav'}
         display="flex"
         flexDirection="column"
-        flexGrow="1"
         position="fixed"
-        w="4.25rem"
-        minHeight={{ base: undefined, md: '100vh' }}
+        ml={6}
+        minHeight={{ base: undefined, md: `calc(100vh - ${HEADER_HEIGHT})` }}
       >
-        <Navigation />
+        <Show above="md">
+          <NavigationLinks
+            showDAOLinks={!!daoAddress}
+            address={daoAddress}
+          />
+        </Show>
       </GridItem>
     </Grid>
   );
diff --git a/src/components/ui/page/Navigation/NavigationExternalLink.tsx b/src/components/ui/page/Navigation/NavigationExternalLink.tsx
deleted file mode 100644
index 18e115bc99..0000000000
--- a/src/components/ui/page/Navigation/NavigationExternalLink.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import { Box, ComponentWithAs, Hide, IconProps, Text } from '@chakra-ui/react';
-import { useTranslation } from 'react-i18next';
-import { NavigationTooltip } from './NavigationTooltip';
-
-interface INavigationLink {
-  tooltipKey: string;
-  ariaLabelKey: string;
-  href: string;
-  testId: string;
-  routeKey?: string;
-  Icon: ComponentWithAs<'svg', IconProps>;
-  closeDrawer?: () => void;
-}
-
-export function NavigationExternalLink({
-  tooltipKey,
-  ariaLabelKey,
-  testId,
-  Icon,
-  routeKey,
-  closeDrawer,
-  ...rest
-}: INavigationLink) {
-  const { t } = useTranslation('navigation');
-
-  return (
-    <NavigationTooltip label={t(tooltipKey)}>
-      <a
-        data-testid={testId}
-        aria-label={t(ariaLabelKey)}
-        {...rest}
-        onClick={closeDrawer}
-        target="_blank"
-        rel="noreferrer noopener"
-      >
-        <Box
-          display={{ base: 'flex', md: undefined }}
-          gap={8}
-          justifyContent="space-between"
-          alignItems="center"
-          _hover={{ color: 'gold.500-hover', cursor: 'pointer' }}
-        >
-          <Icon boxSize="1.5rem" />
-          <Hide above="md">
-            <Text textStyle="text-md-mono-medium">{t(tooltipKey)}</Text>
-          </Hide>
-        </Box>
-      </a>
-    </NavigationTooltip>
-  );
-}
diff --git a/src/components/ui/page/Navigation/NavigationLink.tsx b/src/components/ui/page/Navigation/NavigationLink.tsx
index 9818af6f66..fe4862dcf6 100644
--- a/src/components/ui/page/Navigation/NavigationLink.tsx
+++ b/src/components/ui/page/Navigation/NavigationLink.tsx
@@ -1,74 +1,98 @@
-import { Box, ComponentWithAs, Hide, IconProps, Text } from '@chakra-ui/react';
-import { useCallback } from 'react';
+import { Box, Flex } from '@chakra-ui/react';
+import { Icon } from '@phosphor-icons/react';
+import { TFunction } from 'i18next';
 import { useTranslation } from 'react-i18next';
 import { Link, useMatch } from 'react-router-dom';
-import { NavigationTooltip } from './NavigationTooltip';
 
-interface INavigationLink {
-  href: string;
+function LinkContent({
+  labelKey,
+  NavigationIcon,
+  t,
+  isActive,
+}: {
   labelKey: string;
-  tooltipKey?: string;
-  testId: string;
-  Icon: ComponentWithAs<'svg', IconProps>;
-  target?: string;
-  rel?: string;
-  closeDrawer?: () => void;
+  NavigationIcon: Icon;
+  t: TFunction;
+  isActive: boolean;
+}) {
+  return (
+    <Flex
+      py={3}
+      pl="11px"
+      borderRadius={{ md: 8 }}
+      _hover={{ bgColor: 'neutral-3' }}
+      borderWidth={isActive ? '1px' : '0px'}
+      borderColor="neutral-4"
+      bgColor={isActive ? 'neutral-3' : 'auto'}
+    >
+      <Box w={6}>{<NavigationIcon size={24} />}</Box>
+      <Box
+        mx={3}
+        whiteSpace="nowrap"
+      >
+        {t(labelKey)}
+      </Box>
+    </Flex>
+  );
 }
 
 export function NavigationLink({
+  href,
   labelKey,
   testId,
-  Icon,
-  tooltipKey,
+  NavigationIcon,
+  scope,
   closeDrawer,
-  href,
   ...rest
-}: INavigationLink) {
-  const tooltipTranslationKey = tooltipKey || labelKey;
-
+}: {
+  href: string;
+  labelKey: string;
+  testId: string;
+  NavigationIcon: Icon;
+  scope: 'internal' | 'external';
+  closeDrawer?: () => void;
+}) {
   const { t } = useTranslation('navigation');
-  const isActive = useMatch(href);
+  const isActive = useMatch(href.substring(0, href.indexOf('?')));
 
-  const activeColors = useCallback(() => {
-    return {
-      color: isActive ? 'gold.500' : 'inherit',
-      _hover: {
-        color: 'gold.500-hover',
-      },
-    };
-  }, [isActive]);
+  const linkContent = (
+    <LinkContent
+      labelKey={labelKey}
+      NavigationIcon={NavigationIcon}
+      t={t}
+      isActive={!!isActive}
+    />
+  );
 
-  return (
-    <NavigationTooltip label={t(tooltipTranslationKey)}>
+  if (scope === 'internal') {
+    return (
       <Link
         data-testid={testId}
-        aria-label={t(tooltipTranslationKey)}
+        aria-label={t(labelKey)}
         to={href}
-        {...rest}
         onClick={closeDrawer}
+        {...rest}
       >
-        <Box
-          display={{ base: 'flex', md: undefined }}
-          gap={8}
-          justifyContent="space-between"
-          alignItems="center"
-          {...activeColors()}
-        >
-          <Icon
-            boxSize="1.5rem"
-            sx={{
-              'g path': {
-                transitionProperty: 'all',
-                transitionDuration: '300ms',
-                transitionTimingFunction: 'ease-out',
-              },
-            }}
-          />
-          <Hide above="md">
-            <Text textStyle="text-md-mono-medium">{t(labelKey)}</Text>
-          </Hide>
-        </Box>
+        {linkContent}
       </Link>
-    </NavigationTooltip>
-  );
+    );
+  }
+
+  if (scope === 'external') {
+    return (
+      <a
+        data-testid={testId}
+        aria-label={t(labelKey)}
+        href={href}
+        onClick={closeDrawer}
+        {...rest}
+        target="_blank"
+        rel="noreferrer noopener"
+      >
+        {linkContent}
+      </a>
+    );
+  }
+
+  return null;
 }
diff --git a/src/components/ui/page/Navigation/NavigationLinks.tsx b/src/components/ui/page/Navigation/NavigationLinks.tsx
index 10729233bc..34bbea4009 100644
--- a/src/components/ui/page/Navigation/NavigationLinks.tsx
+++ b/src/components/ui/page/Navigation/NavigationLinks.tsx
@@ -1,118 +1,194 @@
-import { Flex } from '@chakra-ui/react';
+import { Box, Flex, Hide } from '@chakra-ui/react';
 import {
-  Home,
-  Tree,
-  Proposals,
-  Treasury,
-  SupportQuestion,
-  Discord,
-  Documents,
-  Templates,
-} from '@decent-org/fractal-ui';
+  House,
+  GitFork,
+  Scroll,
+  Coins,
+  SquaresFour,
+  Question,
+  DiscordLogo,
+  BookOpen,
+} from '@phosphor-icons/react';
 import { DAO_ROUTES } from '../../../../constants/routes';
 import { URL_FAQ, URL_DISCORD, URL_DOCS } from '../../../../constants/url';
 import { LanguageSwitcher } from '../../../../i18n/LanguageSwitcher';
 import { useNetworkConfig } from '../../../../providers/NetworkConfig/NetworkConfigProvider';
-import Divider from '../../utils/Divider';
-import { NavigationExternalLink } from './NavigationExternalLink';
 import { NavigationLink } from './NavigationLink';
 
-export function NavigationLinks({
+function ExternalLinks({ closeDrawer }: { closeDrawer?: () => void }) {
+  return (
+    <Box
+      mb={6}
+      mt={{ base: 0, md: 6 }}
+      maxWidth={{ md: 12, '3xl': '100%' }}
+      _hover={{ maxWidth: '100%' }}
+      transitionDuration="0.2s"
+      width={{ base: 'full', md: 'auto' }}
+    >
+      <Box
+        borderColor={{ md: 'neutral-3' }}
+        bg={{ md: 'neutral-2' }}
+        mb={{ md: '1px' }}
+        overflow={{ md: 'hidden' }}
+        borderTopRadius={{ md: 8 }}
+        borderTopWidth={{ md: 1 }}
+        borderLeftWidth={{ md: 1 }}
+        borderRightWidth={{ md: 1 }}
+      >
+        <NavigationLink
+          href={URL_FAQ}
+          labelKey="faq"
+          testId="navigationExternal-faq"
+          NavigationIcon={Question}
+          scope="external"
+          closeDrawer={closeDrawer}
+        />
+        <NavigationLink
+          href={URL_DISCORD}
+          labelKey="discord"
+          testId="navigationExternal-discord"
+          NavigationIcon={DiscordLogo}
+          scope="external"
+          closeDrawer={closeDrawer}
+        />
+        <NavigationLink
+          href={URL_DOCS}
+          labelKey="documentation"
+          testId="navigationExternal-documentation"
+          NavigationIcon={BookOpen}
+          scope="external"
+          closeDrawer={closeDrawer}
+        />
+      </Box>
+      <Hide above="md">
+        <Box
+          borderTop="1px"
+          borderColor="neutral-3"
+          mx={-6}
+        />
+      </Hide>
+      <Box
+        bg={{ md: 'neutral-2' }}
+        overflow={{ md: 'hidden' }}
+        borderColor={{ md: 'neutral-3' }}
+        borderWidth={{ md: 1 }}
+        borderBottomRadius={{ md: 8 }}
+        pl={{ md: '11px' }}
+        pt={{ base: 3, md: '11px' }}
+        pb={{ md: '4px' }}
+      >
+        <LanguageSwitcher data-testid="navigation-language" />
+      </Box>
+    </Box>
+  );
+}
+
+function InternalLinks({
   address,
   showDAOLinks,
   closeDrawer,
 }: {
-  showDAOLinks: boolean;
   address: string | null;
+  showDAOLinks: boolean;
   closeDrawer?: () => void;
 }) {
   const { addressPrefix } = useNetworkConfig();
+
+  if (!showDAOLinks || !address) {
+    return null;
+  }
+
   return (
-    <>
-      {showDAOLinks && address && (
-        <>
-          <Flex
-            alignItems={{ base: 'flex-start', md: 'center' }}
-            direction="column"
-            gap="2rem"
-            w="full"
-            my={8}
-          >
-            <NavigationLink
-              href={DAO_ROUTES.dao.relative(addressPrefix, address)}
-              labelKey="home"
-              testId="navigation-daoHomeLink"
-              Icon={Home}
-              closeDrawer={closeDrawer}
-            />
-            <NavigationLink
-              href={DAO_ROUTES.hierarchy.relative(addressPrefix, address)}
-              labelKey="nodes"
-              testId="navigation-hierarchy"
-              Icon={Tree}
-              closeDrawer={closeDrawer}
-            />
-            <NavigationLink
-              href={DAO_ROUTES.proposals.relative(addressPrefix, address)}
-              labelKey="proposals"
-              testId="navigation-proposalsLink"
-              Icon={Proposals}
-              closeDrawer={closeDrawer}
-            />
-            <NavigationLink
-              href={DAO_ROUTES.treasury.relative(addressPrefix, address)}
-              labelKey="treasury"
-              testId="navigation-treasuryLink"
-              Icon={Treasury}
-              closeDrawer={closeDrawer}
-            />
-            <NavigationLink
-              href={DAO_ROUTES.proposalTemplates.relative(addressPrefix, address)}
-              labelKey="proposalTemplates"
-              testId="navigation-proposalTemplatesLink"
-              Icon={Templates}
-              closeDrawer={closeDrawer}
-            />
-          </Flex>
-        </>
-      )}
-      <Flex
-        alignItems={{ base: 'flex-start', md: 'center' }}
-        direction="column"
-        gap="2rem"
-        w="full"
-        mb={8}
-        justifyContent={{ base: 'flex-start' }}
+    <Box
+      width="full"
+      marginY="auto"
+    >
+      <Box
+        maxWidth={{ md: 12, '3xl': '100%' }}
+        _hover={{ maxWidth: '100%' }}
+        transitionDuration="0.2s"
+        overflow={{ md: 'hidden' }}
+        bg={{ md: 'neutral-2' }}
+        mt={{ md: 12 }}
+        mb={{ md: 3 }}
+        borderColor={{ md: 'neutral-3' }}
+        borderRadius={{ md: 8 }}
+        borderWidth={{ md: 1 }}
       >
-        <Divider />
-        <NavigationExternalLink
-          href={URL_FAQ}
-          ariaLabelKey="ariaLabelFAQ"
-          tooltipKey="faq"
-          testId="navigationExternal-faq"
-          Icon={SupportQuestion}
+        <NavigationLink
+          href={DAO_ROUTES.dao.relative(addressPrefix, address)}
+          labelKey="home"
+          testId="navigation-daoHomeLink"
+          NavigationIcon={House}
+          scope="internal"
           closeDrawer={closeDrawer}
         />
-        <NavigationExternalLink
-          href={URL_DISCORD}
-          ariaLabelKey="ariaLabelDiscord"
-          tooltipKey="discord"
-          testId="navigationExternal-discord"
-          Icon={Discord}
+        <NavigationLink
+          href={DAO_ROUTES.hierarchy.relative(addressPrefix, address)}
+          labelKey="nodes"
+          testId="navigation-hierarchy"
+          NavigationIcon={GitFork}
+          scope="internal"
           closeDrawer={closeDrawer}
         />
-        <NavigationExternalLink
-          href={URL_DOCS}
-          ariaLabelKey="ariaLabelDocumentation"
-          tooltipKey="documentation"
-          testId="navigationExternal-documentation"
-          Icon={Documents}
+        <NavigationLink
+          href={DAO_ROUTES.proposals.relative(addressPrefix, address)}
+          labelKey="proposals"
+          testId="navigation-proposalsLink"
+          NavigationIcon={Scroll}
+          scope="internal"
+          closeDrawer={closeDrawer}
+        />
+        <NavigationLink
+          href={DAO_ROUTES.treasury.relative(addressPrefix, address)}
+          labelKey="treasury"
+          testId="navigation-treasuryLink"
+          NavigationIcon={Coins}
+          scope="internal"
           closeDrawer={closeDrawer}
         />
+        <NavigationLink
+          href={DAO_ROUTES.proposalTemplates.relative(addressPrefix, address)}
+          labelKey="proposalTemplates"
+          testId="navigation-proposalTemplatesLink"
+          NavigationIcon={SquaresFour}
+          scope="internal"
+          closeDrawer={closeDrawer}
+        />
+        <Hide above="md">
+          <Box
+            borderTop="1px"
+            borderColor="neutral-3"
+            mx={-6}
+          />
+        </Hide>
+      </Box>
+    </Box>
+  );
+}
 
-        <Divider color="chocolate.700" />
-        <LanguageSwitcher data-testid="navigation-language" />
-      </Flex>
-    </>
+export function NavigationLinks({
+  address,
+  showDAOLinks,
+  closeDrawer,
+}: {
+  showDAOLinks: boolean;
+  address: string | null;
+  closeDrawer?: () => void;
+}) {
+  return (
+    <Flex
+      alignItems="start"
+      direction="column"
+      justifyContent="flex-end"
+      flexGrow={1}
+    >
+      <InternalLinks
+        address={address}
+        showDAOLinks={showDAOLinks}
+        closeDrawer={closeDrawer}
+      />
+      <ExternalLinks closeDrawer={closeDrawer} />
+    </Flex>
   );
 }
diff --git a/src/components/ui/page/Navigation/index.tsx b/src/components/ui/page/Navigation/index.tsx
deleted file mode 100644
index 13ff4898ef..0000000000
--- a/src/components/ui/page/Navigation/index.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import { Flex, Show } from '@chakra-ui/react';
-import { useFractal } from '../../../../providers/App/AppProvider';
-import { NavigationLinks } from './NavigationLinks';
-
-function Navigation() {
-  const {
-    node: { daoAddress },
-  } = useFractal();
-
-  const showDAOLinks = !!daoAddress;
-  return (
-    <Flex
-      alignItems="center"
-      direction="column"
-      justifyContent="end"
-      flexGrow={1}
-    >
-      <Show above="md">
-        <NavigationLinks
-          showDAOLinks={showDAOLinks}
-          address={daoAddress}
-        />
-      </Show>
-    </Flex>
-  );
-}
-
-export default Navigation;
diff --git a/src/i18n/LanguageSwitcher.tsx b/src/i18n/LanguageSwitcher.tsx
index 4dccc5922d..f4684de75e 100644
--- a/src/i18n/LanguageSwitcher.tsx
+++ b/src/i18n/LanguageSwitcher.tsx
@@ -1,5 +1,5 @@
-import { Box, Center, Hide, Text } from '@chakra-ui/react';
-import { Globe } from '@decent-org/fractal-ui';
+import { Box, Flex } from '@chakra-ui/react';
+import { GlobeSimple } from '@phosphor-icons/react';
 import { useTranslation } from 'react-i18next';
 import { OptionMenu } from '../components/ui/menus/OptionMenu';
 import { supportedLanguages } from '.';
@@ -14,29 +14,21 @@ export function LanguageSwitcher() {
     };
   });
   return (
-    <Center>
-      <OptionMenu
-        offset={[16, 8]}
-        trigger={
-          <Box
-            display={{ base: 'flex', md: undefined }}
-            gap={8}
-            justifyContent="space-between"
-            alignItems="center"
-          >
-            <Globe
-              boxSize="1.5rem"
-              minWidth="auto"
-            />
-            <Hide above="md">
-              <Text textStyle="text-md-mono-medium">{t(i18n.language.slice(0, 2))}</Text>
-            </Hide>
+    <OptionMenu
+      offset={[16, 8]}
+      trigger={
+        <Flex>
+          <Box w={6}>
+            <GlobeSimple size={24} />
           </Box>
-        }
-        options={supported}
-        namespace="languages"
-        tooltipKey="tooltipTitle"
-      />
-    </Center>
+          <Box ml={3}>{t('tooltipTitle')}</Box>
+        </Flex>
+      }
+      options={supported}
+      namespace="languages"
+      buttonProps={{
+        width: 'full',
+      }}
+    />
   );
 }
diff --git a/src/i18n/locales/en/dashboard.json b/src/i18n/locales/en/dashboard.json
index 91b5e919ec..d5bbeef126 100644
--- a/src/i18n/locales/en/dashboard.json
+++ b/src/i18n/locales/en/dashboard.json
@@ -3,7 +3,7 @@
   "emptyFavorites": "No favorites",
   "errorInvalidSearch": "This is not a valid Ethereum address",
   "errorFailedSearch": "Sorry, this address is not a Fractal or Safe{WALLET} on {{chain}}",
-  "searchDAOPlaceholder": "Enter any existing Safe address",
+  "searchDAOPlaceholder": "Search for a Safe by address or ENS",
   "titleGovernance": "Governance",
   "titleType": "Type",
   "titleVotingPeriod": "Voting Period",
diff --git a/src/i18n/locales/en/navigation.json b/src/i18n/locales/en/navigation.json
index 9a8f2c0b73..abfbc55ea1 100644
--- a/src/i18n/locales/en/navigation.json
+++ b/src/i18n/locales/en/navigation.json
@@ -11,8 +11,5 @@
   "ariaLabelHome": "Navigate Safe Home",
   "ariaLabelProposals": "Navigate Safe Proposals",
   "ariaLabelActivities": "Navigate Safe Activities",
-  "ariaLabelTreasury": "Navigate Safe Treasury",
-  "ariaLabelFAQ": "Link to FAQ",
-  "ariaLabelDiscord": "Link to Discord",
-  "ariaLabelDocumentation": "Link to documentation"
+  "ariaLabelTreasury": "Navigate Safe Treasury"
 }
diff --git a/src/i18n/locales/uk/navigation.json b/src/i18n/locales/uk/navigation.json
index 8d5d9cc54b..fe42ec7144 100644
--- a/src/i18n/locales/uk/navigation.json
+++ b/src/i18n/locales/uk/navigation.json
@@ -4,8 +4,5 @@
   "treasury": "Скарбниця",
   "faq": "FAQ",
   "documentation": "Документація",
-  "ariaLabelFractalBrand": "Перейти до Головної",
-  "ariaLabelFAQ": "Посилання на FAQ",
-  "ariaLabelDiscord": "Посилання на Discord",
-  "ariaLabelDocumentation": "Посилання на документацію"
+  "ariaLabelFractalBrand": "Перейти до Головної"
 }