Adding icon assets and updating layouts