Prepare improvement on icon selection