Updated icon injection

Action icons now wrapped in `<span>` element instead of `<i>`
Action icons now have an `icon` class in addition to their specific "type" class