Refactor! (Now with poor quality icons)