Some places were passing 5 params, meaning the strictness param was lost. This fixes those usages.
By combining the title attribute search with the "icon" class instead of old "img" or new "i" elements we achieve that without too much complication.