case-3593 - Items styling fixes
Merge remote branch 'origin/case-3593' into development