Fixes #195
Fixes #226
Fixes #207
Removing unused icons and fixing #219
Fixes #204
Fixes #238
Fixes #235
Merge branch 'FixesForRelease' into develop