Merge "Updating the icon click feedback" into ub-now-porkchop