More icons & minor changes