2 files changed, 6 insertions, 8 deletions
diff --git a/src/components/organisms/toolbar/search.tsx b/src/components/organisms/toolbar/search.tsx
index a09bdae..6a33aff 100644
--- a/src/components/organisms/toolbar/search.tsx
+++ b/src/components/organisms/toolbar/search.tsx
@@ -62,13 +62,12 @@ const SearchWithRef: ForwardRefRenderFunction<HTMLDivElement, SearchProps> = (
         value="open"
       />
       <FlippingLabel
-        aria-label={label}
         className={sharedStyles.label}
         htmlFor="search-button"
+        icon={<Icon aria-hidden={true} shape="magnifying-glass" size="lg" />}
         isActive={isActive}
-      >
-        <Icon aria-hidden={true} shape="magnifying-glass" size="lg" />
-      </FlippingLabel>
+        label={label}
+      />
       <SearchModal
         className={`${sharedStyles.modal} ${searchStyles.modal} ${className}`}
         ref={searchInputRef}
diff --git a/src/components/organisms/toolbar/settings.tsx b/src/components/organisms/toolbar/settings.tsx
index 53634d8..b7625aa 100644
--- a/src/components/organisms/toolbar/settings.tsx
+++ b/src/components/organisms/toolbar/settings.tsx
@@ -54,13 +54,12 @@ const SettingsWithRef: ForwardRefRenderFunction<
         value="open"
       />
       <FlippingLabel
-        aria-label={label}
         className={styles.label}
         htmlFor="settings-button"
+        icon={<Icon aria-hidden={true} shape="cog" size="lg" />}
         isActive={isActive}
-      >
-        <Icon aria-hidden={true} shape="cog" size="lg" />
-      </FlippingLabel>
+        label={label}
+      />
       <SettingsModal
         ackeeStorageKey={ackeeStorageKey}
         className={`${styles.modal} ${className}`}