Working on icon rewrite