Readded icon-selection and -addition functionality.