Changed icon formatting & nav-bar.