diff --git a/index.html b/index.html
index a68da4f..1bb74c6 100644
--- a/index.html
+++ b/index.html
@@ -64,7 +64,7 @@
                             data-i18n-options='{ "action": "$t(navbar.export-tooltip)", "key": "X" }'
                             title="Export route"
                         >
-                            <span class="fa fa-lg fa-cloud-download" aria-hidden="true"> </span>
+                            <span class="fa fa-lg fa-download" aria-hidden="true"> </span>
                             <span data-i18n="navbar.export">Export</span>
                         </a>
                     </div>
@@ -88,7 +88,7 @@
                             }'
                             title="Load route"
                         >
-                            <span class="fa fa-lg fa-cloud-upload" aria-hidden="true"> </span>
+                            <span class="fa fa-lg fa-upload" aria-hidden="true"> </span>
                             <span data-i18n="navbar.load.title">Load</span>
                         </a>
                         <div class="dropdown-menu" aria-labelledby="navbarLoadDropdown">
@@ -515,14 +515,20 @@
                         <button type="button" class="btn btn-secondary" data-i18n="modal.close" data-dismiss="modal">
                             Close
                         </button>
-                        <button
-                            type="submit"
-                            class="btn btn-primary"
-                            data-i18n="export.title"
-                            form="exportForm"
-                            id="submitExport"
-                        >
-                            Export route
+                        <button type="button" class="btn btn-secondary" id="serverExport">
+                            <span>
+                                <i class="fa fa-cloud-download"></i>
+                                <i
+                                    hidden
+                                    id="export-beeline-warning"
+                                    class="fa fa-exclamation-triangle"
+                                    style="font-size: 10px; position: absolute; margin-top: -3px; margin-left: -1px"
+                                ></i>
+                            </span>
+                        </button>
+                        <button type="submit" class="btn btn-primary" form="exportForm" id="submitExport">
+                            <span class="fa fa-download"></span>
+                            <span data-i18n="export.title">Export route</span>
                         </button>
                     </div>
                 </div>
@@ -919,7 +925,6 @@
                     </div>
                     <div id="preview" hidden data-i18n="map.preview">Preview</div>
                 </div>
-
                 <div id="sidebar" class="leaflet-sidebar collapsed">
                     <div class="leaflet-sidebar-content">
                         <div class="leaflet-sidebar-pane" id="tab_layers_control">
diff --git a/js/Browser.js b/js/Browser.js
index f70a5de..0fd3b53 100644
--- a/js/Browser.js
+++ b/js/Browser.js
@@ -22,6 +22,10 @@
         touchScreen: touchScreen,
         touchScreenDetectable: touchScreenDetectable,
         touch: touch,
-        download: 'Blob' in window && 'createObjectURL' in URL && 'download' in document.createElement('a'),
+        download:
+            'Blob' in window &&
+            'FileReader' in window &&
+            'readAsDataURL' in FileReader.prototype &&
+            'download' in document.createElement('a'),
     };
 })();
diff --git a/js/control/Export.js b/js/control/Export.js
index 12f478e..6dfb496 100644
--- a/js/control/Export.js
+++ b/js/control/Export.js
@@ -27,9 +27,12 @@ BR.Export = L.Class.extend({
 
         this.exportButton.on('click', L.bind(this._generateTrackname, this));
         L.DomUtil.get('submitExport').onclick = L.bind(this._export, this);
+        L.DomUtil.get('serverExport').onclick = L.bind(this._exportServer, this);
 
         L.DomEvent.addListener(document, 'keydown', this._keydownListener, this);
 
+        $('#export').on('show.bs.modal', this._warnStraightLine.bind(this));
+
         this.update([]);
     },
 
@@ -44,6 +47,16 @@ BR.Export = L.Class.extend({
         }
     },
 
+    _warnStraightLine: function () {
+        const hasBeeline = BR.Routing.hasBeeline(this.segments);
+        document.getElementById('export-beeline-warning').hidden = !hasBeeline;
+        let title = 'Download from server (deprecated)';
+        if (hasBeeline) {
+            title = '[Warning: straight lines not supported] ' + title;
+        }
+        document.getElementById('serverExport').title = title;
+    },
+
     _getMimeType: function (format) {
         const mimeTypeMap = {
             gpx: 'application/gpx+xml',
@@ -64,7 +77,11 @@ BR.Export = L.Class.extend({
         link.click();
     },
 
-    _export: function (e) {
+    _exportServer: function (e) {
+        this._export(e, true);
+    },
+
+    _export: function (e, server = false) {
         var exportForm = document.forms['export'];
         var format = exportForm['format'].value || $('#export-format input:radio:checked').val();
         var name = exportForm['trackname'].value;
@@ -73,7 +90,7 @@ BR.Export = L.Class.extend({
 
         e.preventDefault();
 
-        if (BR.Browser.download) {
+        if (!server && BR.Browser.download) {
             const track = this._formatTrack(format, name, includeWaypoints);
             const fileName = (name || 'brouter') + '.' + format;
 
@@ -81,9 +98,10 @@ BR.Export = L.Class.extend({
             const blob = new Blob([track], {
                 type: mimeType + ';charset=utf-8',
             });
-            const objectUrl = URL.createObjectURL(blob);
 
-            this._triggerDownload(objectUrl, fileName);
+            const reader = new FileReader();
+            reader.onload = (e) => this._triggerDownload(reader.result, fileName);
+            reader.readAsDataURL(blob);
         } else {
             var serverUrl = this.router.getUrl(
                 this.latLngs,
diff --git a/js/control/TrackStats.js b/js/control/TrackStats.js
index 4040798..fa51d84 100644
--- a/js/control/TrackStats.js
+++ b/js/control/TrackStats.js
@@ -9,8 +9,7 @@ BR.TrackStats = L.Class.extend({
         $('#stats-container').show();
         $('#stats-info').hide();
 
-        const hasBeeline = segments.filter((line) => line?._routing?.beeline).length > 0;
-        document.getElementById('beeline-warning').hidden = !hasBeeline;
+        document.getElementById('beeline-warning').hidden = !BR.Routing.hasBeeline(segments);
 
         var stats = this.calcStats(polyline, segments),
             length1 = L.Util.formatNum(stats.trackLength / 1000, 1).toLocaleString(),
diff --git a/js/plugin/Routing.js b/js/plugin/Routing.js
index f286cee..01802e7 100644
--- a/js/plugin/Routing.js
+++ b/js/plugin/Routing.js
@@ -5,6 +5,9 @@ L.Routing.Draw.prototype._hideTrailer = function () {
 };
 
 BR.Routing = L.Routing.extend({
+    statics: {
+        hasBeeline: (segments) => segments?.filter((line) => line?._routing?.beeline).length > 0,
+    },
     options: {
         position: 'topright',
         icons: {