Merge "Reduce the size of individual icons in the icon picker" into main