Icon buttons refactor
Merge pull request #3506 from guardian/control-refactor

Icon buttons refactor