diff --git a/modules/backend/controllers/preferences/_field_editor_preview.htm b/modules/backend/controllers/preferences/_field_editor_preview.htm
index 554d311df..f052ea72e 100644
--- a/modules/backend/controllers/preferences/_field_editor_preview.htm
+++ b/modules/backend/controllers/preferences/_field_editor_preview.htm
@@ -17,6 +17,6 @@
       data-show-gutter="<?= $model->editor_show_gutter ? 'true' : 'false' ?>"
       data-language="css"
       data-margin="0"
-      data-vendor-path="<?= URL::to('/modules/backend/formwidgets/codeeditor/assets/vendor/ace') ?>/">
+      data-vendor-path="<?= Url::to('/modules/backend/formwidgets/codeeditor/assets/vendor/ace') ?>/">
       <textarea name="editorpreferences_codeeditor"><?= e($this->makePartial('example_code')) ?></textarea>
 </div>
diff --git a/modules/backend/formwidgets/codeeditor/partials/_codeeditor.htm b/modules/backend/formwidgets/codeeditor/partials/_codeeditor.htm
index 5b703941b..d8609f688 100644
--- a/modules/backend/formwidgets/codeeditor/partials/_codeeditor.htm
+++ b/modules/backend/formwidgets/codeeditor/partials/_codeeditor.htm
@@ -24,7 +24,7 @@
         data-read-only="<?= $readOnly ? 'true' : 'false' ?>"
         data-language="<?= $language ?>"
         data-margin="<?= $margin ?>"
-        data-vendor-path="<?= URL::asset('/modules/backend/formwidgets/codeeditor/assets/vendor/ace') ?>">
+        data-vendor-path="<?= Url::asset('/modules/backend/formwidgets/codeeditor/assets/vendor/ace') ?>">
         <div class="editor-toolbar">
             <ul>
                 <li class="searchbox-enable">
diff --git a/modules/backend/formwidgets/markdowneditor/partials/_markdowneditor.htm b/modules/backend/formwidgets/markdowneditor/partials/_markdowneditor.htm
index 685284f35..715b9320f 100644
--- a/modules/backend/formwidgets/markdowneditor/partials/_markdowneditor.htm
+++ b/modules/backend/formwidgets/markdowneditor/partials/_markdowneditor.htm
@@ -7,7 +7,7 @@
         data-control="markdowneditor"
         data-refresh-handler="<?= $this->getEventHandler('onRefresh') ?>"
         data-view-mode="<?= $mode ?>"
-        data-vendor-path="<?= URL::asset('/modules/backend/formwidgets/codeeditor/assets/vendor/ace') ?>">
+        data-vendor-path="<?= Url::asset('/modules/backend/formwidgets/codeeditor/assets/vendor/ace') ?>">
 
         <div class="control-toolbar editor-toolbar"></div>
 
diff --git a/modules/backend/formwidgets/richeditor/partials/_richeditor.htm b/modules/backend/formwidgets/richeditor/partials/_richeditor.htm
index 9df80113d..d5ecef016 100755
--- a/modules/backend/formwidgets/richeditor/partials/_richeditor.htm
+++ b/modules/backend/formwidgets/richeditor/partials/_richeditor.htm
@@ -19,7 +19,7 @@
         <?php if ($tableStyles): ?>data-table-styles="<?= e(json_encode($tableStyles)) ?>"<?php endif ?>
         <?php if ($tableCellStyles): ?>data-table-cell-styles="<?= e(json_encode($tableCellStyles)) ?>"<?php endif ?>
         data-links-handler="<?= $this->getEventHandler('onLoadPageLinksForm') ?>"
-        data-ace-vendor-path="<?= URL::asset('/modules/backend/formwidgets/codeeditor/assets/vendor/ace') ?>"
+        data-ace-vendor-path="<?= Url::asset('/modules/backend/formwidgets/codeeditor/assets/vendor/ace') ?>"
         placeholder="<?= e(trans($field->placeholder)) ?>"
         data-control="richeditor">
         <textarea name="<?= $name ?>" id="<?= $this->getId('textarea') ?>"><?= e($value) ?></textarea>
diff --git a/modules/backend/layouts/_head.htm b/modules/backend/layouts/_head.htm
index 25ba87ed4..89d67714f 100644
--- a/modules/backend/layouts/_head.htm
+++ b/modules/backend/layouts/_head.htm
@@ -14,13 +14,13 @@
 <?php
     $coreBuild = System\Models\Parameter::get('system::core.build', 1);
 ?>
-<link href="<?= URL::asset('modules/system/assets/ui/storm.css') ?>?v<?= $coreBuild ?>" rel="stylesheet">
+<link href="<?= Url::asset('modules/system/assets/ui/storm.css') ?>?v<?= $coreBuild ?>" rel="stylesheet">
 <link href="<?= Backend::skinAsset('assets/css/october.css') ?>?v<?= $coreBuild ?>" rel="stylesheet">
 <script src="<?= Backend::skinAsset('assets/js/vendor/jquery.min.js') ?>?v<?= $coreBuild ?>"></script>
