Missing icon with Firefox : refs  #556
After resolving conflicts on tests