[DF-3158] More cosmetic fixes with shaders