PR for...

Icon fixes. Added proper timeout. Moved some class responsibilities around.