diff --git a/src/Utils/Icon.hs b/src/Utils/Icon.hs
index 4d9165018..e9fdcce66 100644
--- a/src/Utils/Icon.hs
+++ b/src/Utils/Icon.hs
@@ -121,9 +121,7 @@ icon ic = [shamlet|
 -- Create an icon (defaults to "?") with a specified tooltip
 iconTooltip :: forall site. WidgetFor site () -> Maybe Icon -> Bool -> WidgetFor site ()
 iconTooltip tooltip mIcon isInlineTooltip = let
-    ic = iconText $ case mIcon of
-      Nothing -> IconTooltipDefault
-      Just i  -> i
+    ic = iconText $ fromMaybe IconTooltipDefault mIcon
     urgency = "urgency__info" :: Text
   in $(whamletFile "templates/widgets/tooltip.hamlet")
 
diff --git a/src/Utils/Message.hs b/src/Utils/Message.hs
index 3a126690d..59bfbb926 100644
--- a/src/Utils/Message.hs
+++ b/src/Utils/Message.hs
@@ -195,13 +195,13 @@ getMessages = fmap decodeMessage <$> ClassyPrelude.Yesod.getMessages
 
 messageTooltip :: forall site. Message -> WidgetFor site ()
 messageTooltip Message{..} = let urgency = statusToUrgencyClass messageStatus
-                                 ic      = iconText $ case messageIcon of
-                                             Nothing -> case messageStatus of
+                                 ic      = iconText $ fromMaybe
+                                             (case messageStatus of
                                                Utils.Message.Error   -> IconProblem
                                                Utils.Message.Warning -> IconWarning
                                                Utils.Message.Success -> IconOK
-                                               Utils.Message.Info    -> IconTooltipDefault
-                                             Just i  -> i
+                                               Utils.Message.Info    -> IconTooltipDefault)
+                                             messageIcon
                                  tooltip = toWidget messageContent :: WidgetFor site ()
                                  isInlineTooltip = False
                              in $(whamletFile "templates/widgets/tooltip.hamlet")