Improved visuals of icons, added Toggle icon