changed icon + IconDrawer improvements