BZ-12621 reduced padding and unified height