diff --git a/bumblebee_status/modules/contrib/bluetooth2.py b/bumblebee_status/modules/contrib/bluetooth2.py
index deb2e0c..a9742ba 100644
--- a/bumblebee_status/modules/contrib/bluetooth2.py
+++ b/bumblebee_status/modules/contrib/bluetooth2.py
@@ -68,9 +68,10 @@ class Module(core.module.Module):
         if self._status in [ "No Adapter Found", "Off" ]:
             state.append("critical")
         elif self._status == "0":
-            state.append("warning")
+            state.append("enabled")
         else:
-            state.append("ON")
+            state.append("connected")
+            state.append("good")
 
         return state
 
diff --git a/themes/icons/awesome-fonts.json b/themes/icons/awesome-fonts.json
index 9992cee..1b6bb2c 100644
--- a/themes/icons/awesome-fonts.json
+++ b/themes/icons/awesome-fonts.json
@@ -257,8 +257,8 @@
     "?": { "prefix": "󰂱" }
   },
   "bluetooth2": {
-    "ON": { "prefix": "󰂱" },
-    "warning": { "prefix": "󰂯" },
+    "connected": { "prefix": "󰂱" },
+    "enabled": { "prefix": "󰂯" },
     "critical": { "prefix": "󰂲" }
   },
   "battery-upower": {