0.3.0-beta + icons + cleanup