More specialized icon detection :bug: