The reformatting has been done in the last commit. However, i will close this pull request and submit it again. But next time, i will make it easier to maintain.

About the missing icon (s).. Check their repo. I did not delete anything.