Comment 12 for bug 689486

> I'm now getting the system-file-manager icon from the GNOME theme

that's because your user configuration was made from the old default and there is no migration code for unstable to unstable upgrades, just reset your launcher config or replace the nautilus launcher manually to workaround it