Final fixes on look & feel

[#51283033]