Merge "move icon so that inline actions in settings can use it" into oc-dr1-dev