What is happening is that shares have by default SMB and AFP enabled.
AFP is using avahi to announce itself via Bonjour, hence the mac monitor icon. SMB is not using avahi, so we get a windows icon.
Solution is simply having avahi announce all active services (HTTP, SMB, AFP, SSH, etc) and macs would see just one icon.