Fixing BMP icon

TODO: Clean up file arrangements