Updated Fill
Added Pump
Added icons for several modules
Various cleanup