Updated icons and XMLs

Adjusted the layout of the XMLs.