Merge changes I66f2c52b,I95f72c9d into oc-dr1-dev

* changes:
  Fixed the accessibility of the reply button
  Avoiding weird icon positions