General code cleanup of Fluid system. Made Fluid icons and associated functions non-sided.