Cleanup and name + iconset