adapt template to work with my way of doing icons

i inline an icon into an element directly <button class="icon icon-someicon" ...>