Icons and Layout modifications