Fixed several issues with the new rename/change icon feature
Merge branch 'rewrite' of https://github.com/Mirroar/TopFit