Bug 886808 - [STK] ICC Settings part cleanup