case 4322 - History back buttons margin added.
Merge branch 'case-4342' into development