Revert "Revert "get rid of stuff/take care of custom image widget""

This reverts commit d17684422e24dc17d69770073bcd536d701492bf.
Revert "get rid of stuff/take care of custom image widget"

This reverts commit c74502e0801ed8cc696509c253298b915bbdfbaa.