FIX: Bookmark UI tweaks (PR #9604)

GitHub