Added App Icons and Error handling