Icons and fix on margin
Merge branch 'master' of github.com:radeinla/Fishbowl