Timer and Listing margin to 15px (osx)
Merge branch 'master' into builds
7.385