Some work on having Oxygen icons used by a given plugin in the plugin itself (#399). Also some minor cleaning up [ci skip].
Some minor cleaning up [ci skip].