fixed icons & reorganized