LUN-1120 : Fix padding acording to design specifications