Icon: Make icon_create_for_* be more similar