Reload icons after recreating render context
Merge pull request #979 from dorkster/fixes

Reload icons after recreating render context