PLF-5663: Improve decor