Diff overlapping and Apple icon

Fixes for issue #15  and add issue #16