Changed settings and computer icons
Merge branch 'master' of https://github.com/AsheeshR/skin.flux