Add new icons and fix button