Merge pull request #5790 from McGiverGim/fix_logout_icon_material_theme