Use new Contentprovider
Fix icons
Merge remote-tracking branch 'origin/NewContentprovider'
Version++