Replace icons w/ data imgs and cleanup forms