SVY-6918 palette layout fixes