diff --git a/lib/font_awesome/sass/rails/helpers.rb b/lib/font_awesome/sass/rails/helpers.rb
index 125fe827..61d7f882 100644
--- a/lib/font_awesome/sass/rails/helpers.rb
+++ b/lib/font_awesome/sass/rails/helpers.rb
@@ -5,8 +5,8 @@ module ViewHelpers
         def icon(style, name, text = nil, html_options = {})
           text, html_options = nil, text if text.is_a?(Hash)
 
-          content_class = "#{style} fa-#{name}"
-          content_class << " #{html_options[:class]}" if html_options.key?(:class)
+          content_class = [style, "fa-#{name}"]
+          content_class << html_options[:class] if html_options.key?(:class)
           html_options[:class] = content_class
 
           html = content_tag(:i, nil, html_options)