Modified icons, layouts and classes as required.