RE #344 Initial branch commit for icon picker

Request for merge. This can be used as a SVN merge request alternative. Feedback can be created here, then the merge can be done. This is a example request, since we've already done the review for the Icon Picker update.