Further design tweaks per #11540, including context menu styling per #11551