icons & fixing bugs