Merge "Use the music note icon for the music files pref." into oc-dev