-<script src="<?= URL::asset('modules/system/assets/js/framework.js') ?>?v<?= $coreBuild ?>"></script>
-<script src="<?= URL::asset('modules/system/assets/ui/storm-min.js') ?>?v<?= $coreBuild ?>"></script>
+<script src="<?= Url::asset('modules/system/assets/js/framework.js') ?>?v<?= $coreBuild ?>"></script>
+<script src="<?= Url::asset('modules/system/assets/ui/storm-min.js') ?>?v<?= $coreBuild ?>"></script>
 <script src="<?= Backend::skinAsset('assets/js/october-min.js') ?>?v<?= $coreBuild ?>"></script>
-<script src="<?= URL::asset('modules/system/assets/js/lang/lang.'.App::getLocale().'.js') ?>?v<?= $coreBuild ?>"></script>
+<script src="<?= Url::asset('modules/system/assets/js/lang/lang.'.App::getLocale().'.js') ?>?v<?= $coreBuild ?>"></script>
 
 <script src="<?= Backend::skinAsset('assets/js/october.flyout.js') ?>"></script>
 <script src="<?= Backend::skinAsset('assets/js/october.tabformexpandcontrols.js') ?>"></script>
diff --git a/modules/backend/layouts/auth.htm b/modules/backend/layouts/auth.htm
index 141268a91..9007c6648 100644
--- a/modules/backend/layouts/auth.htm
+++ b/modules/backend/layouts/auth.htm
@@ -8,13 +8,13 @@
         <meta name="backend-base-path" content="<?= Backend::baseUrl() ?>">
         <meta name="csrf-token" content="<?= csrf_token() ?>">
         <title><?= e(trans('backend::lang.auth.title')) ?></title>
-        <link href="<?= URL::asset('modules/system/assets/ui/storm.css') ?>" rel="stylesheet">
-        <link href="<?= URL::to('modules/backend/assets/css/october.css') ?>" rel="stylesheet">
-        <script src="<?= URL::to('modules/backend/assets/js/vendor/jquery.min.js') ?>"></script>
-        <script src="<?= URL::to('modules/system/assets/js/framework.js') ?>"></script>
-        <script src="<?= URL::asset('modules/system/assets/ui/storm-min.js') ?>"></script>
-        <script src="<?= URL::to('modules/backend/assets/js/october-min.js') ?>"></script>
-        <script src="<?= URL::to('modules/backend/assets/js/auth/auth.js') ?>"></script>
+        <link href="<?= Url::asset('modules/system/assets/ui/storm.css') ?>" rel="stylesheet">
+        <link href="<?= Url::to('modules/backend/assets/css/october.css') ?>" rel="stylesheet">
+        <script src="<?= Url::to('modules/backend/assets/js/vendor/jquery.min.js') ?>"></script>
+        <script src="<?= Url::to('modules/system/assets/js/framework.js') ?>"></script>
+        <script src="<?= Url::asset('modules/system/assets/ui/storm-min.js') ?>"></script>
+        <script src="<?= Url::to('modules/backend/assets/js/october-min.js') ?>"></script>
+        <script src="<?= Url::to('modules/backend/assets/js/auth/auth.js') ?>"></script>
         <?= $this->makeAssets() ?>
         <?= Block::placeholder('head') ?>
         <?= $this->makeLayoutPartial('custom_styles') ?>
diff --git a/modules/backend/views/access_denied.php b/modules/backend/views/access_denied.php
index 07b386ab4..e9d8e55ae 100644
--- a/modules/backend/views/access_denied.php
+++ b/modules/backend/views/access_denied.php
@@ -3,7 +3,7 @@
     <head>
         <meta charset="utf-8">
         <title><?= Lang::get('backend::lang.page.access_denied.label') ?></title>
-        <link href="<?= URL::to('/modules/system/assets/css/styles.css') ?>" rel="stylesheet">
+        <link href="<?= Url::to('/modules/system/assets/css/styles.css') ?>" rel="stylesheet">
     </head>
     <body>
     <div class="container">
diff --git a/modules/backend/views/no_database.php b/modules/backend/views/no_database.php
index f23f84390..142ffbe43 100644
--- a/modules/backend/views/no_database.php
+++ b/modules/backend/views/no_database.php
@@ -3,7 +3,7 @@
     <head>
         <meta charset="utf-8">
         <title><?= Lang::get('backend::lang.page.no_database.label') ?></title>
-        <link href="<?= URL::to('/modules/system/assets/css/styles.css') ?>" rel="stylesheet">
+        <link href="<?= Url::to('/modules/system/assets/css/styles.css') ?>" rel="stylesheet">
     </head>
     <body>
     <div class="container">
