Added Icon Support (still no fav option)
Fixed bugs in current position