diff --git a/src/cljs/airsonic_ui/components/audio_player/views.cljs b/src/cljs/airsonic_ui/components/audio_player/views.cljs
index bb893c7..8a35def 100644
--- a/src/cljs/airsonic_ui/components/audio_player/views.cljs
+++ b/src/cljs/airsonic_ui/components/audio_player/views.cljs
@@ -4,7 +4,7 @@
             [airsonic-ui.routes :as routes]
             [airsonic-ui.helpers :as h]
             [airsonic-ui.views.cover :refer [cover]]
-            [airsonic-ui.views.icon :refer [icon]]))
+            [bulma.icon :refer [icon]]))
 
 ;; currently playing / coming next / audio controls...
 
diff --git a/src/cljs/airsonic_ui/components/collection/views.cljs b/src/cljs/airsonic_ui/components/collection/views.cljs
index ce98c0e..dc33d85 100644
--- a/src/cljs/airsonic_ui/components/collection/views.cljs
+++ b/src/cljs/airsonic_ui/components/collection/views.cljs
@@ -4,8 +4,7 @@
   (:require [airsonic-ui.helpers :refer [format-duration]]
             [airsonic-ui.routes :as routes :refer [url-for]]
             [airsonic-ui.views.cover :refer [cover card]]
-            [airsonic-ui.views.icon :refer [icon]]
-            [airsonic-ui.views.song :as song]))
+            [bulma.icon :refer [icon]]))
 
 (defn collection-info [{:keys [songCount duration year]}]
   (vec (cond-> [:ul.is-smaller.collection-info
diff --git a/src/cljs/airsonic_ui/components/current_queue/views.cljs b/src/cljs/airsonic_ui/components/current_queue/views.cljs
index 3f6e512..34f71f4 100644
--- a/src/cljs/airsonic_ui/components/current_queue/views.cljs
+++ b/src/cljs/airsonic_ui/components/current_queue/views.cljs
@@ -2,8 +2,8 @@
   (:require [re-frame.core :refer [subscribe dispatch]]
             [reagent.core :as r]
             ["react-sortable-hoc" :refer [SortableHandle]]
+            [bulma.icon :refer [icon]]
             [airsonic-ui.helpers :as helpers]
-            [airsonic-ui.views.icon :refer [icon]]
             [airsonic-ui.components.sortable.views :as sortable]
             [airsonic-ui.routes :as routes]))
 
diff --git a/src/cljs/airsonic_ui/components/podcast/views.cljs b/src/cljs/airsonic_ui/components/podcast/views.cljs
index 07ec8d2..bffbe95 100644
--- a/src/cljs/airsonic_ui/components/podcast/views.cljs
+++ b/src/cljs/airsonic_ui/components/podcast/views.cljs
@@ -4,7 +4,7 @@
             [airsonic-ui.routes :as routes :refer [url-for]]
             [airsonic-ui.components.podcast.subs :as subs]
             [airsonic-ui.views.cover :refer [cover card]]
-            [airsonic-ui.views.icon :refer [icon]]
+            [bulma.icon :refer [icon]]
             [airsonic-ui.components.debug.views :refer [debug]]))
 
 ;; TODO: Implement detail pages for podcasts
diff --git a/src/cljs/airsonic_ui/views.cljs b/src/cljs/airsonic_ui/views.cljs
index dbba2ae..0fa72c3 100644
--- a/src/cljs/airsonic_ui/views.cljs
+++ b/src/cljs/airsonic_ui/views.cljs
@@ -11,7 +11,7 @@
             [airsonic-ui.views.notifications :refer [notification-list]]
             [airsonic-ui.views.breadcrumbs :refer [breadcrumbs]]
             [airsonic-ui.views.login :refer [login-form]]
-            [airsonic-ui.views.icon :refer [icon]]
+            [bulma.icon :refer [icon]]
 
             [airsonic-ui.components.about.views :refer [about]]
             [airsonic-ui.components.artist.views :as artist]
diff --git a/src/cljs/airsonic_ui/views/song.cljs b/src/cljs/airsonic_ui/views/song.cljs
index 2133a54..8942ca3 100644
--- a/src/cljs/airsonic_ui/views/song.cljs
+++ b/src/cljs/airsonic_ui/views/song.cljs
@@ -2,7 +2,7 @@
   (:require [re-frame.core :refer [subscribe]]
             [airsonic-ui.helpers :refer [muted-dispatch format-duration]]
             [airsonic-ui.routes :as routes :refer [url-for]]
-            [airsonic-ui.views.icon :refer [icon]]))
+            [bulma.icon :refer [icon]]))
 
 (defn item [songs song idx]
   (let [artist-id (:artistId song)
diff --git a/src/cljs/airsonic_ui/views/icon.cljs b/src/cljs/bulma/icon.cljs
similarity index 50%
rename from src/cljs/airsonic_ui/views/icon.cljs
rename to src/cljs/bulma/icon.cljs
index b7c9ee4..caec714 100644
--- a/src/cljs/airsonic_ui/views/icon.cljs
+++ b/src/cljs/bulma/icon.cljs
@@ -1,4 +1,4 @@
-(ns airsonic-ui.views.icon)
+(ns bulma.icon)
 
-(defn icon [glyph & extra]
+(defn icon [glyph]
   [:span.icon [:span.oi {:data-glyph (name glyph)}]])