iColors many improvements

Change-Id: I0603bb2cf4b06289a70b493f1898875df7e77563