diff --git a/src/css/mmgisUI.css b/src/css/mmgisUI.css
index 7b29f14c..d4aa8f5f 100644
--- a/src/css/mmgisUI.css
+++ b/src/css/mmgisUI.css
@@ -845,7 +845,7 @@
     height: 14px;
     background: #fff;
     border-radius: 2px;
-    transition: 0.3s;
+    transition: all 0.3s ease-in-out;
 }
 
 .mmgisToggleSwitch input:checked + label {
@@ -853,12 +853,11 @@
 }
 
 .mmgisToggleSwitch input:checked + label:after {
-    left: calc(100% - 2px);
-    transform: translateX(-100%);
+    left: calc(100% - 16px);
 }
 
 .mmgisToggleSwitch label:active:after {
-    width: 20px;
+    width: 14px;
 }
 
 /*vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv switch slider vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/
diff --git a/src/essence/Tools/Draw/DrawTool.js b/src/essence/Tools/Draw/DrawTool.js
index 3d7ff010..1ccc3b73 100644
--- a/src/essence/Tools/Draw/DrawTool.js
+++ b/src/essence/Tools/Draw/DrawTool.js
@@ -1817,6 +1817,7 @@ function interfaceWithMMGIS() {
         $('.drawToolContextMenuHeaderClose').click()
         L_.unsubscribeTimeChange('DrawTool')
         L_.unsubscribeOnTimeUIToggle('DrawTool')
+        $('#DrawTool_TimeToggle').remove()
         DrawTool.open = false
     }
 }