Merge "Fix dialog icon colors" into main