Style corrections, icon cleanup