Fix nav-bar icon and button icon