am a07c2f5c: Folder UI fixes

* commit 'a07c2f5c80908e8a612f4681314a7068b92baa9f':
  Folder UI fixes