Moved button icon CSS into own form type, closes #225