Makes properties private that were unnecessarily exposed
Merge branch 'feature/feature/exposed_properties' into develop

* feature/feature/exposed_properties:
  Makes properties private that were unnecessarily exposed
Fixes incorrect references to icon files
Merge branch 'feature/icons' into develop

* feature/icons:
  Fixes incorrect references to icon files