Reapplying icon merge by hand for drone commit.