diff --git a/src/web-app-runner.lisp b/src/web-app-runner.lisp
index 875fb9f..dc8fb9b 100644
--- a/src/web-app-runner.lisp
+++ b/src/web-app-runner.lisp
@@ -644,7 +644,7 @@ set a replacement PIN and open the saved authenticated sessions."
          (forward (make-button :icon-name "go-next-symbolic"))
          (reload (make-button :icon-name "view-refresh-symbolic"))
          (address (make-entry))
-         (credentials-button (make-button :label "Credentials"))
+         (credentials-button (make-button :icon-name "dialog-password-symbolic"))
          (lock-button (make-button :label "Lock"))
          (forget-cookies (make-forget-cookies-toggle window))
          (lock-overlay (make-runner-lock window web-view))
@@ -666,11 +666,11 @@ set a replacement PIN and open the saved authenticated sessions."
           (window-titlebar window) header
           (widget-hexpand-p address) t
           (widget-hexpand-p web-view) t
-          (widget-vexpand-p web-view) t)
-    (dolist (widget (list back forward reload))
+          (widget-vexpand-p web-view) t
+          (widget-tooltip-text credentials-button) "Credentials")
+    (dolist (widget (list back forward reload credentials-button))
       (header-bar-pack-start header widget))
     (header-bar-pack-end header forget-cookies)
-    (header-bar-pack-end header credentials-button)
     (header-bar-pack-end header lock-button)
     (box-append container web-view)
     (setf (overlay-child content-overlay) container)