Issue #3230802 by Rajab Natshah: Fix Border styling with Bootstrap library hard overrides over borders