National: added icons. Various fixes here and there.