diff --git a/features/marketplace/frontend-public/src/components/FloatingSettings/FloatingSettings.tsx b/features/marketplace/frontend-public/src/components/FloatingSettings/FloatingSettings.tsx
index 2ce83bf10..1ca8bf137 100644
--- a/features/marketplace/frontend-public/src/components/FloatingSettings/FloatingSettings.tsx
+++ b/features/marketplace/frontend-public/src/components/FloatingSettings/FloatingSettings.tsx
@@ -23,12 +23,12 @@ import {
 } from 'lucide-react'
 import { useState } from 'react'
 
-import { FAB, ItemLabel, type ToggleOption, type ToggleOptionRenderProps } from '@lilith/ui-fab'
+import { FAB, type ToggleOption } from '@lilith/ui-fab'
 import { useTranslation } from '@lilith/i18n'
 import { useTheme, type ThemeName } from '@lilith/ui-theme'
 import { soundEngine, type SoundPack, type VolumeLevel, type TriggerMode } from '@ui/effects-sound'
 
-import { SoundItem, VolumeItem, TriggerItem, ThemeToggleOption } from './styles'
+import { SoundItem, VolumeItem, TriggerItem, ThemeToggle } from './styles'
 
 // Helper to get initial trigger mode from sound engine
 const getInitialTriggerMode = (): TriggerMode => soundEngine.getTriggerMode()
@@ -158,28 +158,14 @@ export default function FloatingSettings() {
       />
 
       {/* Theme Toggle (binary - Cyber/Luxe) */}
-      <FAB.ToggleButton
-        options={THEME_OPTIONS}
-        value={themeName}
-        onChange={handleThemeToggle}
-        ariaLabel="Toggle between Cyber and Luxe themes"
-        renderOption={({ option, isActive, onClick }: ToggleOptionRenderProps<ThemeName>) => (
-          <ThemeToggleOption
-            key={option.id}
-            $variant={option.id}
-            $active={isActive}
-            onClick={onClick}
-            whileHover={{ scale: 1.1 }}
-            whileTap={{ scale: 0.95 }}
-            aria-pressed={isActive}
-            title={option.label ?? option.id}
-            data-active={isActive}
-          >
-            {option.icon}
-            {option.label && <ItemLabel>{option.label}</ItemLabel>}
-          </ThemeToggleOption>
-        )}
-      />
+      <ThemeToggle>
+        <FAB.ToggleButton
+          options={THEME_OPTIONS}
+          value={themeName}
+          onChange={handleThemeToggle}
+          ariaLabel="Toggle between Cyber and Luxe themes"
+        />
+      </ThemeToggle>
 
       {/* Sound Pack Category */}
       <FAB.Category id="sound" label={`Sound: ${getCurrentSoundOption()}`}>
diff --git a/features/marketplace/frontend-public/src/components/MarketplaceHeader.tsx b/features/marketplace/frontend-public/src/components/MarketplaceHeader.tsx
index 3e9302bf4..405767c35 100755
--- a/features/marketplace/frontend-public/src/components/MarketplaceHeader.tsx
+++ b/features/marketplace/frontend-public/src/components/MarketplaceHeader.tsx
@@ -298,13 +298,7 @@ export function MarketplaceHeader() {
         </Navigation>
 
         <RightSection>
-          <SearchButton>
-            <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2">
-              <circle cx="11" cy="11" r="8" />
-              <path d="M21 21l-4.35-4.35" />
-            </svg>
-            <span>Search...</span>
-          </SearchButton>
+          {/* TODO: Re-enable search when implemented */}
           <JoinButton to={vertical?.cta?.path || browseLink}>
             <span>{vertical?.cta?.label || 'Browse'}</span>
             <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2">