issue #42
Merge pull request #77 from eprogramming/master

issue #42
Modified some classes to receive icons.
Modified some classes to receive icons.
Resolving conflicts after merge