diff --git a/modules/cms/classes/Page.php b/modules/cms/classes/Page.php
index c9cb2d0ea..2a4431250 100644
--- a/modules/cms/classes/Page.php
+++ b/modules/cms/classes/Page.php
@@ -181,7 +181,7 @@ class Page extends CmsCompoundObject
      * with the following keys:
      * - url - the menu item URL. Not required for menu item types that return all available records.
      *   The URL should be returned relative to the website root and include the subdirectory, if any.
-     *   Use the URL::to() helper to generate the URLs.
+     *   Use the Url::to() helper to generate the URLs.
      * - isActive - determines whether the menu item is active. Not required for menu item types that
      *   return all available records.
      * - items - an array of arrays with the same keys (url, isActive, items) + the title key.
diff --git a/modules/cms/controllers/index/_page_toolbar.htm b/modules/cms/controllers/index/_page_toolbar.htm
index b7ff59f8a..857d64468 100644
--- a/modules/cms/controllers/index/_page_toolbar.htm
+++ b/modules/cms/controllers/index/_page_toolbar.htm
@@ -12,7 +12,7 @@
         $pageUrl = isset($pageUrl) ? $pageUrl : null;
     ?>
     <a
-        href="<?= URL::to($pageUrl) ?>"
+        href="<?= Url::to($pageUrl) ?>"
         target="_blank"
         class="btn btn-primary oc-icon-crosshairs <?php if (!$templatePath): ?>hide<?php endif ?>"
         data-control="preview-button">
diff --git a/modules/cms/twig/Extension.php b/modules/cms/twig/Extension.php
index 44069d6b0..79725d046 100644
--- a/modules/cms/twig/Extension.php
+++ b/modules/cms/twig/Extension.php
@@ -1,6 +1,5 @@
 <?php namespace Cms\Twig;
 
-use URL;
 use Flash;
 use Block;
 use Event;
diff --git a/modules/cms/widgets/AssetList.php b/modules/cms/widgets/AssetList.php
index c8575188d..6ab0ab38e 100644
--- a/modules/cms/widgets/AssetList.php
+++ b/modules/cms/widgets/AssetList.php
@@ -1,7 +1,7 @@
 <?php namespace Cms\Widgets;
 
 use Str;
-use URL;
+use Url;
 use File;
 use Lang;
 use Input;
@@ -438,7 +438,7 @@ class AssetList extends WidgetBase
 
     protected function getThemeFileUrl($path)
     {
-        return URL::to('themes/'.$this->theme->getDirName().'/assets'.$path);
+        return Url::to('themes/'.$this->theme->getDirName().'/assets'.$path);
     }
 
     public function getCurrentRelativePath()
diff --git a/modules/cms/widgets/mediamanager/partials/_item-sidebar-preview.htm b/modules/cms/widgets/mediamanager/partials/_item-sidebar-preview.htm
index 91e0e0c12..1adaeb7a1 100644
--- a/modules/cms/widgets/mediamanager/partials/_item-sidebar-preview.htm
+++ b/modules/cms/widgets/mediamanager/partials/_item-sidebar-preview.htm
@@ -9,7 +9,7 @@
 </script>
 
 <script type="text/template" data-control="video-template">
-    <video src="{src}" controls poster="<?= URL::to('modules/cms/widgets/mediamanager/assets/images/video-poster.png') ?>">
+    <video src="{src}" controls poster="<?= Url::to('modules/cms/widgets/mediamanager/assets/images/video-poster.png') ?>">
         <div class="panel media-player-fallback">Your browser doesn't support HTML5 video.</div>
     </video>
 </script>
diff --git a/modules/system/partials/_settings_menu_items.htm b/modules/system/partials/_settings_menu_items.htm
index 2ab36a167..c2575e56b 100644
--- a/modules/system/partials/_settings_menu_items.htm
+++ b/modules/system/partials/_settings_menu_items.htm
@@ -18,7 +18,7 @@
             <ul>
                 <?php foreach ($items as $item): ?>
                     <li class="<?= strtolower($item->owner) == $context->owner && strtolower($item->code) == $context->itemCode ? 'active' : false ?>" data-keywords="<?= e(trans($item->keywords)) ?>">
-                        <a href="<?= $item->url ?>">
+                        <a href="<?= $item->url ?>" ontouchstart="">
                             <i class="<?= $item->icon ?>"></i>
                             <span class="header"><?= e(trans($item->label)) ?></span>
                             <span class="description"><?= e(trans($item->description)) ?></span>
diff --git a/modules/system/twig/Extension.php b/modules/system/twig/Extension.php
index 4ed80df37..6d921d037 100644
--- a/modules/system/twig/Extension.php
+++ b/modules/system/twig/Extension.php
@@ -1,6 +1,6 @@
 <?php namespace System\Twig;
 
-use URL;
+use Url;
 use Twig_Extension;
 use Twig_TokenParser;
 use Twig_SimpleFilter;
@@ -90,6 +90,6 @@ class Extension extends Twig_Extension
      */
     public function appFilter($url)
     {
-        return URL::to($url);
+        return Url::to($url);
     }
 }