Settings cleanup
Merge pull request #10695 from frsela/STK/Bug886808

Bug 886808 - [STK] ICC Settings part cleanup, r=kaze