refactor home and navbar icons; add border for home icons, see #49