Cog icon adjustment

Border was added for the cog icon so that it can be visible on white

Change-Id: I1bdd73e2e8be571d3d0e3ab49e5d005812e2d090