added icon files and changes to status logic,edit
test
Merge remote branch 'taxi_project/master'