Switched to static 16px padding instead of calculated