Merge changes I1b2f0726,Iaed2c7e7 into oc-dev

* changes:
  Apply proper theme to SaveUi
  Prevent clipping of shadow when button is pressed