Allow indicators on option widgets

Rendering of the indicator is on the opposite side of the icon.

Change-Id: I4442182f408257022a7d3f7ef8e02045e2b6e355
Merge "Allow indicators on option widgets"