Cleaned up icons folder and added icon naming scheme.
Refactored top-level makefile to reflect increased dependence on qmake.