Actually use the icon_name key if it exists
More work on icon editing.