Comment 13 for bug 341605

 rev 109 should have fixed it, tested it and seems ok. Had to create a third launcher to support themes. Also fixes #347529 and #341607. Would appreciate some further testing though.