More titlebar fixes (looks proper on Q)