Color and shape fixes to fit style-guide

Signed-off-by: MishkaRogachev <mishkarogachev@gmail.com>