diff --git a/app/views/spree/admin/general_settings/edit.html.erb b/app/views/spree/admin/general_settings/edit.html.erb
deleted file mode 100644
index c4aab56548..0000000000
--- a/app/views/spree/admin/general_settings/edit.html.erb
+++ /dev/null
@@ -1,92 +0,0 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
-
-<% content_for :page_title do %>
-  <%= Spree.t(:general_settings) %>
-<% end %>
-
-<%= form_tag admin_general_settings_path, :method => :put do %>
-  <div id="preferences" data-hook>
-
-    <fieldset class="general no-border-top">
-      <% @preferences_general.each do |key|
-          type = Spree::Config.preference_type(key) %>
-          <div class="field">
-            <%= label_tag(key, Spree.t(key) + ': ') + tag(:br) if type != :boolean %>
-            <%= preference_field_tag(key, Spree::Config[key], :type => type) %>
-            <%= label_tag(key, Spree.t(key)) + tag(:br) if type == :boolean %>
-          </div>
-      <% end %>
-
-
-      <div class="row">
-        <div class="alpha six columns">
-          <fieldset class="security no-border-bottom">
-            <legend align="center"><%= Spree.t(:security_settings)%></legend>
-            <% @preferences_security.each do |key|
-                type = Spree::Config.preference_type(key) %>
-                <div class="field">
-                  <%= label_tag(key, Spree.t(key) + ': ') + tag(:br) if type != :boolean %>
-                  <%= preference_field_tag(key, Spree::Config[key], :type => type) %>
-                  <%= label_tag(key, Spree.t(key)) + tag(:br) if type == :boolean %>
-                </div>
-            <% end %>
-          </fieldset>
-        </div>
-        <div class="omega six columns">
-          <fieldset class="currency no-border-bottom">
-            <legend align="center"><%= Spree.t(:currency_settings)%></legend>
-            <% @preferences_currency.each do |key|
-                type = Spree::Config.preference_type(key) %>
-                <div class="field">
-                  <%= label_tag(key, Spree.t(key) + ': ') + tag(:br) if type != :boolean %>
-                  <%= preference_field_tag(key, Spree::Config[key], :type => type) %>
-                  <%= label_tag(key, Spree.t(key)) + tag(:br) if type == :boolean %>
-                </div>
-            <% end %>
-            <div class="field">
-              <%= label_tag :currency, Spree.t(:choose_currency) %><br>
-              <%= select_tag :currency, currency_options, :class => 'fullwidth' %>
-            </div>
-            <div class="field">
-              <%= label_tag Spree.t(:currency_symbol_position) %><br>
-              <div class="choices">
-                <ul>
-                  <li>
-                    <%= radio_button_tag :currency_symbol_position, "before", Spree::Config[:currency_symbol_position] == "before" %>
-                    <%= label_tag :currency_symbol_position_before, Spree::Money.new(10, :symbol_position => "before") %>
-                  </li>
-                  <li class="white-space-nowrap">
-                    <%= radio_button_tag :currency_symbol_position, "after", Spree::Config[:currency_symbol_position] == "after" %>
-                    <%= label_tag :currency_symbol_position_after, Spree::Money.new(10, :symbol_position => "after") %>
-                  </li>
-                </ul>
-              </div>
-            </div>
-            <div class="field">
-              <%= label_tag :currency_decimal_mark, Spree.t(:currency_decimal_mark) %><br>
-              <%= text_field_tag :currency_decimal_mark, Spree::Config[:currency_decimal_mark], :size => 3 %>
-            </div>
-            <div class="field">
-              <%= label_tag :currency_thousands_separator, Spree.t(:currency_thousands_separator) %><br>
-              <%= text_field_tag :currency_thousands_separator, Spree::Config[:currency_thousands_separator], :size => 3 %>
-            </div>
-          </fieldset>
-        </div>
-      </div>
-
-      <div class="form-buttons filter-actions actions" data-hook="buttons">
-        <%= button Spree.t('actions.update'), 'icon-refresh' %>
-        <span class="or"><%= Spree.t(:or) %></span>
-        <%= link_to_with_icon 'icon-remove', Spree.t('actions.cancel'), edit_admin_general_settings_url, :class => 'button' %>
-      </div>
-
-    </fieldset>
-
-  </div>
-
-
-<% end %>
-
-<script>
-  $('#currency').select2();
-</script>
diff --git a/app/views/spree/admin/general_settings/edit.html.haml b/app/views/spree/admin/general_settings/edit.html.haml
new file mode 100644
index 0000000000..4f8a10f992
--- /dev/null
+++ b/app/views/spree/admin/general_settings/edit.html.haml
@@ -0,0 +1,66 @@
+= render :partial => 'spree/admin/shared/configuration_menu'
+
+- content_for :page_title do
+  = Spree.t(:general_settings)
+
+= form_tag admin_general_settings_path, :method => :put do
+  #preferences{"data-hook" => ""}
+
+    %fieldset.general.no-border-top
+      - @preferences_general.each do |key|
+        - type = Spree::Config.preference_type(key)
+        .field
+          = label_tag(key, Spree.t(key) + ': ') + tag(:br) if type != :boolean
+          = preference_field_tag(key, Spree::Config[key], :type => type)
+          = label_tag(key, Spree.t(key)) + tag(:br) if type == :boolean
+
+      .row
+        .alpha.six.columns
+          %fieldset.security.no-border-bottom
+            %legend{:align => "center"}= Spree.t(:security_settings)
+            - @preferences_security.each do |key|
+              - type = Spree::Config.preference_type(key)
+              .field
+                = label_tag(key, Spree.t(key) + ': ') + tag(:br) if type != :boolean
+                = preference_field_tag(key, Spree::Config[key], :type => type)
+                = label_tag(key, Spree.t(key)) + tag(:br) if type == :boolean
+        .omega.six.columns
+          %fieldset.currency.no-border-bottom
+            %legend{:align => "center"}= Spree.t(:currency_settings)
+            - @preferences_currency.each do |key|
+              - type = Spree::Config.preference_type(key)
+              .field
+                = label_tag(key, Spree.t(key) + ': ') + tag(:br) if type != :boolean
+                = preference_field_tag(key, Spree::Config[key], :type => type)
+                = label_tag(key, Spree.t(key)) + tag(:br) if type == :boolean
+            .field
+              = label_tag :currency, Spree.t(:choose_currency)
+              %br/
+              = select_tag :currency, currency_options, :class => 'fullwidth'
+            .field
+              = label_tag Spree.t(:currency_symbol_position)
+              %br/
+              .choices
+                %ul
+                  %li
+                    = radio_button_tag :currency_symbol_position, "before", Spree::Config[:currency_symbol_position] == "before"
+                    = label_tag :currency_symbol_position_before, Spree::Money.new(10, :symbol_position => "before")
+                  %li.white-space-nowrap
+                    = radio_button_tag :currency_symbol_position, "after", Spree::Config[:currency_symbol_position] == "after"
+                    = label_tag :currency_symbol_position_after, Spree::Money.new(10, :symbol_position => "after")
+            .field
+              = label_tag :currency_decimal_mark, Spree.t(:currency_decimal_mark)
+              %br/
+              = text_field_tag :currency_decimal_mark, Spree::Config[:currency_decimal_mark], :size => 3
+            .field
+              = label_tag :currency_thousands_separator, Spree.t(:currency_thousands_separator)
+              %br/
+              = text_field_tag :currency_thousands_separator, Spree::Config[:currency_thousands_separator], :size => 3
+
+      .form-buttons.filter-actions.actions{"data-hook" => "buttons"}
+        = button Spree.t('actions.update'), 'icon-refresh'
+        %span.or= Spree.t(:or)
+        = link_to_with_icon 'icon-remove', Spree.t('actions.cancel'), edit_admin_general_settings_url, :class => 'button'
+
+:javascript
+  $('#currency').select2();