Smashing bugs, fixing icons