Merge
Fixed bugs and tweaked lots of icon stuff. Also updated the newest icon package to replace the default icon-file