Merge "Fix loading of toast app icons" into main