More UI work to manipulate the icons we are using, make them appear better.