Icon in Layout, fixes #40