fix: merge-conflict regressions

Author: wackerow

CLAUDE.md

@@ -179,7 +179,7 @@ pnpm events-import         # Import community events
 - `@radix-ui/*` - Accessible component primitives
 - `tailwind-variants` - Component variant patterns
 - `framer-motion` - Animation library
-- `react-icons` - Icon library
+- `lucide-react` - Icon library
 
 ### Content & Data
 

src/components/Nav/Client/index.tsx

@@ -3,8 +3,8 @@
 import { useRef } from "react"
 import dynamic from "next/dynamic"
 import { useLocale } from "next-intl"
-import { BsTranslate } from "react-icons/bs"
 
+import Translate from "@/components/icons/translate.svg"
 import SearchButton from "@/components/Search/SearchButton"
 import SearchInputButton from "@/components/Search/SearchInputButton"
 import { Skeleton } from "@/components/ui/skeleton"
@@ -145,7 +145,7 @@ const ClientSideNav = () => {
               variant="ghost"
               className="animate-fade-in gap-0 px-2 text-body transition-transform duration-500 active:bg-primary-low-contrast active:text-primary-hover data-[state='open']:bg-primary-low-contrast data-[state='open']:text-primary-hover max-md:hidden xl:px-3 [&_svg]:transition-transform [&_svg]:duration-500 [&_svg]:hover:rotate-12"
             >
-              <BsTranslate className="me-2 align-middle text-2xl" />
+              <Translate className="me-2 align-middle text-2xl" />
               <span className="max-lg:hidden">{t("languages")}&nbsp;</span>
               {locale!.toUpperCase()}
             </Button>

src/components/Nav/useThemeToggle.ts

@@ -1,5 +1,5 @@
+import { Moon, Sun } from "lucide-react"
 import { useTheme } from "next-themes"
-import { MdBrightness2, MdWbSunny } from "react-icons/md"
 
 import { trackCustomEvent } from "@/lib/utils/matomo"
 
@@ -10,7 +10,7 @@ import useTranslation from "@/hooks/useTranslation"
 export const useThemeToggle = () => {
   const { t } = useTranslation("common")
   const { setTheme, resolvedTheme } = useTheme()
-  const ThemeIcon = useColorModeValue(MdBrightness2, MdWbSunny)
+  const ThemeIcon = useColorModeValue(Moon, Sun)
 
   const toggleColorMode = () => {
     const targetTheme = resolvedTheme === "dark" ? "light" : "dark"