Fix icon top and navbar z-index issue