diff --git a/src/DeviceRendererFactory.js b/src/DeviceRendererFactory.js
index b17c9a7..a53cc4e 100644
--- a/src/DeviceRendererFactory.js
+++ b/src/DeviceRendererFactory.js
@@ -251,8 +251,7 @@ module.exports = class DeviceRendererFactory {
 
         instance.toolbarManager.buttonRegistry.forEach((value, key) => {
             const order = orderMap.get(key);
-            // eslint-disable-next-line no-undefined
-            if (order !== undefined) {
+            if (typeof order !== 'undefined') {
                 orderedButtons.push({key, value, order});
             } else {
                 unorderedButtons.push({key, value});
diff --git a/src/plugins/util/ToolBarManager.js b/src/plugins/util/ToolBarManager.js
index 4b4fdb4..a9ab736 100644
--- a/src/plugins/util/ToolBarManager.js
+++ b/src/plugins/util/ToolBarManager.js
@@ -205,9 +205,9 @@ class ToolbarManager {
         }
 
         if (isActive) {
-            buttonData.button.classList.add('gm-active');
+            buttonData.buttonIcon.classList.add('gm-active');
         } else {
-            buttonData.button.classList.remove('gm-active');
+            buttonData.buttonIcon.classList.remove('gm-active');
         }
     }