Fixed sorting and selection of database icons (issue #118)
Fix some typos
Merge pull request #182 from dennisbolio/master

Implementation of fix for issue #118