3 files changed, 8 insertions, 17 deletions
diff --git a/src/components/organisms/toolbar/main-nav.tsx b/src/components/organisms/toolbar/main-nav.tsx
index 6933c44..7f03577 100644
--- a/src/components/organisms/toolbar/main-nav.tsx
+++ b/src/components/organisms/toolbar/main-nav.tsx
@@ -1,11 +1,6 @@
 import { forwardRef, type ForwardRefRenderFunction } from 'react';
 import { useIntl } from 'react-intl';
-import {
-  BooleanField,
-  type BooleanFieldProps,
-  Hamburger,
-  Label,
-} from '../../atoms';
+import { BooleanField, type BooleanFieldProps, Icon, Label } from '../../atoms';
 import { NavList, type NavListProps, type NavItem } from '../../molecules';
 import mainNavStyles from './main-nav.module.scss';
 import sharedStyles from './toolbar-items.module.scss';
@@ -62,7 +57,7 @@ const MainNavWithRef: ForwardRefRenderFunction<HTMLDivElement, MainNavProps> = (
         className={`${sharedStyles.label} ${mainNavStyles.label}`}
         htmlFor="main-nav-button"
       >
-        <Hamburger iconClassName={mainNavStyles.icon} />
+        <Icon shape="hamburger" />
       </Label>
       <NavList
         className={`${sharedStyles.modal} ${mainNavStyles.modal} ${className}`}
diff --git a/src/components/organisms/toolbar/search.tsx b/src/components/organisms/toolbar/search.tsx
index b20f0d5..a09bdae 100644
--- a/src/components/organisms/toolbar/search.tsx
+++ b/src/components/organisms/toolbar/search.tsx
@@ -1,11 +1,7 @@
-import { forwardRef, ForwardRefRenderFunction, useRef } from 'react';
+import { forwardRef, type ForwardRefRenderFunction, useRef } from 'react';
 import { useIntl } from 'react-intl';
 import { useInputAutofocus } from '../../../utils/hooks';
-import {
-  BooleanField,
-  type BooleanFieldProps,
-  MagnifyingGlass,
-} from '../../atoms';
+import { BooleanField, type BooleanFieldProps, Icon } from '../../atoms';
 import { FlippingLabel } from '../../molecules';
 import { SearchModal, type SearchModalProps } from '../modals';
 import searchStyles from './search.module.scss';
@@ -71,7 +67,7 @@ const SearchWithRef: ForwardRefRenderFunction<HTMLDivElement, SearchProps> = (
         htmlFor="search-button"
         isActive={isActive}
       >
-        <MagnifyingGlass aria-hidden={true} />
+        <Icon aria-hidden={true} shape="magnifying-glass" size="lg" />
       </FlippingLabel>
       <SearchModal
         className={`${sharedStyles.modal} ${searchStyles.modal} ${className}`}
diff --git a/src/components/organisms/toolbar/settings.tsx b/src/components/organisms/toolbar/settings.tsx
index 3f328a5..53634d8 100644
--- a/src/components/organisms/toolbar/settings.tsx
+++ b/src/components/organisms/toolbar/settings.tsx
@@ -1,6 +1,6 @@
-import { forwardRef, ForwardRefRenderFunction } from 'react';
+import { forwardRef, type ForwardRefRenderFunction } from 'react';
 import { useIntl } from 'react-intl';
-import { BooleanField, type BooleanFieldProps, Cog } from '../../atoms';
+import { BooleanField, type BooleanFieldProps, Icon } from '../../atoms';
 import { FlippingLabel } from '../../molecules';
 import { SettingsModal, type SettingsModalProps } from '../modals';
 import styles from './toolbar-items.module.scss';
@@ -59,7 +59,7 @@ const SettingsWithRef: ForwardRefRenderFunction<
         htmlFor="settings-button"
         isActive={isActive}
       >
-        <Cog aria-hidden={true} />
+        <Icon aria-hidden={true} shape="cog" size="lg" />
       </FlippingLabel>
       <SettingsModal
         ackeeStorageKey={ackeeStorageKey}