some tweaks for less image size

100% tested ;)