diff --git a/dev/App/Abstract.js b/dev/App/Abstract.js
index 9057c99b4..94f86ea5b 100644
--- a/dev/App/Abstract.js
+++ b/dev/App/Abstract.js
@@ -207,14 +207,11 @@ class AbstractApp extends AbstractBoot {
 		ko.components.register('Date', require('Component/Date').default);
 
 		ko.components.register('x-script', require('Component/Script').default);
-		// ko.components.register('svg-icon', require('Component/SvgIcon').default);
 
 		if (Settings.appSettingsGet('materialDesign') && !bMobileDevice) {
 			ko.components.register('Checkbox', require('Component/MaterialDesign/Checkbox').default);
 			ko.components.register('CheckboxSimple', require('Component/Checkbox').default);
 		} else {
-			// ko.components.register('Checkbox', require('Component/Classic/Checkbox').default);
-			// ko.components.register('CheckboxSimple', require('Component/Classic/Checkbox').default);
 			ko.components.register('Checkbox', require('Component/Checkbox').default);
 			ko.components.register('CheckboxSimple', require('Component/Checkbox').default);
 		}
diff --git a/dev/Component/Classic/Checkbox.js b/dev/Component/Classic/Checkbox.js
deleted file mode 100644
index cd2af7ea0..000000000
--- a/dev/Component/Classic/Checkbox.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import { componentExportHelper } from 'Component/Abstract';
-import { AbstractCheckbox } from 'Component/AbstractCheckbox';
-
-class ClassicCheckboxComponent extends AbstractCheckbox {}
-
-export default componentExportHelper(ClassicCheckboxComponent, 'ClassicCheckboxComponent');
diff --git a/dev/Component/SvgIcon.js b/dev/Component/SvgIcon.js
deleted file mode 100644
index df98fb41f..000000000
--- a/dev/Component/SvgIcon.js
+++ /dev/null
@@ -1,22 +0,0 @@
-let cachedUrl = null;
-const getUrl = () => {
-	if (!cachedUrl) {
-		const version = jQuery('#rlAppVersion').attr('content') || '0.0.0';
-		cachedUrl = `rainloop/v/${version}/static/css/svg/icons.svg`;
-	}
-
-	return cachedUrl;
-};
-
-export default {
-	template: '<b></b>',
-	viewModel: {
-		createViewModel: ({ icon = 'null' }, componentInfo) => {
-			if (componentInfo && componentInfo.element) {
-				jQuery(componentInfo.element).replaceWith(
-					`<svg class="svg-icon svg-icon-${icon}"><use xlink:href="${getUrl()}#svg-icon-${icon}"></use></svg>`
-				);
-			}
-		}
-	}
-};
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/ServiceActions.php b/rainloop/v/0.0.0/app/libraries/RainLoop/ServiceActions.php
index 3cc3c517f..af7d6694f 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/ServiceActions.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/ServiceActions.php
@@ -1012,8 +1012,8 @@ class ServiceActions
 		foreach ($aTemplates as $sName => $sFile)
 		{
 			$sName = \preg_replace('/[^a-zA-Z0-9]/', '', $sName);
-			$sHtml .= '<script id="'.$sName.'" type="text/html" data-cfasync="false">'.
-				$this->oActions->ProcessTemplate($sName, \file_get_contents($sFile)).'</script>';
+			$sHtml .= '<template id="'.$sName.'">'.
+				$this->oActions->ProcessTemplate($sName, \file_get_contents($sFile)).'</template>';
 		}
 
 		unset($aTemplates);
diff --git a/rainloop/v/0.0.0/app/templates/Views/Components/CheckboxClassic.html b/rainloop/v/0.0.0/app/templates/Views/Components/CheckboxClassic.html
deleted file mode 100644
index b275485c8..000000000
--- a/rainloop/v/0.0.0/app/templates/Views/Components/CheckboxClassic.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<label class="e-component e-checkbox inline" data-bind="css: { 'disabled': disable() || !enable() }">
-	<input type="checkbox" data-bind="checked: value, disable: disable() || !enable()" style="margin: 0 0 1px 0;" />
-<!-- ko if: labeled -->
-	&nbsp;&nbsp;
-	<span class="sub-label i18n" data-bind="attr: {'data-i18n': label}, css: {'i18n-animation': labelAnimated}"></span>
-<!-- /ko -->
-</label>
\ No newline at end of file