fix for #308 and #306 + a small fix for the QM edit button(icons was cropped)