Bring back side-padding and fix an issue with branding detection