current state of Fix for #30

unfortunately it doesn't seem to work properly :( - no code errors
though ....

however good to take a look at the icon and layout