Fix execution of single tests when using a custom runner
Revert "Remove unused class and icons"

This reverts commit f64541a37fe3c8fd8ba92a39ede06c352861641b.