We now have more beautiful icons than ever before
Minor refactoring