Added full support to show the correct icon overlay