I implemented the margin requested on #5827 --------- Co-authored-by: Thomas Trompette <thomas.trompette@sfr.fr>