Fixing List Icon in view switcher - updates #31281