Backport upstream improvements to themes for narrow screens