Merge "Correct overlap of "Show IP" button"