MDL-47576 user_menu: theme_base fixes