diff --git a/frontend/src/icons.scss b/frontend/src/icons.scss
index 5260dca33..bb9ddd73f 100644
--- a/frontend/src/icons.scss
+++ b/frontend/src/icons.scss
@@ -15,8 +15,6 @@ $icons: ok,
     background-repeat: no-repeat;
     background-position: center;
     aspect-ratio: 1/1;
-    min-width: 1em;
-    font-size: inherit;
     display: inline-block;
     filter: invert(22%) sepia(84%) saturate(7448%) hue-rotate(357deg) brightness(102%) contrast(116%);
   }
@@ -24,13 +22,15 @@ $icons: ok,
 
 .small-ico {
   font-size: 1em;
+  width: 1em;
 }
 
 .medium-ico {
   font-size: 1.5em;
+  width: 1.5em;
 }
 
 .large-ico {
   font-size: 2em;
+  width: 2em;
 }
-
diff --git a/src/Utils/Icon.hs b/src/Utils/Icon.hs
index e246d3b6d..f7ebe0ee0 100644
--- a/src/Utils/Icon.hs
+++ b/src/Utils/Icon.hs
@@ -260,13 +260,7 @@ iconStacked ic0 ic1
 -}
 
 iconStacked :: Icon -> Icon -> Markup
-iconStacked ic0 ic1
-  = [shamlet|
-    $newline never
-    <span .icon--stacked>
-      <span .ico-#{iconText ic0} .medium-ico>
-      <span .ico-#{iconText ic1} .medium-ico>
-  |]
+iconStacked i _ = icon i -- TODO
 
 -- Create an icon (defaults to "?") with a specified tooltip; inline-bool just affects the size of the icon
 iconTooltip :: forall site. WidgetFor site () -> Maybe Icon -> Bool -> WidgetFor site ()
diff --git a/templates/widgets/navbar/navbar.hamlet b/templates/widgets/navbar/navbar.hamlet
index 2d56ee404..b6050413d 100644
--- a/templates/widgets/navbar/navbar.hamlet
+++ b/templates/widgets/navbar/navbar.hamlet
@@ -46,7 +46,7 @@ $# SPDX-License-Identifier: AGPL-3.0-or-later
       $forall n@(NavHeaderContainer{ navHeaderRole }, containerIdent, _, ns) <- filter isNavHeaderContainer nav
         <div .navbar__container-list :navHeaderRole == NavHeaderPrimary:.navbar__container-list--left ##{containerIdent}-container>
           <label .navbar__container-list-closer for=container-radio-none>
-            <span .ico-#{iconText IconNavContainerClose} .medium-ico>
+            <span .fa-#{iconText IconNavContainerClose} .medium-ico>
           <ul>
             $forall iN@(nl, _, _) <- ns
               <li .navbar__container-list-item :highlightNav nl:.navbar__container-list-item--active>