Refined a couple icons; fixed some bugs.