[BB-2438] Add the theme fixes made for BB-2438

[lgp171188]

This PR upstreams the fixes made for the BB-2438 task and also makes the code indentation uniform (2 spaces indent)

Testing instructions:

• Test on the instance corresponding to the BB-2438 task.