CON-1446 | few minor code review changes
CON-1446 | scss color variables standarization