Added icons to wherever seemed to fit