removed old code and added icons to the right place