TS-61: SubNav, SideNav: clean-up, better icons