Changed spinner code & some icons