Merge pull request #5788 from McGiverGim/fix_logout_icon_material_theme