added buffer code
removed unused icons
stoppropagation