consolidate currentsong and playingicon
boring changes