Fixes margins to match arrow size
Merge fix