diff --git a/src/Utils/Icon.hs b/src/Utils/Icon.hs
index 6bae13eee..0d9b68b5f 100644
--- a/src/Utils/Icon.hs
+++ b/src/Utils/Icon.hs
@@ -122,95 +122,6 @@ data Icon
   deriving (Eq, Ord, Enum, Bounded, Show, Read, Generic)
   deriving anyclass (Universe, Finite, NFData)
 
-{- iconText :: Icon -> Text
-iconText = \case
-    IconNew                          -> "seedling"
-    IconOK                           -> "check"
-    IconNotOK                        -> "times"
-    IconWarning                      -> "exclamation"
-    IconProblem                      -> "bolt"
-    IconVisible                      -> "eye"
-    IconInvisible                    -> "eye-slash"
-    -- IconCourse                       -> "chalkboard-teacher" -- From fontawesome v6 onwards: "chalkboard-user" / or "desktop" for both
-    IconCourseFavouriteManual        -> "star"
-    IconCourseFavouriteAutomatic     -> "star-half-alt"
-    IconCourseFavouriteOff           -> "slash" -- TODO use FA regular style star for stacked icon
-    IconEnrolTrue                    -> "user-plus"
-    IconEnrolFalse                   -> "user-slash"
-    IconPlanned                      -> "cog"
-    IconAnnounce                     -> "bullhorn"
-    IconExam                         -> "poll-h"
-    IconExamRegisterTrue             -> "calendar-check"
-    IconExamRegisterFalse            -> "calendar-times"
-    IconExamAutoOccurrenceNudgeUp    -> "user-plus"
-    IconExamAutoOccurrenceNudgeDown  -> "user-minus"
-    IconExamAutoOccurrenceIgnore     -> "users-slash"
-    IconExamAutoOccurrenceReconsider -> "users"
-    IconCommentTrue             -> "comment-alt"
-    IconCommentFalse            -> "comment-alt-slash"
-    IconLink                    -> "link"
-    IconFileDownload            -> "file-download"
-    IconFileUpload              -> "file-upload"
-    IconFileZip                 -> "file-archive"
-    IconFileCSV                 -> "file-csv"
-    IconSFTQuestion             -> "question-circle"    -- for SheetFileType only, should all be round (similar)
-    IconSFTHint                 -> "life-ring"          -- for SheetFileType only
-    IconSFTSolution             -> "exclamation-circle" -- for SheetFileType only
-    IconSFTMarking              -> "check-circle"       -- for SheetFileType only
-    IconEmail                   -> "envelope" -- envelope is no longer unamibuous, use IconAt or IconLetter if email and postal need to be distinguished
-    IconRegisterTemplate        -> "file-alt"
-    IconNoCorrectors            -> "user-slash"
-    IconRemoveUser              -> "user-slash"
-    IconTooltipDefault          -> "question-circle"
-    IconNotificationSuccess     -> "check-circle"
-    IconNotificationInfo        -> "info-circle"
-    IconNotificationWarning     -> "exclamation-circle"
-    IconNotificationError       -> "exclamation-triangle"
-    IconNotificationNonactive   -> "info"
-    IconFavourite               -> "star"
-    IconLanguage                -> "flag-alt"
-    IconNavContainerClose       -> "chevron-up"
-    IconPageActionChildrenClose -> "chevron-up"
-    IconMenuNews                -> "megaphone"
-    IconMenuHelp                -> "question"
-    IconMenuProfile             -> "cogs"
-    IconMenuLogin               -> "sign-in-alt"
-    IconMenuLogout              -> "sign-out-alt"
-    IconBreadcrumbsHome         -> "home"
-    IconMenuExtra               -> "ellipsis-h"
-    IconMenuCourseList          -> "chalkboard-teacher" -- From fontawesome v6 onwards: "chalkboard-user" / or "desktop" for both
-    IconMenuCorrections         -> "check"
-    IconMenuExams               -> "poll-h"
-    IconMenuAdmin               -> "screwdriver"
-    IconMenuLms                 -> "tasks" -- "user-graduate" "laptop" 
-    IconMenuQualification       -> "graduation-cap" -- "award" "diploma" "file-certificate"
-    IconPageActionPrimaryExpand -> "bars"
-    IconPageActionSecondary     -> "ellipsis-h"
-    IconBreadcrumbSeparator     -> "angle-right"
-    IconFileUploadSession       -> "file-upload"
-    IconStandaloneFieldError    -> "exclamation"
-    IconFileUser                -> "file-user"
-    IconNotification            -> "envelope"
-    IconNotificationSent        -> "envelope-open" -- "paper-plane", "shipping-fast", "hourglass-half"
-    IconNoNotification          -> "bell-slash"
-    IconPersonalIdentification  -> "id-card"
-    IconMenuWorkflows           -> "project-diagram"
-    IconVideo                   -> "video"
-    IconSubmissionUserDuplicate -> "copy"
-    IconSubmissionNoUsers       -> "user-slash"
-    IconReset                   -> "undo" -- From fontawesome v6 onwards: "arrow-rotate-left"
-    IconBlocked                 -> "ban"
-    IconCertificate             -> "badge-check"
-    IconPrintCenter             -> "mail-bulk" -- From fontawesome v6 onwards: "envelope-bulk"
-    IconLetter                  -> "mail-bulk" -- Problem "envelope" already used for email as well
-    IconAt                      -> "at"        -- alternative for IconEmail to distinguish from IconLetter
-    IconSupervisor              -> "head-side" -- must be notably different to user
-    IconSupervisorForeign       -> "alien"
-    -- IconWaitingForUser          -> "user-cog"  -- Waiting on a user to do something
-    IconExpired                 -> "hourglass-end"
-    IconLocked                  -> "lock"
-    IconUnlocked                -> "lock-open-alt"
-    IconResetTries              -> "trash-undo" -}
 
 iconText :: Icon -> Text
 iconText = camelToPathPiece' 1 . tshow 
@@ -222,14 +133,7 @@ deriveJSON defaultOptions
   { constructorTagModifier = camelToPathPiece' 1
   } ''Icon
 
--- Create an icon from font-awesome without additional space
-{- icon :: Icon -> Markup
-icon ic = [shamlet|
-            $newline never
-            <i .fas .fa-#{iconText ic}>
-          |]
--}
-
+-- Create an icon without additional space
 icon :: Icon -> Markup
 icon ic = [shamlet|
             $newline never
@@ -237,14 +141,7 @@ icon ic = [shamlet|
           |]
 
   
--- Create an icon from font-awesome with fixed width
-{-iconFixed :: Icon -> Markup
-iconFixed ic = [shamlet|
-                 $newline never
-                 <i .fas .fa-fw .fa-#{iconText ic}>
-               |]
--}
-
+-- Create an icon with fixed width
 iconFixed :: Icon -> Markup
 iconFixed ic = [shamlet|
                  $newline never
@@ -252,18 +149,7 @@ iconFixed ic = [shamlet|
                |]
 
 
--- Stack two icons from font-awesome without additional space
-{-iconStacked :: Icon -> Icon -> Markup
-iconStacked ic0 ic1
-  = [shamlet|
-    $newline never
-    <span .fa-stack .icon--stacked>
-      <i .fas .fa-stack-2x .fa-#{iconText ic0}>
-      <i .fas .fa-stack-2x .fa-#{iconText ic1}>
-  |]
-
--}
-
+-- Stack two icons without additional space
 iconStacked :: Icon -> Icon -> Markup
 iconStacked ic0 ic1
   = [shamlet|