Merge "Remove code for centering an icon in the SB"