Added some constructor params and apparently forgot to add icons before