Revert "Revert "second fix for image drawing""

This reverts commit 0afc24b8444143ce31faf4e09a16ea0067ea8729.
Revert "Revert "another try""

This reverts commit aa361a270ec9fc765c737077bbe1a96fd5e9de7c.
Revert "Revert "Revert "another try"""

This reverts commit c75f1a79973f4883b45fe73a4b3221f92bef6982.
Revert "Revert "another try""

This reverts commit 32edcc8dd7291bcc07a5ed53e1aea75eb2cae9a0.
Revert "another try"

This reverts commit 9afe0f4d00a79c2f75d80c9c48a4efcd92ae1da5.
Revert "second fix for image drawing"

This reverts commit b0c90fa5b8fca84d92ba0b83a02c5422d27e223c.
Revert "icon fix"

This reverts commit 8b5efdf128990bf5ad836b080af80c0c337049fb.