Fixed Part of #19

Better description.
Nice new icons.