diff --git a/js/scene.js b/js/scene.js
index f482f06..ebc7f67 100644
--- a/js/scene.js
+++ b/js/scene.js
@@ -184,22 +184,21 @@ Scene.toggleSettingsPanel = function(triggerId) {
  * @param {String} triggerSelector 
  */
 Scene.UI.toggleClipper = function(triggerSelector) {
-    document.querySelector(triggerSelector).addEventListener(
+    const trigger = document.querySelector(triggerSelector);
+    trigger.addEventListener(
         'click',
         () => {
             if (!AppState.clipping.enabled) {
                 AppState.clipping.enabled = true;
-                document.querySelector(triggerSelector).className += ' border border-2 border-info';
+                trigger.className += ' border border-2 border-white';
                 //Scene.activateClipper()
             } else {
                 AppState.clipping.enabled = false;
                 ATON.disableClipPlanes();
                 AppState.root.remove(AppState.clipping.helper);
                 AppState.clipping.helper = null;
-                // Refactor!!
-                document.querySelector(triggerSelector).classList.remove('border-info');
-                document.querySelector(triggerSelector).classList.remove('border-2');
-                document.querySelector(triggerSelector).classList.remove('border');
+                let noBorder = trigger.className.replace(/ border.*$/g, '');
+                trigger.className = noBorder;
             }
         }
     );