Merge "Fix UI for resource component buttons" into studio-1.4-dev automerge: e8764a0
automerge: 6e85bde

* commit '6e85bdeea0e49612b086e84b699b52f8e7d72b04':
  Fix UI for resource component buttons