Fixed icon and allow rename
Fixed icon and allow rename