diff --git a/app/views/alchemy/admin/partials/_main_navigation_entry.html.erb b/app/views/alchemy/admin/partials/_main_navigation_entry.html.erb
index 621fbbbce1..31c5f5bb30 100644
--- a/app/views/alchemy/admin/partials/_main_navigation_entry.html.erb
+++ b/app/views/alchemy/admin/partials/_main_navigation_entry.html.erb
@@ -6,10 +6,9 @@
       <% elsif navigation["inline_image"] %>
         <%== navigation["inline_image"] %>
       <% elsif navigation["icon"] %>
-        <%# Cannot use the render_icon helper, because the navigation["icon"] includes the style %>
-        <svg class="icon">
-          <use href="<%= asset_path("remixicon.symbol.svg") %>#ri-<%= navigation["icon"] %>" />
-        </svg>
+        <%= content_tag :"alchemy-icon", nil,
+          name: navigation["icon"],
+          "icon-style": navigation["icon-style"] %>
       <% else %>
         <%= render_icon :table %>
       <% end %>
diff --git a/config/alchemy/modules.yml b/config/alchemy/modules.yml
index d27cb45a56..1365d79ea3 100644
--- a/config/alchemy/modules.yml
+++ b/config/alchemy/modules.yml
@@ -7,7 +7,7 @@
     name: Home
     controller: "/alchemy/admin/dashboard"
     action: index
-    icon: home-2-line
+    icon: home-2
 
 - name: pages
   engine_name: alchemy
@@ -16,7 +16,7 @@
     name: "modules.pages"
     controller: "/alchemy/admin/pages"
     action: index
-    icon: pages-line
+    icon: pages
     sub_navigation:
       - name: "modules.pages"
         controller: "/alchemy/admin/pages"
@@ -35,7 +35,7 @@
     name: "modules.menus"
     controller: "/alchemy/admin/nodes"
     action: index
-    icon: menu-2-line
+    icon: menu-2
 
 - name: languages
   engine_name: alchemy
@@ -45,6 +45,7 @@
     controller: "/alchemy/admin/languages"
     action: index
     icon: translate-2
+    icon-style: none
 
 - name: sites
   engine_name: alchemy
@@ -53,7 +54,7 @@
     name: "modules.sites"
     controller: "/alchemy/admin/sites"
     action: index
-    icon: global-line
+    icon: global
 
 - name: tags
   engine_name: alchemy
@@ -62,7 +63,7 @@
     name: "modules.tags"
     controller: "/alchemy/admin/tags"
     action: index
-    icon: price-tag-3-line
+    icon: price-tag-3
 
 - name: archive
   engine_name: alchemy
@@ -71,7 +72,7 @@
     controller: "/alchemy/admin/pictures"
     action: index
     name: "modules.library"
-    icon: archive-drawer-line
+    icon: archive-drawer
     sub_navigation:
       - name: "modules.pictures"
         controller: "/alchemy/admin/pictures"
diff --git a/spec/dummy/config/initializers/alchemy.rb b/spec/dummy/config/initializers/alchemy.rb
index 779a36d94b..cc7983474c 100644
--- a/spec/dummy/config/initializers/alchemy.rb
+++ b/spec/dummy/config/initializers/alchemy.rb
@@ -10,7 +10,7 @@
       name: "Events",
       controller: "/admin/events",
       action: "index",
-      icon: "calendar-event-line",
+      icon: "calendar-event",
       sub_navigation: [{
         name: "Events",
         controller: "/admin/events",