Attempt to add icon and further fix issues with theme