diff --git a/src/Handler/Utils/Table/Pagination.hs b/src/Handler/Utils/Table/Pagination.hs
index cfb7b1231..80f1fa0fe 100644
--- a/src/Handler/Utils/Table/Pagination.hs
+++ b/src/Handler/Utils/Table/Pagination.hs
@@ -1690,12 +1690,7 @@ i18nCell msg = cell $ do
 cellTooltip :: (RenderMessage UniWorX msg, IsDBTable m a) => msg -> DBCell m a -> DBCell m a
 cellTooltip msg = cellContents.mapped %~ (<> tipWdgt)
   where
-    tipWdgt = [whamlet|
-        <div .tooltip>
-          <div .tooltip__handle>
-          <div .tooltip__content>_{msg}
-      |]
-
+    tipWdgt = iconTooltip (msg2widget msg) Nothing True
       
 -- | Always display widget; maybe a link if user is Authorized.
 --   Also see variant `linkEmptyCell`
diff --git a/src/Utils.hs b/src/Utils.hs
index 5775eead2..f3b026c15 100644
--- a/src/Utils.hs
+++ b/src/Utils.hs
@@ -307,6 +307,8 @@ int2widget i = [whamlet|#{tshow i}|]
 word2widget :: Word64 -> WidgetFor site ()
 word2widget i = [whamlet|#{tshow i}|]
 
+msg2widget :: RenderMessage site a => a -> WidgetFor site ()
+msg2widget msg = [whamlet|_{msg}|]
 
 withFragment :: Monad m => MForm m (a, WidgetFor site ()) -> Markup -> MForm m (a, WidgetFor site ())
 withFragment form html = flip fmap form $ over _2 (toWidget html >>)