Merge changes I04d5e59f,Ia5fa3517

* changes:
  Update overflow button on theme change
  Empty overflow UI