Merge "Themes: Set bounds on iconUpon"