diff --git a/app/views/spree/admin/taxonomies/_form.html.erb b/app/views/spree/admin/taxonomies/_form.html.erb
new file mode 100644
index 0000000000..1166e84a2e
--- /dev/null
+++ b/app/views/spree/admin/taxonomies/_form.html.erb
@@ -0,0 +1,7 @@
+<div data-hook="admin_inside_taxonomy_form" class="field align-center">
+  <%= f.field_container :name do %>
+    <%= f.label :name, Spree.t(:name) %> <span class="required">*</span><br />
+    <%= error_message_on :taxonomy, :name, :class => 'fullwidth title' %>
+    <%= text_field :taxonomy, :name %>
+  <% end %>
+</div>
diff --git a/app/views/spree/admin/taxonomies/_js_head.html.erb b/app/views/spree/admin/taxonomies/_js_head.html.erb
new file mode 100755
index 0000000000..0b73bbbfb0
--- /dev/null
+++ b/app/views/spree/admin/taxonomies/_js_head.html.erb
@@ -0,0 +1,13 @@
+<% content_for :head do %>
+  <%= javascript_tag "var taxonomy_id = #{@taxonomy.id};
+    var loading = '#{escape_javascript Spree.t(:loading)}';
+    var new_taxon = '#{escape_javascript Spree.t(:new_taxon)}';
+    var server_error = '#{escape_javascript Spree.t(:server_error)}';
+    var taxonomy_tree_error = '#{escape_javascript Spree.t(:taxonomy_tree_error)}';
+
+    $(document).ready(function(){
+      setup_taxonomy_tree(taxonomy_id);
+    });
+    "
+  %>
+<% end %>
diff --git a/app/views/spree/admin/taxonomies/_list.html.erb b/app/views/spree/admin/taxonomies/_list.html.erb
new file mode 100644
index 0000000000..88a9ddc049
--- /dev/null
+++ b/app/views/spree/admin/taxonomies/_list.html.erb
@@ -0,0 +1,26 @@
+<table class="index sortable" id='listing_taxonomies' data-hook data-sortable-link="<%= update_positions_admin_taxonomies_url %>">
+  <colgroup>
+    <col style="width: 85%">
+    <col style="width: 15%">
+  </colgroup>
+  <thead>
+    <tr data-hook="taxonomies_header">
+      <th><%= Spree.t(:name) %></th>
+      <th class="actions"></th>
+    </tr>
+  </thead>
+  <tbody>
+    <% @taxonomies.each do |taxonomy| %>
+      <tr id="<%= spree_dom_id taxonomy %>" data-hook="taxonomies_row" class="<%= cycle('odd', 'even')%>">
+        <td>
+          <span class="handle"></span>
+          <%= taxonomy.name %>
+        </td>
+        <td class="actions">
+          <%= link_to_edit taxonomy.id, :no_text => true %>
+          <%= link_to_delete taxonomy, :no_text => true %>
+        </td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
diff --git a/app/views/spree/admin/taxonomies/_taxon.html.erb b/app/views/spree/admin/taxonomies/_taxon.html.erb
new file mode 100644
index 0000000000..d5eb39190c
--- /dev/null
+++ b/app/views/spree/admin/taxonomies/_taxon.html.erb
@@ -0,0 +1,12 @@
+<% if taxon.children.length != 0 %>
+  <ul>
+    <% taxon.children.each do |child| %>
+      <li id="<%= child.id %>" rel="taxon">
+        <a style="background-image: url(<%= child.icon.url %>);" href="#"><%= child.name %></a>
+        <% if child.children.length > 0 %>
+          <%= render :partial => 'taxon', :locals => { :taxon => child } %>
+        <% end %>
+      </li>
+    <% end %>
+  </ul>
+<% end %>
diff --git a/app/views/spree/admin/taxonomies/edit.erb b/app/views/spree/admin/taxonomies/edit.erb
new file mode 100755
index 0000000000..e5f2dcc2b1
--- /dev/null
+++ b/app/views/spree/admin/taxonomies/edit.erb
@@ -0,0 +1,42 @@
+<%= render :partial => 'spree/admin/shared/configuration_menu' %>
+
+<%= render :partial => 'js_head' %>
+
+<% content_for :page_title do %>
+  <%= Spree.t(:taxonomy_edit) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <li>
+    <%= button_link_to Spree.t(:back_to_taxonomies_list), spree.admin_taxonomies_path, :icon => 'icon-arrow-left' %>
+  </li>
+<% end %>
+
+<div id="ajax_error" class="errorExplanation" style="display:none;"></div>
+
+<%= form_for [:admin, @taxonomy] do |f| %>
+  <fieldset class="no-border-top">
+    <%= render :partial => 'form', :locals => { :f => f } %>
+    <div>
+      <%= label_tag nil, Spree.t(:tree) %><br />
+      <script>
+        Spree.routes.taxonomy_taxons_path = "<%= spree.api_taxonomy_taxons_path(@taxonomy) %>";
+        Spree.routes.admin_taxonomy_taxons_path = "<%= spree.admin_taxonomy_taxons_path(@taxonomy) %>";
+      </script>
+      <div id="taxonomy_tree" class="tree"></div>
+    </div>
+    <div id="progress" style="display:none;">
+      <%= image_tag 'select2-spinner.gif', :title => 'Spinner', :style => "vertical-align:bottom;" %> <%= Spree.t(:updating) %>..
+    </div>
+
+    <div class="info"><%= Spree.t(:taxonomy_tree_instruction) %></div>
+
+    <br>
+
+    <div class="filter-actions actions">
+      <%= button Spree.t('actions.update'), 'icon-refresh' %>
+      <span class="or"><%= Spree.t(:or) %></span>
+      <%= button_link_to Spree.t('actions.cancel'), admin_taxonomies_path, :icon => 'icon-remove' %>
+    </div>
+  </fieldset>
+<% end %>
diff --git a/app/views/spree/admin/taxonomies/index.html.erb b/app/views/spree/admin/taxonomies/index.html.erb
new file mode 100644
index 0000000000..57c886272d
--- /dev/null
+++ b/app/views/spree/admin/taxonomies/index.html.erb
@@ -0,0 +1,15 @@
+<%= render :partial => 'spree/admin/shared/configuration_menu' %>
+
+<% content_for :page_title do %>
+  <%= Spree.t(:taxonomies) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <li>
+    <%= button_link_to Spree.t(:new_taxonomy), spree.new_admin_taxonomy_url, :icon => 'icon-plus', :id => 'admin_new_taxonomy_link' %></p>
+  </li>
+<% end %>
+
+<div id='list-taxonomies' data-hook>
+  <%= render :partial => 'list' %>
+</div>
diff --git a/app/views/spree/admin/taxonomies/new.html.erb b/app/views/spree/admin/taxonomies/new.html.erb
new file mode 100644
index 0000000000..a46166b973
--- /dev/null
+++ b/app/views/spree/admin/taxonomies/new.html.erb
@@ -0,0 +1,22 @@
+<%= render :partial => 'spree/admin/shared/configuration_menu' %>
+
+<% content_for :page_title do %>
+  <%= Spree.t(:new_taxonomy) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <li>
+    <%= button_link_to Spree.t(:back_to_taxonomies_list), spree.admin_taxonomies_path, :icon => 'icon-arrow-left' %>
+  </li>
+<% end %>
+
+<%= form_for [:admin, @taxonomy] do |f| %>
+
+  <%= render :partial => 'form', :locals => { :f => f } %>
+  <fieldset class="no-border-top">
+    <br>
+    <div class="filter-actions actions" data-hook="buttons">
+      <%= button Spree.t(:create), 'icon-ok' %>
+    </div>
+  </fieldset>
+<% end %>
diff --git a/app/views/spree/admin/taxons/_taxon_table.html.erb b/app/views/spree/admin/taxons/_taxon_table.html.erb
new file mode 100644
index 0000000000..1598bfb470
--- /dev/null
+++ b/app/views/spree/admin/taxons/_taxon_table.html.erb
@@ -0,0 +1,23 @@
+<table class="index">
+  <thead>
+    <tr data-hook="taxons_header">
+      <th><%= Spree.t(:name) %></th>
+      <th><%= Spree.t(:path) %></th>
+      <th></th>
+    </tr>
+  </thead>
+  <tbody>
+    <% taxons.each do |taxon| %>
+      <tr id="<%= spree_dom_id(taxon) %>" data-hook="taxons_row" class="<%= cycle('odd', 'even')%>">
+        <td><%= taxon.name %></td>
+        <td><%= taxon_path taxon %></td>
+        <td class="actions">
+          <%= link_to_delete taxon, :url => remove_admin_product_taxon_url(@product, taxon), :name => icon('delete') + ' ' + Spree.t(:remove) %>
+        </td>
+      </tr>
+    <% end %>
+    <% if taxons.empty? %>
+      <tr data-hook="taxons_none"><td colspan="3"><%= Spree.t(:none) %>.</td></tr>
+    <% end %>
+  </tbody>
+</table>
diff --git a/app/views/spree/admin/taxons/edit.html.erb b/app/views/spree/admin/taxons/edit.html.erb
new file mode 100644
index 0000000000..2335bee1c5
--- /dev/null
+++ b/app/views/spree/admin/taxons/edit.html.erb
@@ -0,0 +1,23 @@
+<%= render :partial => 'spree/admin/shared/configuration_menu' %>
+
+<% content_for :page_title do %>
+  <%= Spree.t(:taxon_edit) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <li>
+    <%= button_link_to Spree.t(:back_to_taxonomies_list), spree.admin_taxonomies_path, :icon => 'icon-arrow-left' %>
+  </li>
+<% end %>
+
+<% # Because otherwise the form would attempt to use to_param of @taxon %>
+<% form_url = admin_taxonomy_taxon_path(@taxonomy.id, @taxon.id) %>
+<%= form_for [:admin, @taxonomy, @taxon], :method => :put, :url => form_url, :html => { :multipart => true } do |f| %>
+  <%= render :partial => 'form', :locals => { :f => f } %>
+
+  <div class="form-buttons" data-hook="buttons">
+    <%= button Spree.t('actions.update'), 'icon-refresh' %>
+    <%= Spree.t(:or) %>
+    <%= button_link_to Spree.t('actions.cancel'), edit_admin_taxonomy_url(@taxonomy), :icon => "icon-remove" %>
+  </div>
+<% end %>
diff --git a/app/views/spree/admin/taxons/search.rabl b/app/views/spree/admin/taxons/search.rabl
new file mode 100644
index 0000000000..ac5f36f979
--- /dev/null
+++ b/app/views/spree/admin/taxons/search.rabl
@@ -0,0 +1,5 @@
+object false
+child(@taxons => :taxons) do
+  attributes :name, :pretty_name, :id
+end
+