Added dynamic svg icons.
More icon cleanup.