Refactored user settings icon buttons
Menu is now part of the icon button, and not a separate widget