Merge changes I21801b63,I017f1d55 into main

* changes:
  App pairs: themed icons
  Fix bug where app pair icons were appearing empty