Making icons consistent, removing unused icons, cleaning up directory.
Removal of unused methods. Can resolve #179.