added icons everywhere