Various fixes for display issues in popups with different themes.