LPS-46809 - Fix conflicts with flexbox and dockbar padding