Bring back button icons and fix button overlapping issue