Adopt woho fix, include optimisation patch.

Adopt the code from woho regarding the icon color.  See more details
here:
    https://github.com/ashinkarov/i3-extras/issues/1

Add the patch to increase optimisation level, that should be default
setting when you compile a release code (I think).
Whitespace cleanup.