Moved fluid icon registering to ClientProxy

so it only gets registered on Client side.
Also some code cleanup.