Forgot to commit UserItem + some Icon tests