Fix dialog header height and "clear search" button

Fix for #4074