Test
Merge remote-tracking branch 'origin/master'
Fix Tab Bar icons with proper resolution
Provide minor UI tweaks