Merge pull request #89 from mshamash/master

Bug fixes
Added new icons.
Merge pull request #38 from stephandev/master

Added icons for triangle and octagon