Fix close button opacity dropped in manual merge in last commit