Add icons for sidebar menu and header, and fix some small bugs