[Libreoffice-commits] online.git: Branch 'feature/jsdialogs' - 20 commits - common/Authorization.cpp common/Protocol.hpp cypress_test/integration_tests loleaflet/admin loleaflet/css loleaflet/images loleaflet/src wsd/AdminModel.hpp wsd/DocumentBroker.cpp wsd/Storage.cpp

[Szymon KÅ‚os (via logerrit)]

Rebased ref, commits from common ancestor:
commit 0123f15bd3ead67fc7a88846ac38e16e2acc63bf
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Tue Mar 31 12:14:40 2020 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Tue May 5 21:07:51 2020 +0200

    jsdialog: close mobilewizard before all dialogs
    
    Mobilewizard has reference to the last window so in
    case of message box it will be closed first.
    This prevent us from closing parent window before child
    as we close all windows in closePopups.
    
    Change-Id: I9887b56374f2fc7e1cabb46d97e2c8ee03511596

diff --git a/loleaflet/src/map/handler/Map.TouchGesture.js b/loleaflet/src/map/handler/Map.TouchGesture.js
index cff7eeffe..2a17360e2 100644
--- a/loleaflet/src/map/handler/Map.TouchGesture.js
+++ b/loleaflet/src/map/handler/Map.TouchGesture.js
@@ -309,7 +309,6 @@ L.Map.TouchGesture = L.Handler.extend({
 			return;
 		}
 
-		this._map.fire('closepopups');
 		this._map.fire('closemobilewizard');
 
 		// The validity dropdown marker icon (exists only in calc) needs to be notified of tap events if it is the target.
@@ -320,6 +319,7 @@ L.Map.TouchGesture = L.Handler.extend({
 			return;
 		}
 
+		this._map.fire('closepopups');
 		this._map.fire('editorgotfocus');
 
 		var docLayer = this._map._docLayer;
commit c04ac32c2fa8649b0526dee1b022c1fdab4a7fa5
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Wed Mar 11 13:17:07 2020 +0100
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Tue May 5 21:07:33 2020 +0200

    jsdialog: fix inifinite regenetate JSON loop
    
    Change-Id: I52667e115a0cf70f09f570dc6ea1ec0bcac49460

diff --git a/loleaflet/src/control/Control.MobileWizard.js b/loleaflet/src/control/Control.MobileWizard.js
index 3a7715c00..1507e9b79 100644
--- a/loleaflet/src/control/Control.MobileWizard.js
+++ b/loleaflet/src/control/Control.MobileWizard.js
@@ -269,7 +269,8 @@ L.Control.MobileWizard = L.Control.extend({
 	},
 
 	_goToPath: function(path) {
-		if (this._tabs && path && path.length)
+		// when dialog has tabs, tab selection triggers the callback, causes infinite regenetate loop
+		if (this._tabs && path && path.length && !this.map.dialog.hasDialogInMobilePanelOpened())
 			this._selectTab(path[0]);
 
 		var _path = [];
commit e0953754666b22fb4ec35d7523dee2357aaddfb2
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Thu Mar 5 14:40:54 2020 +0100
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Tue May 5 21:07:33 2020 +0200

    jsdialog: send control type with event
    
    Change-Id: I6cd6f1d26b5c78715f9e0adc992a1869e0f19a97

diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js b/loleaflet/src/control/Control.JSDialogBuilder.js
index 27e58b2a0..8e34d9b1a 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -208,8 +208,11 @@ L.Control.JSDialogBuilder = L.Control.extend({
 			data = typeof data === 'string' ? data.replace('"', '\\"') : data;
 			var windowId = window.mobileDialogId !== undefined ? window.mobileDialogId :
 								(window.sidebarId !== undefined ? window.sidebarId : -1);
-			var message = 'dialogevent ' + windowId +
-			    ' {\"id\":\"' + object.id + '\", \"cmd\": \"' + eventType + '\", \"data\":\"' + data + '\"}';
+			var message = 'dialogevent ' + windowId
+			    + ' {\"id\":\"' + object.id
+				+ '\", \"cmd\": \"' + eventType
+				+ '\", \"data\": \"' + data
+				+ '\", \"type\": \"' + objectType + '\"}';
 			builder.map._socket.sendMessage(message);
 		}
 	},
commit 312a68cdc145f25410b4b74211b27232322f4033
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Fri Feb 21 09:54:33 2020 +0100
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Tue May 5 21:07:33 2020 +0200

    jsdialog: handle events for dialogs in mobilewizard
    
    - remember window id
    - close mobile wizard on dialog close
    - close dialog on mobile wizard close
    - don't show dialogs on mobile devices
    
    Change-Id: I585c5b92192655684eedd62d88817a92fc1fc0a8

diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js b/loleaflet/src/control/Control.JSDialogBuilder.js
index ce201afdd..27e58b2a0 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -206,7 +206,9 @@ L.Control.JSDialogBuilder = L.Control.extend({
 			builder.map.sendUnoCommand(encodedCommand);
 		} else if (object) {
 			data = typeof data === 'string' ? data.replace('"', '\\"') : data;
-			var message = 'dialogevent ' + (window.sidebarId !== undefined ? window.sidebarId : -1) +
+			var windowId = window.mobileDialogId !== undefined ? window.mobileDialogId :
+								(window.sidebarId !== undefined ? window.sidebarId : -1);
+			var message = 'dialogevent ' + windowId +
 			    ' {\"id\":\"' + object.id + '\", \"cmd\": \"' + eventType + '\", \"data\":\"' + data + '\"}';
 			builder.map._socket.sendMessage(message);
 		}
diff --git a/loleaflet/src/control/Control.LokDialog.js b/loleaflet/src/control/Control.LokDialog.js
index 6841c5087..259e4742a 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -59,6 +59,10 @@ L.Control.LokDialog = L.Control.extend({
 
 	dialogIdPrefix: 'lokdialog-',
 
+	hasDialogInMobilePanelOpened: function() {
+		return window.mobileDialogId !== undefined;
+	},
+
 	onPan: function (ev) {
 		if (!draggedObject)
 			return;
@@ -289,7 +293,7 @@ L.Control.LokDialog = L.Control.extend({
 		}
 
 		if (e.action === 'created') {
-			if (e.winType === 'dialog') {
+			if (e.winType === 'dialog' && !window.mode.isMobile()) {
 				// When left/top are invalid, the dialog shows in the center.
 				this._launchDialog(e.id, left, top, width, height, e.title);
 			} else if (e.winType === 'calc-input-win') {
@@ -335,7 +339,17 @@ L.Control.LokDialog = L.Control.extend({
 		}
 
 		// All other callbacks doen't make sense without an active dialog.
-		if (!(this._isOpen(e.id) || this._getParentId(e.id)))
+		if (!(this._isOpen(e.id) || this._getParentId(e.id))) {
+			if (e.action == 'close' && window.mobileDialogId == e.id) {
+				window.mobileDialogId = undefined;
+				this._map.fire('closemobilewizard');
+			}
+
+			return;
+		}
+
+		// We don't want dialogs and sidebar on smartphones, only calc input window is allowed
+		if (window.mode.isMobile() && e.winType !== 'calc-input-win' && !this.isCalcInputBar(e.id))
 			return;
 
 		if (e.action === 'invalidate') {
@@ -1399,6 +1413,9 @@ L.Control.LokDialog = L.Control.extend({
 				this._onDialogClose(dialogId, true);
 			}
 		}
+		if (this.hasDialogInMobilePanelOpened()) {
+			this._onDialogClose(window.mobileDialogId, true);
+		}
 	},
 
 	onCloseCurrentPopUp: function() {
diff --git a/loleaflet/src/control/Control.MobileWizard.js b/loleaflet/src/control/Control.MobileWizard.js
index fa04d7b77..3a7715c00 100644
--- a/loleaflet/src/control/Control.MobileWizard.js
+++ b/loleaflet/src/control/Control.MobileWizard.js
@@ -93,6 +93,12 @@ L.Control.MobileWizard = L.Control.extend({
 	},
 
 	_hideWizard: function() {
+		// dialog
+		if (this.map.dialog.hasDialogInMobilePanelOpened()) {
+			this.map.dialog._onDialogClose(window.mobileDialogId, true);
+			window.mobileDialogId = undefined;
+		}
+
 		$('#mobile-wizard').hide();
 		$('#mobile-wizard-content').empty();
 		if (this.map._permission === 'edit') {
@@ -316,6 +322,11 @@ L.Control.MobileWizard = L.Control.extend({
 				return;
 			}
 
+			if (data.id && !isNaN(data.id) && !isSidebar) {
+				// id is a number - remember window id for interaction
+				window.mobileDialogId = data.id;
+			}
+
 			// Sometimes it happens that we get the same sidebar
 			// structure twice. This makes hard to test mobile wizard.
 			if (isSidebar && L.Browser.cypressTest) {
commit 61a81af326405730bf2f0deb4380fc31423af194
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Thu Mar 26 14:58:14 2020 +0100
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Tue May 5 21:06:15 2020 +0200

    jsdialog: customize spell checking error label
    
    Change-Id: Ieb977363bda76af51a4e5d41052fc378995e24ea
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93515
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index aa462ddb7..f4ad379fe 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -848,6 +848,12 @@ input[type=checkbox][disabled] {
 	font-size: 15pt;
 }
 
+#mobile-spell-error {
+	border: none;
+	font-size: 15pt;
+	color: red !important;
+}
+
 #searchlabel {
 	border: none;
 	font-size: 11pt;
commit f4fe439043e9ad4d7be20afc43dd36b76ccad2c5
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Tue Mar 31 12:17:20 2020 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Tue May 5 21:04:22 2020 +0200

    jsdialog: show ok button in message boxes
    
    Change-Id: I4f57b6cc0275875150a6cd1c944e2d12394a59a4
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93516
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js b/loleaflet/src/control/Control.JSDialogBuilder.js
index 5084bf66a..ce201afdd 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -128,6 +128,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
 		this._controlHandlers['edit'] = this._editControl;
 		this._controlHandlers['multilineedit'] = this._multiLineEditControl;
 		this._controlHandlers['pushbutton'] = this._pushbuttonControl;
+		this._controlHandlers['okbutton'] = this._pushbuttonControl;
 		this._controlHandlers['combobox'] = this._comboboxControl;
 		this._controlHandlers['comboboxentry'] = this._comboboxEntry;
 		this._controlHandlers['listbox'] = this._listboxControl;
commit bda6903dea951288091338d01ff96b2c6ea106bb
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Wed Mar 25 12:17:06 2020 +0100
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Tue May 5 20:35:06 2020 +0200

    jsdialog: handle drawingarea
    
    Change-Id: Ia3bc01e76c71edc7ac59e3157e7de5700397c21d
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93466
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index 8b52fb3bd..aa462ddb7 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -856,3 +856,8 @@ input[type=checkbox][disabled] {
 #criteria.ui-tab, #inputhelp.ui-tab {
 	width: 30% !important;
 }
+
+.mobile-wizard.ui-drawing-area {
+	margin: 10px 5% 10px 5% !important;
+	width: 90%;
+}
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js b/loleaflet/src/control/Control.JSDialogBuilder.js
index 4263e6ce1..5084bf66a 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -152,6 +152,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
 		this._controlHandlers['colorlistbox'] = this._colorControl;
 		this._controlHandlers['borderstyle'] = this._borderControl;
 		this._controlHandlers['treelistbox'] = this._listboxControl;
+		this._controlHandlers['drawingarea'] = this._drawingAreaControl;
 
 		this._controlHandlers['mainmenu'] = this._containerHandler;
 		this._controlHandlers['submenu'] = this._subMenuHandler;
@@ -1478,6 +1479,15 @@ L.Control.JSDialogBuilder = L.Control.extend({
 		return false;
 	},
 
+	_drawingAreaControl: function(parentContainer, data, builder) {
+		if (data.image) {
+			var image = L.DomUtil.create('img', builder.options.cssClass + ' ui-drawing-area', parentContainer);
+			image.src = data.image.replace('\\', '');
+			image.id = data.id;
+		}
+		return false;
+	},
+
 	_htmlControl: function(parentContainer, data, builder) {
 		var container = L.DomUtil.create('div', builder.options.cssClass, parentContainer);
 		container.appendChild(data.content);
commit 361edbbf6dbcd40e60a32a16973d3aef472b0470
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Tue Mar 24 14:53:35 2020 +0100
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Tue May 5 20:34:36 2020 +0200

    jsdialog: handle treelistbox
    
    Change-Id: I89da1b60591f8a83413b0d25ec75812120ab5f11
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93465
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js b/loleaflet/src/control/Control.JSDialogBuilder.js
index d96b52d03..4263e6ce1 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -151,6 +151,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
 		this._controlHandlers['divcontainer'] = this._divContainerHandler;
 		this._controlHandlers['colorlistbox'] = this._colorControl;
 		this._controlHandlers['borderstyle'] = this._borderControl;
+		this._controlHandlers['treelistbox'] = this._listboxControl;
 
 		this._controlHandlers['mainmenu'] = this._containerHandler;
 		this._controlHandlers['submenu'] = this._subMenuHandler;
@@ -1373,14 +1374,17 @@ L.Control.JSDialogBuilder = L.Control.extend({
 
 		var title = data.text;
 		var valueNode = null;
+		var selectedEntryIsString = false;
 		if (data.selectedEntries) {
+			selectedEntryIsString = isNaN(parseInt(data.selectedEntries[0]));
 			if (title && title.length) {
 				var value = data.entries[data.selectedEntries[0]];
 				valueNode = L.DomUtil.create('div', '', null);
 				valueNode.innerHTML = value;
-			} else {
+			} else if (selectedEntryIsString)
+				title = builder._cleanText(data.selectedEntries[0]);
+			else
 				title = data.entries[data.selectedEntries[0]];
-			}
 		}
 		title = builder._cleanText(title);
 		data.text = title;
@@ -1389,6 +1393,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
 		for (var index in data.entries) {
 			var style = 'ui-combobox-text';
 			if ((data.selectedEntries && index == data.selectedEntries[0])
+				|| (data.selectedEntries && selectedEntryIsString && data.entries[index] === data.selectedEntries[0])
 				|| data.entries[index] == title) {
 				style += ' selected';
 			}
commit 79cd68404794845dc48027217aeded72374ecefe
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Wed Mar 18 14:47:36 2020 +0100
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Tue May 5 20:32:17 2020 +0200

    jsdialog: full width combobox
    
    Change-Id: I8df77720b975bcd34822d04cedbe4bd1c360e193
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93464
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index 4bb3c469c..8b52fb3bd 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -832,6 +832,11 @@ input[type=checkbox][disabled] {
 	width: 100%;
 }
 
+.combobox {
+	width: -moz-available !important;
+	width: -webkit-fill-available !important;
+}
+
 .ui-edit.mobile-wizard, textarea {
 	width: -moz-available;
 	width: -webkit-fill-available;
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js b/loleaflet/src/control/Control.JSDialogBuilder.js
index e10211306..d96b52d03 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -1298,7 +1298,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
 		if (data && data.id)
 			sectionTitle.id = data.id;
 
-		var leftDiv = L.DomUtil.create('div', 'ui-header-left', sectionTitle);
+		var leftDiv = L.DomUtil.create('div', 'ui-header-left combobox', sectionTitle);
 
 		var editCallback = function(value) {
 			builder.callback('combobox', 'change', data, value, builder);
commit 168b3ed04682c6767d4e85563239f58e2c1e908b
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Tue May 5 15:25:25 2020 +0200
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Tue May 5 17:08:30 2020 +0200

    nocaps: Fix WOPI load.
    
    Change-Id: I538be45897902e9d8ff63d85b1e486767dacbb2d
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93484
    Tested-by: Jan Holesovsky <kendy at collabora.com>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/wsd/Storage.cpp b/wsd/Storage.cpp
index f010894c4..adaaa79fe 100644
--- a/wsd/Storage.cpp
+++ b/wsd/Storage.cpp
@@ -907,7 +907,10 @@ std::string WopiStorage::loadStorageFileToLocal(const Authorization& auth,
             setLoaded(true);
 
             // Now return the jailed path.
-            return Poco::Path(getJailPath(), getFileInfo().getFilename()).toString();
+            if (LOOLWSD::NoCapsForKit)
+                return getRootFilePath();
+            else
+                return Poco::Path(getJailPath(), getFileInfo().getFilename()).toString();
         }
     }
     catch (const Poco::Exception& pexc)
commit d03aa27ea7d94c99e8492617449907df21958083
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Tue May 5 15:43:11 2020 +0200
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Tue May 5 16:13:52 2020 +0200

    cypress: formula bar editing is now broken on mobile.
    
    Change-Id: I6fe1ec312ef9f25dd4b6a92edb9151ccc6b12d2a
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93487
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>

diff --git a/cypress_test/integration_tests/mobile/calc/focus_spec.js b/cypress_test/integration_tests/mobile/calc/focus_spec.js
index 8ed94512c..8ac625d73 100644
--- a/cypress_test/integration_tests/mobile/calc/focus_spec.js
+++ b/cypress_test/integration_tests/mobile/calc/focus_spec.js
@@ -76,7 +76,8 @@ describe('Calc focus tests', function() {
 			.should('be.eq', 'clipboard');
 	});
 
-	it('Formula-bar focus', function() {
+	// Regression here: can't edit formula bar
+	it.skip('Formula-bar focus', function() {
 		// Click on edit button
 		mobileHelper.enableEditingMobile();
 
commit 25501927dc81811a6414b7df3c79412328223fe2
Author:     Marco Cecchetti <marco.cecchetti at collabora.com>
AuthorDate: Sat May 2 15:13:58 2020 +0200
Commit:     Marco Cecchetti <marco.cecchetti at collabora.com>
CommitDate: Tue May 5 11:53:49 2020 +0200

    leaflet: calc: handle calc formula bar offset position
    
    Change-Id: I5c48c51aa49247a4452580e9619a0f2db8d740ec
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93404
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Marco Cecchetti <marco.cecchetti at collabora.com>

diff --git a/loleaflet/src/control/Control.LokDialog.js b/loleaflet/src/control/Control.LokDialog.js
index 9c92895b2..6841c5087 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -294,7 +294,7 @@ L.Control.LokDialog = L.Control.extend({
 				this._launchDialog(e.id, left, top, width, height, e.title);
 			} else if (e.winType === 'calc-input-win') {
 				lines = parseInt(e.lines);
-				this._launchCalcInputBar(e.id, width, height, lines);
+				this._launchCalcInputBar(e.id, left, top, width, height, lines);
 			} else if (e.winType === 'deck') {
 				if (!window.mode.isMobile()) {
 					this._launchSidebar(e.id, width, height);
@@ -368,7 +368,9 @@ L.Control.LokDialog = L.Control.extend({
 				this._launchSidebar(e.id, width, height);
 			} else if (e.winType === 'calc-input-win' || this.isCalcInputBar(e.id)) {
 				lines = parseInt(e.lines);
-				this._launchCalcInputBar(e.id, width, height, lines);
+				left = left | this._calcInputBar.left;
+				top = top | this._calcInputBar.top;
+				this._launchCalcInputBar(e.id, left, top, width, height, lines);
 			}
 			else {
 				$('#' + strId).remove();
@@ -804,21 +806,22 @@ L.Control.LokDialog = L.Control.extend({
 		this._sendPaintWindow(id, this._createRectStr(id));
 	},
 
-	_launchCalcInputBar: function(id, width, height, textLines) {
-		console.log('_launchCalcInputBar: start: id: ' + id + ', width: ' + width + ', height: ' + height + ', textLines: ' + textLines);
+	_launchCalcInputBar: function(id, left, top, width, height, textLines) {
+		console.log('_launchCalcInputBar: start: id: ' + id + ', left: ' + left + ', top: ' + top
+			+ ', width: ' + width + ', height: ' + height + ', textLines: ' + textLines);
 		if (!this._calcInputBar || this._calcInputBar.id !== id) {
 			if (this._calcInputBar)
 				$('#' + this._calcInputBar.strId).remove();
-			this._createCalcInputbar(id, width, height, textLines);
+			this._createCalcInputbar(id, left, top, width, height, textLines);
 		} else {
 			// Update in-place. We will resize during rendering.
-			this._adjustCalcInputBar(id, width, height, textLines);
+			this._adjustCalcInputBar(id, left, top, width, height, textLines);
 		}
 
 		console.log('_launchCalcInputBar: end');
 	},
 
-	_adjustCalcInputBar: function(id, width, height, textLines) {
+	_adjustCalcInputBar: function(id, left, top, width, height, textLines) {
 		if (this._calcInputBar) {
 			var oldHeight = this._calcInputBar.height;
 			var delta = height - oldHeight;
@@ -827,17 +830,17 @@ L.Control.LokDialog = L.Control.extend({
 
 				// Recreate the input-bar.
 				$('#' + this._calcInputBar.strId).remove();
-				this._createCalcInputbar(id, width, height, textLines);
+				this._createCalcInputbar(id, left, top, width, height, textLines);
 
 				// Resize the container.
 				var documentContainer = L.DomUtil.get('document-container');
 				if (documentContainer) {
-					var top = documentContainer.offsetTop;
+					var offsetTop = documentContainer.offsetTop;
 					var noTopProp = true;
 					var props = documentContainer.style.cssText.split(';');
 					for (var i = 0; i < props.length; ++i) {
 						if (props[i].startsWith('top')) {
-							props[i] = 'top: ' + (top + delta).toString() + 'px !important';
+							props[i] = 'top: ' + (offsetTop + delta).toString() + 'px !important';
 							documentContainer.setAttribute('style', props.join(';'));
 							noTopProp = false;
 							break;
@@ -845,19 +848,19 @@ L.Control.LokDialog = L.Control.extend({
 					}
 					if (noTopProp) {
 						var styleAttr = documentContainer.style.cssText;
-						styleAttr += '; top: ' + (top + delta).toString() + 'px !important';
+						styleAttr += '; top: ' + (offsetTop + delta).toString() + 'px !important';
 						documentContainer.setAttribute('style', styleAttr);
 					}
 				}
 
 				var spreadsheetRowColumnFrame = L.DomUtil.get('spreadsheet-row-column-frame');
 				if (spreadsheetRowColumnFrame) {
-					top = spreadsheetRowColumnFrame.offsetTop;
+					offsetTop = spreadsheetRowColumnFrame.offsetTop;
 					noTopProp = true;
 					props = spreadsheetRowColumnFrame.style.cssText.split(';');
 					for (i = 0; i < props.length; ++i) {
 						if (props[i].startsWith('top')) {
-							props[i] = 'top: ' + (top + delta).toString() + 'px !important';
+							props[i] = 'top: ' + (offsetTop + delta).toString() + 'px !important';
 							spreadsheetRowColumnFrame.setAttribute('style', props.join(';'));
 							noTopProp = false;
 							break;
@@ -865,7 +868,7 @@ L.Control.LokDialog = L.Control.extend({
 					}
 					if (noTopProp) {
 						styleAttr = spreadsheetRowColumnFrame.style.cssText;
-						styleAttr += '; top: ' + (top + delta).toString() + 'px !important';
+						styleAttr += '; top: ' + (offsetTop + delta).toString() + 'px !important';
 						spreadsheetRowColumnFrame.setAttribute('style', styleAttr);
 					}
 				}
@@ -891,7 +894,7 @@ L.Control.LokDialog = L.Control.extend({
 		}
 	},
 
-	_createCalcInputbar: function(id, width, height, textLines) {
+	_createCalcInputbar: function(id, left, top, width, height, textLines) {
 		console.log('_createCalcInputBar: start: id: ' + id + ', width: ' + width + ', height: ' + height + ', textLines: ' + textLines);
 		var strId = this._toStrId(id);
 
@@ -949,8 +952,8 @@ L.Control.LokDialog = L.Control.extend({
 			strId: strId,
 			isSidebar: false,
 			isCalcInputBar: true,
-			left: 0,
-			top: 0,
+			left: left,
+			top: top,
 			width: width,
 			height: height,
 			textLines: textLines,
@@ -1111,7 +1114,12 @@ L.Control.LokDialog = L.Control.extend({
 				this._onSelectionHandleDrag(e);
 				return;
 			}
+
 			var pos = this._isSelectionHandle(e.target) ? L.DomEvent.getMousePosition(e, canvas) : {x: e.offsetX, y: e.offsetY};
+			if (this.isCalcInputBar(id)) {
+				pos.x += this._calcInputBar.left;
+				pos.y += this._calcInputBar.top;
+			}
 			this._postWindowMouseEvent('move', id, pos.x, pos.y, 1, 0, 0);
 		}, this);
 
@@ -1150,6 +1158,10 @@ L.Control.LokDialog = L.Control.extend({
 			// 'mousedown' -> 'buttondown'
 			var lokEventType = e.type.replace('mouse', 'button');
 			var pos = this._isSelectionHandle(e.target) ? L.DomEvent.getMousePosition(e, canvas) : {x: e.offsetX, y: e.offsetY};
+			if (this.isCalcInputBar(id)) {
+				pos.x += this._calcInputBar.left;
+				pos.y += this._calcInputBar.top;
+			}
 			this._postWindowMouseEvent(lokEventType, id, pos.x, pos.y, 1, buttons, modifier);
 			this._map.setWinId(id);
 			//dlgInput.focus();
commit d85426df88231b2dba012a645cb1ec7cee3efffc
Author:     Aron Budea <aron.budea at collabora.com>
AuthorDate: Tue May 5 00:48:33 2020 +0200
Commit:     Aron Budea <aron.budea at collabora.com>
CommitDate: Tue May 5 01:10:31 2020 +0200

    Revert "tdf#132125: Pasting into comment pastes...
    
    ...into document instead"
    
    It wasn't pasting in correct format when there was no comment,
    and the fix has to be extended to Calc/Impress as well.
    
    This reverts commit 9baea8eb9b32e7554a5c81af10eb5e354b6da1d8.
    
    Change-Id: I694700aab0a12d9f2eda5e99b84bfc7e679d7b9c
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93450
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Aron Budea <aron.budea at collabora.com>

diff --git a/loleaflet/src/map/Clipboard.js b/loleaflet/src/map/Clipboard.js
index b7c45e939..700369d29 100644
--- a/loleaflet/src/map/Clipboard.js
+++ b/loleaflet/src/map/Clipboard.js
@@ -656,9 +656,6 @@ L.Clipboard = L.Class.extend({
 		if (isAnyVexDialogActive() && !this._map.hasFocus())
 			return;
 
-		if (this._map.isEditingAnnotation())
-			return;
-
 		// If the focus is in the search box, paste there.
 		if (this._map.isSearching())
 			return;
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 3b2b3b719..982cde654 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -966,10 +966,6 @@ L.Map = L.Evented.extend({
 		return this._isSearching;
 	},
 
-	isEditingAnnotation: function() {
-		return this._docLayer._annotations.isEdit();
-	},
-
 	_fireInitComplete: function (condition) {
 		if (this.initComplete) {
 			return;
commit 0d23d91fe3b8e25fd0c2c1049df2e31ac98369ed
Author:     Henry Castro <hcastro at collabora.com>
AuthorDate: Mon May 4 11:07:01 2020 -0400
Commit:     Henry Castro <hcastro at collabora.com>
CommitDate: Mon May 4 18:01:36 2020 +0200

    loleaflet: fix the regular expression to match the ancestor's origin
    
    A better fix to allow the ancestor frame does not block uploading images
    from cloud storage for FireFox and IE browsers
    
    Change-Id: Id69c4e0d1479f7c098e7774bdb220a631dc25855
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93430
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Henry Castro <hcastro at collabora.com>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/loleaflet/src/map/handler/Map.WOPI.js b/loleaflet/src/map/handler/Map.WOPI.js
index a65a6030b..da79219e8 100644
--- a/loleaflet/src/map/handler/Map.WOPI.js
+++ b/loleaflet/src/map/handler/Map.WOPI.js
@@ -166,7 +166,7 @@ L.Map.WOPI = L.Handler.extend({
 			this._allowedOrigins = ancestors;
 			// convert to JS regexps from localhost:* to https*://localhost:.*
 			for (i = 0; i < ancestors.length; i++) {
-				this._allowedOrigins[i] = 'https*://' + ancestors[i].replace(/:\*/, ':.*');
+				this._allowedOrigins[i] = '(http|https)://' + ancestors[i].replace(/:\*/, ':?.*');
 			}
 		}
 
@@ -189,12 +189,6 @@ L.Map.WOPI = L.Handler.extend({
 			return true;
 		}
 
-		var origin = window.location.protocol + '//' + window.location.hostname;
-		if (origin === e.origin) {
-			this._cachedGoodOrigin = e.origin;
-			return true;
-		}
-
 		return false;
 	},
 
commit b6bffd7e65eaf4ed2ed51570bcff407638ed91fb
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Mon May 4 15:18:51 2020 +0100
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Mon May 4 17:56:48 2020 +0200

    admin: cleanup sent/recv accounting - and initialize the totals.
    
    Change-Id: I96265c5d0e7b18d9ae19efa0ce7477aead75dbf7
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93422
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Gabriel Masei <gabriel.masei at 1and1.ro>

diff --git a/wsd/AdminModel.hpp b/wsd/AdminModel.hpp
index 8faceb5f3..ae88ef8cd 100644
--- a/wsd/AdminModel.hpp
+++ b/wsd/AdminModel.hpp
@@ -375,12 +375,12 @@ private:
     std::list<unsigned> _recvStats;
     unsigned _recvStatsSize = 200;
 
-    uint64_t _sentBytesTotal;
-    uint64_t _recvBytesTotal;
+    uint64_t _sentBytesTotal = 0;
+    uint64_t _recvBytesTotal = 0;
 
-    uint64_t _segFaultCount;
+    uint64_t _segFaultCount = 0;
 
-    pid_t _forKitPid;
+    pid_t _forKitPid = 0;
 
     /// We check the owner even in the release builds, needs to be always correct.
     std::thread::id _owner;
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index f0e4a99df..e0e8369a9 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -359,14 +359,24 @@ void DocumentBroker::pollThread()
             lastBWUpdateTime = now;
             uint64_t sent, recv;
             getIOStats(sent, recv);
+
+            uint64_t deltaSent = 0, deltaRecv = 0;
+
+            // connection drop transiently reduces this.
+            if (sent > adminSent)
+            {
+                deltaSent = sent - adminSent;
+                adminSent = sent;
+            }
+            if (recv > deltaRecv)
+            {
+                deltaRecv = recv - adminRecv;
+                adminRecv = recv;
+            }
+            LOG_TRC("Doc [" << _docKey << "] added stats sent: +" << deltaSent << ", recv: +" << deltaRecv << " bytes to totals.");
+
             // send change since last notification.
-            Admin::instance().addBytes(getDocKey(),
-                                       // connection drop transiently reduces this.
-                                       (sent > adminSent ? (sent - adminSent): uint64_t(0)),
-                                       (recv > adminRecv ? (recv - adminRecv): uint64_t(0)));
-            adminSent = sent;
-            adminRecv = recv;
-            LOG_TRC("Doc [" << _docKey << "] added stats sent: " << sent << ", recv: " << recv << " bytes to totals.");
+            Admin::instance().addBytes(getDocKey(), deltaSent, deltaRecv);
         }
 
         if (_storage && _lockCtx->needsRefresh(now))
commit 92879102231c7a511a1fe667333592cd33d38374
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Mon May 4 14:44:04 2020 +0100
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Mon May 4 17:56:30 2020 +0200

    admin: Chrome refuses to override jwt cookies over http.
    
    So alert the user with a helpful dialog when auth. fails.
    
    Perhaps we could avoid the cookie and substitute and send the
    auth token inside the HTML itself in future.
    
    Change-Id: I1860e92e3a365bffb4cd6ab938dc3ab9cf47e5f8
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93424
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/loleaflet/admin/src/AdminSocketOverview.js b/loleaflet/admin/src/AdminSocketOverview.js
index 3973a1dde..c3b488010 100644
--- a/loleaflet/admin/src/AdminSocketOverview.js
+++ b/loleaflet/admin/src/AdminSocketOverview.js
@@ -393,6 +393,17 @@ var AdminSocketOverview = AdminSocketBase.extend({
 			var $mod = $(document.getElementById('mod' + sPid));
 			$mod.text(value);
 		}
+		else if (e.data == 'InvalidAuthToken' || e.data == 'NotAuthenticated') {
+			var msg;
+			if (window.location.protocol === 'http:')
+			{
+				// Browsers refuse to overwrite the jwt cookie in this case.
+				msg =  _('Failed to set jwt authentication cookie over insecure connection');
+			}
+			else
+				msg =  _('Failed to authenticate this session over');
+			vex.dialog.alert({ message: msg });
+		}
 	},
 
 	onSocketClose: function() {
commit dbd74e7d68db2b376380f26795e29d40745cc709
Author:     Rizal Muttaqin <riz_17_oke at yahoo.co.id>
AuthorDate: Mon May 4 04:52:33 2020 +0700
Commit:     Rizal Muttaqin <riz_17_oke at yahoo.co.id>
CommitDate: Mon May 4 17:44:16 2020 +0200

    Sync with latest Colibre icon sets
    
    - Make some icons pixel perfect
    - Make cell type looks like a cell
    - Replace old Tango icons (shape)
    
    Change-Id: I13affa1c24bad08873a1a5e1974ac21ec35f3b04
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93394
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Tested-by: Rizal Muttaqin <riz_17_oke at yahoo.co.id>
    Reviewed-by: Rizal Muttaqin <riz_17_oke at yahoo.co.id>

diff --git a/loleaflet/images/README b/loleaflet/images/README
index a34a98ecc..b3c3a7004 100644
--- a/loleaflet/images/README
+++ b/loleaflet/images/README
@@ -1,2 +1,2 @@
-These icons are copied from LibreOffice/icon-themes/breeze/cmd/, we use the
+These icons are copied from LibreOffice/icon-themes/colibre_svg/cmd/, we use the
 larger icons.
diff --git a/loleaflet/images/fr01.svg b/loleaflet/images/fr01.svg
index ddd81a3c2..b880d271b 100644
--- a/loleaflet/images/fr01.svg
+++ b/loleaflet/images/fr01.svg
@@ -1 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><g transform="translate(1 -1029.3622)"><path d="m1 1031.3622v20h20v-20zm2 2h16v16h-16z" fill="#fff"/><path d="m3 1033.3622v16h16v-16z" fill="#fff"/></g></svg>
\ No newline at end of file
+<svg height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m2 2v20h20v-20z" fill="#fff" stroke-width="1.25"/><path d="m4 4v1h1v-1zm2 0v1h2v-1zm3 0v1h2v-1zm3 0v1h2v-1zm3 0v1h2v-1zm3 0v1h1 1v-1h-1zm-14 2v2h1v-2zm15 0v2h1v-2zm-15 3v2h1v-2zm15 0v2h1v-2zm-15 3v2h1v-2zm15 0v2h1v-2zm-15 3v2h1v-2zm15 0v2h1v-2zm-15 3v2h1v-2zm15 0v1h-1v1h1 1v-2zm-13 1v1h2v-1zm3 0v1h2v-1zm3 0v1h2v-1zm3 0v1h2v-1z" fill="#d3d3d3"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/fr010.svg b/loleaflet/images/fr010.svg
index 7536661e2..ccd87a5c0 100644
--- a/loleaflet/images/fr010.svg
+++ b/loleaflet/images/fr010.svg
@@ -1 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m2 22h20v-20h-20zm2-2v-16h16v16z" fill="#808080"/><path d="m4 20h16v-16h-16z" fill="#fff"/><path d="m-13 4h2v16h-2z" fill="#808080" transform="rotate(-90)"/><path d="m-22 11h20v2h-20z" fill="#eac282" transform="rotate(-90)"/></svg>
+<svg height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m2 2v20h20v-20z" fill="#fff" stroke-width="1.25"/><path d="m4 4v16h16v-16zm2 2h12v12h-12z" fill="#696969"/><path d="m11 7v2h2v-2zm0 3v2h2v-2zm0 3v2h2v-2zm0 3v2h2v-2z" fill="#d3d3d3"/><path d="m11-18h2v12h-2z" fill="#696969" transform="rotate(90)"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/fr011.svg b/loleaflet/images/fr011.svg
index 34dc994ac..6c3dcf309 100644
--- a/loleaflet/images/fr011.svg
+++ b/loleaflet/images/fr011.svg
@@ -1 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m2 2v20h20v-20zm2 2h16v16h-16z" fill="#808080"/><path d="m4 4v16h16v-16z" fill="#fff"/><path d="m11 4h2v16h-2z" fill="#808080"/><path d="m2 11h20v2h-20z" fill="#eac282"/></svg>
+<svg height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m2 2v20h20v-20z" fill="#fff" stroke-width="1.25"/><path d="m4 4v16h16v-16zm2 2h12v12h-12z" fill="#696969"/><path d="m17 11h-2v2h2zm-3 0h-2v2h2zm-3 0h-2v2h2zm-3 0h-2v2h2z" fill="#d3d3d3"/><path d="m11 6h2v12h-2z" fill="#696969"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/fr012.svg b/loleaflet/images/fr012.svg
index af5629880..8a080c64a 100644
--- a/loleaflet/images/fr012.svg
+++ b/loleaflet/images/fr012.svg
@@ -1 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m2 2v20h20v-20zm2 2h16v16h-16z" fill="#808080"/><path d="m4 4v16h16v-16z" fill="#fff"/><path d="m11 4h2v16h-2z" fill="#808080"/><path d="m2 11h20v2h-20z" fill="#808080"/></svg>
+<svg height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m2 2v20h20v-20z" fill="#fff" stroke-width="1.25"/><g fill="#696969"><path d="m4 4v16h16v-16zm2 2h12v12h-12z"/><path d="m11 6h2v12h-2z"/><path d="m11-18h2v12h-2z" transform="rotate(90)"/></g></svg>
\ No newline at end of file
diff --git a/loleaflet/images/fr02.svg b/loleaflet/images/fr02.svg
index f4fd6aae0..cf0c60d9b 100644
--- a/loleaflet/images/fr02.svg
+++ b/loleaflet/images/fr02.svg
@@ -1 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m2 2v20h2v-2-16-2z" fill="#808080"/><path d="m4 2v20h18v-20z" fill="#fff"/></svg>
+<svg height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m2 2v20h20v-20z" fill="#fff" stroke-width="1.25"/><path d="m4 4v1h1v-1zm2 0v1h2v-1zm3 0v1h2v-1zm3 0v1h2v-1zm3 0v1h2v-1zm3 0v1h1 1v-1h-1zm-14 2v2h1v-2zm15 0v2h1v-2zm-15 3v2h1v-2zm15 0v2h1v-2zm-15 3v2h1v-2zm15 0v2h1v-2zm-15 3v2h1v-2zm15 0v2h1v-2zm-15 3v2h1v-2zm15 0v1h-1v1h1 1v-2zm-13 1v1h2v-1zm3 0v1h2v-1zm3 0v1h2v-1zm3 0v1h2v-1z" fill="#d3d3d3"/><path d="m6 4h-2v16h2v-2-12z" fill="#696969"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/fr03.svg b/loleaflet/images/fr03.svg
index 001e5f1d7..57b7a12fe 100644
--- a/loleaflet/images/fr03.svg
+++ b/loleaflet/images/fr03.svg
@@ -1 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m22 2v20h-2v-2-16-2z" fill="#808080"/><path d="m20 2v20h-18v-20z" fill="#fff"/></svg>
+<svg height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m2 2v20h20v-20z" fill="#fff" stroke-width="1.25"/><path d="m4 4v1h1v-1zm2 0v1h2v-1zm3 0v1h2v-1zm3 0v1h2v-1zm3 0v1h2v-1zm3 0v1h1 1v-1h-1zm-14 2v2h1v-2zm15 0v2h1v-2zm-15 3v2h1v-2zm15 0v2h1v-2zm-15 3v2h1v-2zm15 0v2h1v-2zm-15 3v2h1v-2zm15 0v2h1v-2zm-15 3v2h1v-2zm15 0v1h-1v1h1 1v-2zm-13 1v1h2v-1zm3 0v1h2v-1zm3 0v1h2v-1zm3 0v1h2v-1z" fill="#d3d3d3"/><path d="m20 4h-2v2 12 2h2z" fill="#696969"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/fr04.svg b/loleaflet/images/fr04.svg
index 471fe585f..cc1834e80 100644
--- a/loleaflet/images/fr04.svg
+++ b/loleaflet/images/fr04.svg
@@ -1 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m2 2v20h2v-2-16-2z" fill="#808080"/><path d="m4 2v20h16v-20z" fill="#fff"/><path d="m22 2v20h-2v-2-16-2z" fill="#808080"/></svg>
+<svg height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m2 2v20h20v-20z" fill="#fff" stroke-width="1.25"/><path d="m4 4v1h1v-1zm2 0v1h2v-1zm3 0v1h2v-1zm3 0v1h2v-1zm3 0v1h2v-1zm3 0v1h1 1v-1h-1zm-14 2v2h1v-2zm15 0v2h1v-2zm-15 3v2h1v-2zm15 0v2h1v-2zm-15 3v2h1v-2zm15 0v2h1v-2zm-15 3v2h1v-2zm15 0v2h1v-2zm-15 3v2h1v-2zm15 0v1h-1v1h1 1v-2zm-13 1v1h2v-1zm3 0v1h2v-1zm3 0v1h2v-1zm3 0v1h2v-1z" fill="#d3d3d3"/><path d="m20 4h-2v2 12 2h2zm-14 0h-2v16h2v-2-12z" fill="#696969"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/fr05.svg b/loleaflet/images/fr05.svg
index c2440ad29..d10516f3c 100644
--- a/loleaflet/images/fr05.svg
+++ b/loleaflet/images/fr05.svg
@@ -1 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m2 2h20v2h-2-16-2z" fill="#808080"/><path d="m2 4h20v18h-20z" fill="#fff"/></svg>
+<svg height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m2 2v20h20v-20z" fill="#fff" stroke-width="1.25"/><path d="m4 4v1h1v-1zm2 0v1h2v-1zm3 0v1h2v-1zm3 0v1h2v-1zm3 0v1h2v-1zm3 0v1h1 1v-1h-1zm-14 2v2h1v-2zm15 0v2h1v-2zm-15 3v2h1v-2zm15 0v2h1v-2zm-15 3v2h1v-2zm15 0v2h1v-2zm-15 3v2h1v-2zm15 0v2h1v-2zm-15 3v2h1v-2zm15 0v1h-1v1h1 1v-2zm-13 1v1h2v-1zm3 0v1h2v-1zm3 0v1h2v-1zm3 0v1h2v-1z" fill="#d3d3d3"/><path d="m4 4v2h2 12 2v-2z" fill="#696969"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/fr06.svg b/loleaflet/images/fr06.svg
index 3385e4330..32b3f39e9 100644
--- a/loleaflet/images/fr06.svg
+++ b/loleaflet/images/fr06.svg
@@ -1 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m2 22h20v-2h-2-16-2z" fill="#808080"/><path d="m2 20h20v-18h-20z" fill="#fff"/></svg>
+<svg height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m2 2v20h20v-20z" fill="#fff" stroke-width="1.25"/><path d="m4 4v1h1v-1zm2 0v1h2v-1zm3 0v1h2v-1zm3 0v1h2v-1zm3 0v1h2v-1zm3 0v1h1 1v-1h-1zm-14 2v2h1v-2zm15 0v2h1v-2zm-15 3v2h1v-2zm15 0v2h1v-2zm-15 3v2h1v-2zm15 0v2h1v-2zm-15 3v2h1v-2zm15 0v2h1v-2zm-15 3v2h1v-2zm15 0v1h-1v1h1 1v-2zm-13 1v1h2v-1zm3 0v1h2v-1zm3 0v1h2v-1zm3 0v1h2v-1z" fill="#d3d3d3"/><path d="m4 18v2h16v-2h-2-12z" fill="#696969"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/fr07.svg b/loleaflet/images/fr07.svg
index a83aeff32..8246f556d 100644
--- a/loleaflet/images/fr07.svg
+++ b/loleaflet/images/fr07.svg
@@ -1 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m2 2h20v2h-2-16-2z" fill="#808080"/><path d="m2 4h20v16h-20z" fill="#fff"/><path d="m2 22h20v-2h-2-16-2z" fill="#808080"/></svg>
+<svg height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m2 2v20h20v-20z" fill="#fff" stroke-width="1.25"/><path d="m4 4v1h1v-1zm2 0v1h2v-1zm3 0v1h2v-1zm3 0v1h2v-1zm3 0v1h2v-1zm3 0v1h1 1v-1h-1zm-14 2v2h1v-2zm15 0v2h1v-2zm-15 3v2h1v-2zm15 0v2h1v-2zm-15 3v2h1v-2zm15 0v2h1v-2zm-15 3v2h1v-2zm15 0v2h1v-2zm-15 3v2h1v-2zm15 0v1h-1v1h1 1v-2zm-13 1v1h2v-1zm3 0v1h2v-1zm3 0v1h2v-1zm3 0v1h2v-1z" fill="#d3d3d3"/><path d="m4 4v2h2 12 2v-2zm0 14v2h16v-2h-2-12z" fill="#696969"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/fr08.svg b/loleaflet/images/fr08.svg
index 99c960860..9acdd25d2 100644
--- a/loleaflet/images/fr08.svg
+++ b/loleaflet/images/fr08.svg
@@ -1 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m2 2v20h20v-20zm2 2h16v16h-16z" fill="#808080"/><path d="m4 4v16h16v-16z" fill="#fff"/></svg>
+<svg height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m2 2v20h20v-20z" fill="#fff" stroke-width="1.25"/><path d="m4 4v16h16v-16zm2 2h12v12h-12z" fill="#696969"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/fr09.svg b/loleaflet/images/fr09.svg
index 035a30eff..99fdbb21e 100644
--- a/loleaflet/images/fr09.svg
+++ b/loleaflet/images/fr09.svg
@@ -1 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m2 4v16h20v-16z" fill="#fff"/><g fill="#808080"><path d="m2 11h20v2h-20z"/><path d="m2 2h20v2h-20z"/><path d="m2 20h20v2h-20z"/></g></svg>
+<svg height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m2 2v20h20v-20z" fill="#fff" stroke-width="1.25"/><path d="m4 4v1h1v-1zm2 0v1h2v-1zm3 0v1h2v-1zm3 0v1h2v-1zm3 0v1h2v-1zm3 0v1h1 1v-1h-1zm-14 2v2h1v-2zm15 0v2h1v-2zm-15 3v2h1v-2zm15 0v2h1v-2zm-15 3v2h1v-2zm15 0v2h1v-2zm-15 3v2h1v-2zm15 0v2h1v-2zm-15 3v2h1v-2zm15 0v1h-1v1h1 1v-2zm-13 1v1h2v-1zm3 0v1h2v-1zm3 0v1h2v-1zm3 0v1h2v-1z" fill="#d3d3d3"/><path d="m4 4v2h2 12 2v-2zm0 14v2h16v-2h-2-12z" fill="#696969"/><path d="m11 6v2h2v-2zm0 3v2h2v-2zm0 3v2h2v-2zm0 3v2h2v-2z" fill="#d3d3d3"/><path d="m4 11h16v2h-16z" fill="#696969"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_basicshapes.circle-pie.svg b/loleaflet/images/lc_basicshapes.circle-pie.svg
index 42fa5e1f4..d8ca72ddf 100644
--- a/loleaflet/images/lc_basicshapes.circle-pie.svg
+++ b/loleaflet/images/lc_basicshapes.circle-pie.svg
@@ -1 +1 @@
-<svg height="24" width="24" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a"><stop offset="0" stop-color="#eeeeec"/><stop offset="1" stop-color="#e0e0de"/></linearGradient><radialGradient id="b" cx="2.25" cy="16" gradientTransform="matrix(.479894 0 0 .11633788 10.772975 15.813237)" gradientUnits="userSpaceOnUse" r="16.875"><stop offset="0"/><stop offset="1" stop-opacity="0"/></radialGradient><linearGradient id="c" gradientTransform="matrix(1.0540526 0 0 1.0540525 .936542 -.961122)" gradientUnits="userSpaceOnUse" x1="9.446185" x2="13.927343" xlink:href="#a" y1="8.231112" y2="13.700933"/><linearGradient id="d" gradientTransform="matrix(.92855424 0 0 .92855416 2.253786 .343938)" gradientUnits="userSpaceOnUse" x1="9.446185" x2="13.927343" xlink:href="#a" y1="8.231112" y2="13.700933"/><g fill-rule="evenodd" transform="translate(0 2)"><ellipse cx="11.852736" cy="17.674644" display="block" fill="url(#b)" opacity=".433333" rx="8.098211" ry
 ="1.963204"/><path d="m20.454811 9.5c0 4.947379-3.785348 8.954811-8.454811 8.954811-4.6694632 0-8.454811-3.785348-8.4548111-8.454811 0-4.6694632 4.2048111-8.3298111 8.9548111-8.4548111v7.9548111z" fill="url(#c)" stroke="#888a85" stroke-linejoin="round" stroke-width="1.090377"/><path d="m19.19816 10.5c0 2.688227-3.084655 6.948159-7.19816 6.948159-4.1135049 0-7.4481596-3.334654-7.4481597-7.448159 0-4.1135047 3.8612347-7.0106592 6.9237347-7.1356592l.04885 7.6747882z" fill="url(#d)" stroke="#fdfdfb" stroke-linejoin="round" stroke-width="1.103681"/></g></svg>
\ No newline at end of file
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m11.5 2.5273438c-5.0157598.279184-9 4.4066699-9 9.4726562 0 5.246711 4.269829 9.5 9.537109 9.5 4.752187 0 8.682982-3.469595 9.408203-8h-9.945312z" fill="#fafafa" stroke="#808080"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_basicshapes.circle.svg b/loleaflet/images/lc_basicshapes.circle.svg
index e11079b91..6a3850265 100644
--- a/loleaflet/images/lc_basicshapes.circle.svg
+++ b/loleaflet/images/lc_basicshapes.circle.svg
@@ -1 +1 @@
-<svg height="24" width="24" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a"><stop offset="0" stop-color="#eeeeec"/><stop offset="1" stop-color="#e0e0de"/></linearGradient><radialGradient id="b" cx="2.25" cy="16" gradientTransform="matrix(.479894 0 0 .11633788 10.772975 15.813237)" gradientUnits="userSpaceOnUse" r="16.875"><stop offset="0"/><stop offset="1" stop-opacity="0"/></radialGradient><linearGradient id="c" gradientTransform="matrix(1.0540526 0 0 1.0540525 .936542 -.961122)" gradientUnits="userSpaceOnUse" x1="9.446185" x2="13.927343" xlink:href="#a" y1="8.231112" y2="13.700933"/><linearGradient id="d" gradientTransform="matrix(.92855424 0 0 .92855416 2.253786 .343938)" gradientUnits="userSpaceOnUse" x1="9.446185" x2="13.927343" xlink:href="#a" y1="8.231112" y2="13.700933"/><g fill-rule="evenodd" transform="translate(0 2)"><ellipse cx="11.852736" cy="17.674644" display="block" fill="url(#b)" opacity=".433333" rx="8.098211" ry
 ="1.963204"/><circle cx="12" cy="10" fill="url(#c)" r="8.454811" stroke="#888a85" stroke-linejoin="round" stroke-width="1.090377"/><ellipse cx="12" cy="10" fill="url(#d)" rx="7.44816" ry="7.448159" stroke="#fdfdfb" stroke-linejoin="round" stroke-width="1.103681"/></g></svg>
\ No newline at end of file
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m12 2.5a9.5000004 9.5000102 0 0 0 -9.5 9.5 9.5000004 9.5000102 0 0 0 9.5 9.5 9.5000004 9.5000102 0 0 0 9.5-9.5 9.5000004 9.5000102 0 0 0 -9.5-9.5z" fill="#fff" stroke="#808080" stroke-linecap="round" stroke-linejoin="round"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_basicshapes.ellipse.svg b/loleaflet/images/lc_basicshapes.ellipse.svg
index 8ea59a81f..d552ed400 100644
--- a/loleaflet/images/lc_basicshapes.ellipse.svg
+++ b/loleaflet/images/lc_basicshapes.ellipse.svg
@@ -1 +1 @@
-<svg height="24" width="24" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a"><stop offset="0" stop-color="#eeeeec"/><stop offset="1" stop-color="#e0e0de"/></linearGradient><radialGradient id="b" cx="2.25" cy="16" gradientTransform="matrix(.479894 0 0 .11633788 10.772975 15.813237)" gradientUnits="userSpaceOnUse" r="16.875"><stop offset="0"/><stop offset="1" stop-opacity="0"/></radialGradient><linearGradient id="c" gradientTransform="matrix(1.0579469 0 0 .93327787 .895667 1.294817)" gradientUnits="userSpaceOnUse" x1="9.446185" x2="13.927343" xlink:href="#a" y1="8.231112" y2="13.700933"/><linearGradient id="d" gradientTransform="matrix(.93300816 0 0 .80833922 2.207037 2.594058)" gradientUnits="userSpaceOnUse" x1="9.446185" x2="13.927343" xlink:href="#a" y1="8.231112" y2="13.700933"/><g fill-rule="evenodd" transform="translate(0 2)"><ellipse cx="11.852736" cy="17.674644" display="block" fill="url(#b)" opacity=".433333" rx="8.098211" r
 y="1.963204"/><ellipse cx="12" cy="11" fill="url(#c)" rx="8.486049" ry="7.486049" stroke="#888a85" stroke-linejoin="round" stroke-width="1.027902"/><ellipse cx="12" cy="11" fill="url(#d)" rx="7.483886" ry="6.483886" stroke="#fdfdfb" stroke-linejoin="round" stroke-width="1.032229"/></g></svg>
\ No newline at end of file
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m12 4.51224a9.4877599 7.4877599 0 0 0 -9.4877599 7.48776 9.4877599 7.4877599 0 0 0 9.4877599 7.48776 9.4877599 7.4877599 0 0 0 9.48776-7.48776 9.4877599 7.4877599 0 0 0 -9.48776-7.48776z" fill="#fff" stroke="#808080" stroke-width="1.024"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_basicshapes.frame.svg b/loleaflet/images/lc_basicshapes.frame.svg
index a9f596623..500cc06d3 100644
--- a/loleaflet/images/lc_basicshapes.frame.svg
+++ b/loleaflet/images/lc_basicshapes.frame.svg
@@ -1 +1 @@
-<svg height="24" width="24" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientTransform="matrix(.36357954 0 0 .36394762 3.471667 2.671616)" gradientUnits="userSpaceOnUse" x1="23.598076" x2="37.746555" y1="23.992306" y2="39.486301"><stop offset="0" stop-color="#eeeeec"/><stop offset="1" stop-color="#e0e0de"/></linearGradient><radialGradient id="b" cx="2.25" cy="16" gradientTransform="matrix(.53333333 0 0 .11633788 10.8 15.813237)" gradientUnits="userSpaceOnUse" r="16.875"><stop offset="0"/><stop offset="1" stop-opacity="0"/></radialGradient><g transform="translate(0 2)"><ellipse cx="12" cy="17.674644" display="block" fill="url(#b)" fill-rule="evenodd" opacity=".711111" rx="9" ry="1.963204"/><path d="m4 4v16h16v-16zm3 3h10v10h-10z" fill="url(#a)" transform="translate(0 -2)"/><g fill="none"><path d="m3.529856 1.529856h16.940289v16.940289h-16.940289z" stroke="#888a85" stroke-linecap="round" stroke-linejoin="round" stroke-width="
 1.059712"/><path d="m4.531344 2.531343h14.937313v14.937314h-14.937313z" stroke="#fdfdfb" stroke-width="1.062686"/><path d="m7.5 5.5h9v9h-9z" stroke="#888a85"/></g></g></svg>
\ No newline at end of file
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m2.5 2.5v19h19v-19zm4 4h11v11h-11z" fill="#fff" stroke="#808080"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_basicshapes.parallelogram.svg b/loleaflet/images/lc_basicshapes.parallelogram.svg
index f2e8b8922..19aaf98db 100644
--- a/loleaflet/images/lc_basicshapes.parallelogram.svg
+++ b/loleaflet/images/lc_basicshapes.parallelogram.svg
@@ -1 +1 @@
-<svg height="24" width="24" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientTransform="matrix(.38705024 0 0 .31920189 2.921125 3.318499)" gradientUnits="userSpaceOnUse" x1="23.598076" x2="37.746555" y1="23.992306" y2="39.486301"><stop offset="0" stop-color="#eeeeec"/><stop offset="1" stop-color="#e0e0de"/></linearGradient><radialGradient id="b" cx="2.25" cy="16" gradientTransform="matrix(.47407407 0 0 .11633788 9.933334 15.813237)" gradientUnits="userSpaceOnUse" r="16.875"><stop offset="0"/><stop offset="1" stop-opacity="0"/></radialGradient><g transform="translate(0 2)"><ellipse cx="11" cy="17.674644" display="block" fill="url(#b)" fill-rule="evenodd" opacity=".711111" rx="8" ry="1.963204"/><path d="m6.5 4.4835644h14l-3 14.0328716h-14.0164356z" fill="url(#a)" stroke="#888a85" stroke-linecap="round" stroke-linejoin="round" stroke-width=".967129"/><path d="m7.5 5.4787621h12l-3 12.0424749h-12.0212374z" fill="none" stroke="#f
 dfdfb" stroke-width=".957525"/></g></svg>
\ No newline at end of file
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m7.5 2.5-5 19h14l5-19z" fill="#fff" stroke="#808080" stroke-linecap="round" stroke-linejoin="round"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_basicshapes.quadrat.svg b/loleaflet/images/lc_basicshapes.quadrat.svg
index f7c7b2529..87b3ec2a7 100644
--- a/loleaflet/images/lc_basicshapes.quadrat.svg
+++ b/loleaflet/images/lc_basicshapes.quadrat.svg
@@ -1 +1 @@
-<svg height="24" width="24" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientTransform="matrix(.38494639 0 0 .38533611 2.970474 .123405)" gradientUnits="userSpaceOnUse" x1="23.598076" x2="37.746555" y1="23.992306" y2="39.486301"><stop offset="0" stop-color="#eeeeec"/><stop offset="1" stop-color="#e0e0de"/></linearGradient><radialGradient id="b" cx="2.25" cy="16" gradientTransform="matrix(.53333333 0 0 .11633788 10.8 15.813237)" gradientUnits="userSpaceOnUse" r="16.875"><stop offset="0"/><stop offset="1" stop-opacity="0"/></radialGradient><g transform="translate(0 2)"><ellipse cx="12" cy="17.674644" display="block" fill="url(#b)" fill-rule="evenodd" opacity=".711111" rx="9" ry="1.963204"/><path d="m3.529856 1.529856h16.940289v16.940289h-16.940289z" fill="url(#a)" stroke="#888a85" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.059712"/><path d="m4.531344 2.531343h14.937313v14.937314h-14.937313z" fill="none" st
 roke="#fdfdfb" stroke-width="1.062686"/></g></svg>
\ No newline at end of file
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m2.5 2.5v19h19v-19z" fill="#fff" stroke="#808080" stroke-linecap="round" stroke-linejoin="round"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_basicshapes.rectangle.svg b/loleaflet/images/lc_basicshapes.rectangle.svg
index 43df9f942..ebdfe0d01 100644
--- a/loleaflet/images/lc_basicshapes.rectangle.svg
+++ b/loleaflet/images/lc_basicshapes.rectangle.svg
@@ -1 +1 @@
-<svg height="24" width="24" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientTransform="matrix(.38705024 0 0 .31920189 2.921125 3.318499)" gradientUnits="userSpaceOnUse" x1="23.598076" x2="37.746555" y1="23.992306" y2="39.486301"><stop offset="0" stop-color="#eeeeec"/><stop offset="1" stop-color="#e0e0de"/></linearGradient><radialGradient id="b" cx="2.25" cy="16" gradientTransform="matrix(.479894 0 0 .11633788 10.772975 17.175389)" gradientUnits="userSpaceOnUse" r="16.875"><stop offset="0"/><stop offset="1" stop-opacity="0"/></radialGradient><g transform="translate(0 2)"><ellipse cx="11.852736" cy="19.036797" display="block" fill="url(#b)" fill-rule="evenodd" opacity=".245" rx="8.098211" ry="1.963204"/><path d="m3.483564 4.483564h17.032871v14.032871h-17.032871z" fill="url(#a)" stroke="#888a85" stroke-linecap="round" stroke-linejoin="round" stroke-width=".967129"/><path d="m4.478763 5.478762h15.042475v12.042475h-15.042475z" 
 fill="none" stroke="#fdfdfb" stroke-width=".957525"/></g></svg>
\ No newline at end of file
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m2.5 4.5v15h19v-15z" fill="#fff" stroke="#808080" stroke-linecap="round" stroke-linejoin="round"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_basicshapes.round-rectangle.svg b/loleaflet/images/lc_basicshapes.round-rectangle.svg
index 368448984..3ddd88c43 100644
--- a/loleaflet/images/lc_basicshapes.round-rectangle.svg
+++ b/loleaflet/images/lc_basicshapes.round-rectangle.svg
@@ -1 +1 @@
-<svg height="24" width="24" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientTransform="matrix(.38705024 0 0 .31920189 2.921125 3.318499)" gradientUnits="userSpaceOnUse" x1="23.598076" x2="37.746555" y1="23.992306" y2="39.486301"><stop offset="0" stop-color="#eeeeec"/><stop offset="1" stop-color="#e0e0de"/></linearGradient><radialGradient id="b" cx="2.25" cy="16" gradientTransform="matrix(.53333333 0 0 .11633788 10.8 15.813237)" gradientUnits="userSpaceOnUse" r="16.875"><stop offset="0"/><stop offset="1" stop-opacity="0"/></radialGradient><g transform="translate(0 2)"><ellipse cx="12" cy="17.674644" display="block" fill="url(#b)" fill-rule="evenodd" opacity=".711111" rx="9" ry="1.963204"/><rect fill="url(#a)" height="14.032871" rx="2.483645" ry="2.0462" stroke="#888a85" stroke-linecap="round" stroke-linejoin="round" stroke-width=".967129" width="17.032871" x="3.483564" y="4.483564"/><rect fill="none" height="12.042475" rx="
 1.478996" ry="1.184033" stroke="#fdfdfb" stroke-width=".957525" width="15.042475" x="4.478763" y="5.478763"/></g></svg>
\ No newline at end of file
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><rect fill="#fff" height="15" ry="2.5" stroke="#808080" stroke-linecap="round" stroke-linejoin="round" width="19" x="2.5" y="4.5"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_charfontname.svg b/loleaflet/images/lc_charfontname.svg
index 78a1c82e9..c2759c013 100644
--- a/loleaflet/images/lc_charfontname.svg
+++ b/loleaflet/images/lc_charfontname.svg
@@ -1 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m10.048828 2-7.048828 20h2.9863281c.3203884 0 .5871891-.090762.8007813-.271484.2233009-.190763.3735019-.396304.4511718-.617188l1.2089844-3.916016h7.1210934l1.222657 3.931641c.097088.251004.247289.462129.451172.632813.203883.160642.4766.240234.816406.240234h2.941406l-7.048828-20zm1.9375 3.6445312c.126214.4919681.250739.9494071.376953 1.3710938.126214.4116466.24873.7727394.365235 1.0839844l1.964843 6.3242186h-5.3867184l1.9648434-6.3085936c.106797-.311245.223396-.6779227.34961-1.0996094.126213-.4216867.248729-.8791258.365234-1.3710938z" fill="#696969"/></svg>
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m10.048828 2-7.048828 20h2.9863281c.3203884 0 .5871891-.09076.8007813-.271484.2233009-.190763.3735021-.396304.4511718-.617188l1.2617188-4.111328h7.009766l1.28125 4.126953c.09709.251004.247288.462129.451172.632813.203883.160642.4766.240234.816406.240234h2.941406l-7.048828-20zm1.9375 3.6445312 2.59375 8.3554688h-5.158203z" fill="#696969"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_copyhyperlinklocation.svg b/loleaflet/images/lc_copyhyperlinklocation.svg
index 498f956f9..545ce3117 100644
--- a/loleaflet/images/lc_copyhyperlinklocation.svg
+++ b/loleaflet/images/lc_copyhyperlinklocation.svg
@@ -1,17 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <g transform="translate(2.5,2)">
-  <path d="m2 0.023438c-0.554 0-1 0.446-1 1v11c0 0.554 0.446 1 1 1h8c0.554 0 1-0.446 1-1v-11c0-0.554-0.446-1-1-1zm0 1h8v11h-8z" fill="#808080"/>
-  <path d="m2 1.0234h8v11h-8z" fill="#fff"/>
-  <rect x="3" y="6.0234" width="6" height="1" ry=".5" fill="#4d82b8"/>
-  <rect x="3" y="9.0234" width="6" height="1" ry=".5" fill="#4d82b8"/>
-  <path d="m6 3c-0.554 0-1 0.446-1 1v9.6337c0 0.554 0.446 1 1 1h8c0.554 0 1-0.446 1-1v-9.6337c0-0.554-0.446-1-1-1zm0 1h8v10.634h-8z" fill="#808080"/>
-  <path d="m6 4h8v10.173h-8z" fill="#fff"/>
-  <rect x="7" y="8" width="6" height="1" ry=".5" fill="#4d82b8"/>
-  <rect x="7" y="11" width="6" height="1" ry=".5" fill="#4d82b8"/>
- </g>
- <g fill="#4d82b8">
-  <path d="m17.062 15.008c-0.85377 0.1294-1.5678 0.69391-1.9054 1.4672-0.070974 0.16255-0.11815 0.34506-0.15617 0.5307h8c-0.02609-0.12499-0.05348-0.26222-0.09367-0.37462-0.3463-0.96656-1.2687-1.6233-2.3426-1.6233h-3.1273c-0.1269 0-0.25286-0.01848-0.37482 0zm-2.0615 5.9938c0.2352 1.1308 1.2393 1.9979 2.4363 1.9979h3.1273c1.197 0 2.2012-0.86716 2.4363-1.9979z"/>
-  <path d="m7.0615 15.008c-0.85377 0.1294-1.5678 0.69391-1.9054 1.4672-0.070974 0.16255-0.11815 0.34506-0.15617 0.5307h8c-0.02609-0.12499-0.05348-0.26222-0.09367-0.37462-0.3463-0.96656-1.2687-1.6233-2.3426-1.6233h-3.1273c-0.1269 0-0.25286-0.01848-0.37482 0zm-2.0615 5.9938c0.2352 1.1308 1.2393 1.9979 2.4363 1.9979h3.1273c1.197 0 2.2012-0.86716 2.4363-1.9979z"/>
-  <rect x="10" y="18" width="8" height="2" ry=".98861"/>
- </g>
-</svg>
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><g transform="translate(2.5 2)"><path d="m1.5 0c-.554 0-1 .446-1 1v11c0 .554.446 1 1 1h9c.554 0 1-.446 1-1v-11c0-.554-.446-1-1-1zm0 1h9v11h-9z" fill="#808080"/><path d="m1.5.999962h9v11h-9z" fill="#fff"/><rect fill="#4d82b8" height="1" ry=".5" width="7" x="2.5" y="6"/><rect fill="#4d82b8" height="1" ry=".467428" width="7" x="2.5" y="9"/><path d="m5.5 3c-.554 0-1 .446-1 1v9.6337c0 .554.446 1 1 1h9c.554 0 1-.446 1-1v-9.6337c0-.554-.446-1-1-1zm0 1h9v10.634h-9z" fill="#808080"/><path d="m5.5 4h9v10.173h-9z" fill="#fff"/><g fill="#4d82b8"><rect height="1" ry=".458257" width="7" x="6.5" y="8"/><rect height="1" ry=".5" width="7" x="6.5" y="11"/></g></g><g fill="#4d82b8"><path d="m17.062 15.008c-.85377.1294-1.5678.69391-1.9054 1.4672-.070974.16255-.11815.34506-.15617.5307h8c-.02609-.12499-.05348-.26222-.09367-.37462-.3463-.96656-1.2687-1.6233-2.3426-1.6233h-3.1273c-.1269 0-.25286-.01848-.37482 0zm-2.0615 5.9938c.2352 1.1308 1.2393 
 1.9979 2.4363 1.9979h3.1273c1.197 0 2.2012-.86716 2.4363-1.9979z"/><path d="m7.0615 15.008c-.85377.1294-1.5678.69391-1.9054 1.4672-.070974.16255-.11815.34506-.15617.5307h8c-.02609-.12499-.05348-.26222-.09367-.37462-.3463-.96656-1.2687-1.6233-2.3426-1.6233h-3.1273c-.1269 0-.25286-.01848-.37482 0zm-2.0615 5.9938c.2352 1.1308 1.2393 1.9979 2.4363 1.9979h3.1273c1.197 0 2.2012-.86716 2.4363-1.9979z"/><rect height="2" ry=".98861" width="8" x="10" y="18"/></g></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_delbreakmenu.svg b/loleaflet/images/lc_delbreakmenu.svg
index b6753cbdc..37d389a9f 100644
--- a/loleaflet/images/lc_delbreakmenu.svg
+++ b/loleaflet/images/lc_delbreakmenu.svg
@@ -1,10 +1 @@
-<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m3.5 1.9746v5.9414c0 0.554 0.446 1 1 1h6.9551a1.0949 1.0949 0 0 1 0.33594-0.90234l0.10352-0.097656h-7.3945v-5.9414h-1zm16 0v4.584l0.59375-0.60938a1.0949 1.0949 0 0 1 0.40625-0.26172v-3.7129h-1zm-2.0078 5.9414 0.3457 0.34766 0.33789-0.34766h-0.68359z" fill="#808080"/>
- <g transform="matrix(.77119 0 0 .77119 -1.0816 -.33899)" fill="#4d82b8">
-  <path d="m2.6224 12c-0.34413 0.0015-0.62238 0.29942-0.62241 0.66647v6.6647c-7.76e-4 0.56568 0.61783 0.87517 1.0251 0.51287l3.7491-3.3324c0.30104-0.26653 0.30104-0.75922 0-1.0257l-3.7491-3.3324c-0.11312-0.10013-0.25573-0.15452-0.40273-0.1536z"/>
-  <rect x="8" y="15" width="6" height="2" ry=".9661"/>
-  <path d="m16.967 15c-0.53522 0-0.9668 0.43158-0.9668 0.9668v0.06641c0 0.53522 0.43158 0.9668 0.9668 0.9668h1.5527l1.0176-1.0273-0.94726-0.97266h-1.623z"/>
- </g>
- <path d="m4.5 15.084c-0.554 0-1 0.446-1 1v5.9414h1v-5.9414h7.4746l-0.19922-0.19531a1.0949 1.0949 0 0 1-0.32422-0.80469h-6.9512zm13.344 0.5293-0.44531 0.4707h0.89258l-0.44727-0.4707zm1.6562 1.7461v4.666h1v-3.7363a1.0949 1.0949 0 0 1-0.35547-0.25l-0.64453-0.67969z" fill="#808080"/>
- <path d="m23.539 15.289-3.2343-3.291 3.1121-3.4476-2.2435-2.1355-3.2028 3.2854-3.2678-3.2854-2.3342 2.2141 3.2678 3.355-3.2678 3.3015 2.3342 2.2998 3.264-3.4497 3.2715 3.4497z" fill="#e68497" stroke-width=".77119"/>
-</svg>
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><g fill="#4d82b8"><path d="m1.495667 8.999133c-.275368.0011-.498022.22463-.498047.5v5c-.000621.424388.494386.65657.820312.384766l3-2.5c.24089-.199955.24089-.569577 0-.769532l-3-2.5c-.09052-.07512-.204633-.115924-.322265-.115234z"/><rect height="2" ry="1" width="4" x="6" y="11"/><g fill="#4d82b8"><path d="m13 11c-.554 0-1 .446-1 1s.446 1 1 1h.509766l1.009765-1.019531-.955078-.980469z"/><path d="m21.873047 11.537109-.388672.431641.427734.435547c.054747-.123863.087891-.259714.087891-.404297 0-.170084-.052658-.322947-.126953-.462891z"/></g></g><path d="m7 14c-.554 0-1 .446-1 1v7h1v-7h5a1.0041282 1.0041282 0 0 1 .287109-.765625l.232422-.234375zm15 3.361328-.351562.34961a1.0041282 1.0041282 0 0 1 -.648438.291015v3.998047h1z" fill="#808080"/><path d="m7 15v7h14v-3.998047a1.0041282 1.0041282 0 0 1 -.789062-.310547l-2.199219-2.320312-2.19336 2.318359a1.0041282 1.0041282 0 0 1 -1.433593.025391l-2.089844-2.058594a1.0041282 1.0041282 0
  0 1 -.294922-.65625z" fill="#fff"/><path d="m6 2v7c0 .554.446 1 1 1h5.589844l-.308594-.3164062a1.0041282 1.0041282 0 0 1 -.283203-.6835938h-4.998047v-7zm15 0v4.0039062a1.0041282 1.0041282 0 0 1 .576172.2695313l.423828.4042969v-4.6777344z" fill="#808080"/><path d="m7 2v7h4.998047a1.0041282 1.0041282 0 0 1 .310547-.7460938l2.089844-1.9824218a1.0041282 1.0041282 0 0 1 .679687-.2753906 1.0041282 1.0041282 0 0 1 .722656.2949218l2.207031 2.21875 2.15625-2.2109375a1.0041282 1.0041282 0 0 1 .835938-.2949219v-4.0039062z" fill="#fff"/><path d="m23 14.944338-2.895447-2.946153 2.7861-3.086414-2.008392-1.911762-2.867282 2.941173-2.925406-2.941173-2.089573 1.98208 2.925403 3.003525-2.925403 2.955562 2.089573 2.058824 2.922011-3.088233 2.928799 3.088233z" fill="#e68497"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_deleterowbreak.svg b/loleaflet/images/lc_deleterowbreak.svg
index b6753cbdc..37d389a9f 100644
--- a/loleaflet/images/lc_deleterowbreak.svg
+++ b/loleaflet/images/lc_deleterowbreak.svg
@@ -1,10 +1 @@
-<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m3.5 1.9746v5.9414c0 0.554 0.446 1 1 1h6.9551a1.0949 1.0949 0 0 1 0.33594-0.90234l0.10352-0.097656h-7.3945v-5.9414h-1zm16 0v4.584l0.59375-0.60938a1.0949 1.0949 0 0 1 0.40625-0.26172v-3.7129h-1zm-2.0078 5.9414 0.3457 0.34766 0.33789-0.34766h-0.68359z" fill="#808080"/>
- <g transform="matrix(.77119 0 0 .77119 -1.0816 -.33899)" fill="#4d82b8">
-  <path d="m2.6224 12c-0.34413 0.0015-0.62238 0.29942-0.62241 0.66647v6.6647c-7.76e-4 0.56568 0.61783 0.87517 1.0251 0.51287l3.7491-3.3324c0.30104-0.26653 0.30104-0.75922 0-1.0257l-3.7491-3.3324c-0.11312-0.10013-0.25573-0.15452-0.40273-0.1536z"/>
-  <rect x="8" y="15" width="6" height="2" ry=".9661"/>
-  <path d="m16.967 15c-0.53522 0-0.9668 0.43158-0.9668 0.9668v0.06641c0 0.53522 0.43158 0.9668 0.9668 0.9668h1.5527l1.0176-1.0273-0.94726-0.97266h-1.623z"/>
- </g>
- <path d="m4.5 15.084c-0.554 0-1 0.446-1 1v5.9414h1v-5.9414h7.4746l-0.19922-0.19531a1.0949 1.0949 0 0 1-0.32422-0.80469h-6.9512zm13.344 0.5293-0.44531 0.4707h0.89258l-0.44727-0.4707zm1.6562 1.7461v4.666h1v-3.7363a1.0949 1.0949 0 0 1-0.35547-0.25l-0.64453-0.67969z" fill="#808080"/>
- <path d="m23.539 15.289-3.2343-3.291 3.1121-3.4476-2.2435-2.1355-3.2028 3.2854-3.2678-3.2854-2.3342 2.2141 3.2678 3.355-3.2678 3.3015 2.3342 2.2998 3.264-3.4497 3.2715 3.4497z" fill="#e68497" stroke-width=".77119"/>
-</svg>
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><g fill="#4d82b8"><path d="m1.495667 8.999133c-.275368.0011-.498022.22463-.498047.5v5c-.000621.424388.494386.65657.820312.384766l3-2.5c.24089-.199955.24089-.569577 0-.769532l-3-2.5c-.09052-.07512-.204633-.115924-.322265-.115234z"/><rect height="2" ry="1" width="4" x="6" y="11"/><g fill="#4d82b8"><path d="m13 11c-.554 0-1 .446-1 1s.446 1 1 1h.509766l1.009765-1.019531-.955078-.980469z"/><path d="m21.873047 11.537109-.388672.431641.427734.435547c.054747-.123863.087891-.259714.087891-.404297 0-.170084-.052658-.322947-.126953-.462891z"/></g></g><path d="m7 14c-.554 0-1 .446-1 1v7h1v-7h5a1.0041282 1.0041282 0 0 1 .287109-.765625l.232422-.234375zm15 3.361328-.351562.34961a1.0041282 1.0041282 0 0 1 -.648438.291015v3.998047h1z" fill="#808080"/><path d="m7 15v7h14v-3.998047a1.0041282 1.0041282 0 0 1 -.789062-.310547l-2.199219-2.320312-2.19336 2.318359a1.0041282 1.0041282 0 0 1 -1.433593.025391l-2.089844-2.058594a1.0041282 1.0041282 0
  0 1 -.294922-.65625z" fill="#fff"/><path d="m6 2v7c0 .554.446 1 1 1h5.589844l-.308594-.3164062a1.0041282 1.0041282 0 0 1 -.283203-.6835938h-4.998047v-7zm15 0v4.0039062a1.0041282 1.0041282 0 0 1 .576172.2695313l.423828.4042969v-4.6777344z" fill="#808080"/><path d="m7 2v7h4.998047a1.0041282 1.0041282 0 0 1 .310547-.7460938l2.089844-1.9824218a1.0041282 1.0041282 0 0 1 .679687-.2753906 1.0041282 1.0041282 0 0 1 .722656.2949218l2.207031 2.21875 2.15625-2.2109375a1.0041282 1.0041282 0 0 1 .835938-.2949219v-4.0039062z" fill="#fff"/><path d="m23 14.944338-2.895447-2.946153 2.7861-3.086414-2.008392-1.911762-2.867282 2.941173-2.925406-2.941173-2.089573 1.98208 2.925403 3.003525-2.925403 2.955562 2.089573 2.058824 2.922011-3.088233 2.928799 3.088233z" fill="#e68497"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_downloadas-doc.svg b/loleaflet/images/lc_downloadas-doc.svg
index b6c0c8b25..368f2d53f 100644
--- a/loleaflet/images/lc_downloadas-doc.svg
+++ b/loleaflet/images/lc_downloadas-doc.svg
@@ -1,9 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m14.283 22h5.7168v-3.3555l-5e-5 -1.5272v-9.0762c0-0.45068 0.09804-0.42541-0.60547-1.0664l-3.3066-3.2383c-0.70952-0.73686-0.71017-0.73633-1.0938-0.73633h-0.99414l-8.9999 8e-5c-0.554 0-1 0.446-1 1v17c0 0.554 0.446 1 1 1h5.1836m0.79295-0.99999h-5.9766v-17h9v4c0 0.554 0.446 1 1 1h4v7.623l5e-5 3.498v0.87893h-3.1816" fill="#808080"/>
- <path d="m15 8h4l-4-4z" fill="#fff" fill-rule="evenodd"/>
- <g>
-  <path d="m2.8008 11.926c-0.6075 0-1.1016 0.49211-1.1016 1.0996v8.7988c0 0.6075 0.49406 1.1016 1.1016 1.1016h8.7988c0.6075 0 1.0996-0.49406 1.0996-1.1016v-8.7988c0-0.6075-0.49211-1.0996-1.0996-1.0996z" fill="#185abd" stroke-width=".275"/>
-  <rect x="2.9492" y="18" width="8.5" height="1" fill="#fcfcfc" stroke-dasharray="13.52637089, 13.52637089" stroke-linecap="round" stroke-linejoin="round" stroke-width="13.526" style="paint-order:markers stroke fill"/>
-  <rect x="2.9492" y="16" width="6" height="1" fill="#fcfcfc" stroke-dasharray="11.36442466, 11.36442466" stroke-linecap="round" stroke-linejoin="round" stroke-width="11.364" style="paint-order:markers stroke fill"/>
- </g>
-</svg>
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m14.283 22h5.7168v-3.3555l-.00005-1.5272v-9.0762c0-.45068.09804-.42541-.60547-1.0664l-3.3066-3.2383c-.70952-.73686-.71017-.73633-1.0938-.73633h-.99414l-8.9999.00008c-.554 0-1 .446-1 1v17c0 .554.446 1 1 1h5.1836m.79295-.99999h-5.9766v-17h9v4c0 .554.446 1 1 1h4v7.623l.00005 3.498v.87893h-3.1816" fill="#808080"/><path d="m15 8h4l-4-4z" fill="#fff" fill-rule="evenodd"/><path d="m3 12c-.554 0-1 .446-1 1v9c0 .554.446 1 1 1h9c.554 0 1-.446 1-1v-9c0-.554-.446-1-1-1z" fill="#185abd"/><g fill="#fff"><path d="m3 16h7v1h-7z"/><path d="m3 18h9v1h-9z"/><path d="m3 20h7v1h-7z"/><path d="m3 14h6v1h-6z"/></g></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_downloadas-docx.svg b/loleaflet/images/lc_downloadas-docx.svg
index fefb25b55..8ffb56454 100644
--- a/loleaflet/images/lc_downloadas-docx.svg
+++ b/loleaflet/images/lc_downloadas-docx.svg
@@ -1,6 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m14.283 22h5.7168v-3.3555l-5e-5 -1.5272v-9.0762c0-0.45068 0.09804-0.42541-0.60547-1.0664l-3.3066-3.2383c-0.70952-0.73686-0.71017-0.73633-1.0938-0.73633h-0.99414l-8.9999 8e-5c-0.554 0-1 0.446-1 1v17c0 0.554 0.446 1 1 1h5.1836m0.79295-0.99999h-5.9766v-17h9v4c0 0.554 0.446 1 1 1h4v7.623l5e-5 3.498v0.87893h-3.1816" fill="#808080"/>
- <path d="m15 8h4l-4-4z" fill="#fff" fill-rule="evenodd"/>
- <path d="m2.8008 11.926c-0.6075 0-1.1016 0.49211-1.1016 1.0996v8.7988c0 0.6075 0.49406 1.1016 1.1016 1.1016h8.7988c0.6075 0 1.0996-0.49406 1.0996-1.1016v-8.7988c0-0.6075-0.49211-1.0996-1.0996-1.0996z" fill="#fcfcfc" stroke-width=".275"/>
- <path d="m2.8008 11.926c-0.6075 0-1.1016 0.49211-1.1016 1.0996v8.7988c0 0.6075 0.49406 1.1016 1.1016 1.1016h8.7988c0.6075 0 1.0996-0.49406 1.0996-1.1016v-8.7988c0-0.6075-0.49211-1.0996-1.0996-1.0996h-8.7988zm0.54883 2.4746h1.1641l0.87695 4.2305c0.0195 0.08704 0.038461 0.2024 0.056641 0.3457 0.01818 0.14355 0.029486 0.27003 0.035156 0.37695h0.021484c0.0084-0.10134 0.023175-0.22364 0.046875-0.36719 0.0237-0.1433 0.047922-0.26483 0.070313-0.36328l0.9707-4.2227h1.2578l1.0059 4.1602c0.05033 0.20537 0.091535 0.46533 0.125 0.7832h0.017578c0.01397-0.21942 0.047639-0.47096 0.10352-0.75781l0.80469-4.1855h1.1445l-1.4082 6.0488h-1.3359l-0.96094-4.0078c-0.02794-0.11542-0.05883-0.26544-0.09375-0.45117-0.03493-0.18549-0.056123-0.31993-0.064453-0.4043h-0.017578c-0.01119 0.098449-0.032303 0.24352-0.064453 0.4375-0.03215 0.1942-0.058635 0.33877-0.078125 0.43164l-0.90039 3.9941h-1.3574l-1.4199-6.0488z" fill="#185abd" stroke-width=".275"/>
-</svg>
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m14.283 22h5.7168v-3.3555l-.00005-1.5272v-9.0762c0-.45068.09804-.42541-.60547-1.0664l-3.3066-3.2383c-.70952-.73686-.71017-.73633-1.0938-.73633h-.99414l-8.9999.00008c-.554 0-1 .446-1 1v17c0 .554.446 1 1 1h5.1836m.79295-.99999h-5.9766v-17h9v4c0 .554.446 1 1 1h4v7.623l.00005 3.498v.87893h-3.1816" fill="#808080"/><path d="m15 8h4l-4-4z" fill="#fff" fill-rule="evenodd"/><path d="m3 12c-.554 0-1 .446-1 1v9c0 .554.446 1 1 1h9c.554 0 1-.446 1-1v-9c0-.554-.446-1-1-1z" fill="#185abd"/><path d="m3.6493965 14.475575h1.1641l.87695 4.2305c.0195.08704.038461.2024.056641.3457.01818.14355.029486.27003.035156.37695h.021484c.0084-.10134.023175-.22364.046875-.36719.0237-.1433.047922-.26483.070313-.36328l.9707-4.2227h1.2578l1.0059 4.1602c.05033.20537.091535.46533.125.7832h.017578c.01397-.21942.047639-.47096.10352-.75781l.8046905-4.1855h1.1445l-1.4082005 6.0488h-1.3359l-.96094-4.0078c-.02794-.11542-.05883-.26544-.09375-.45117-.03493-.18
 549-.056123-.31993-.064453-.4043h-.017578c-.01119.09845-.032303.24352-.064453.4375-.03215.1942-.058635.33877-.078125.43164l-.90039 3.9941h-1.3574l-1.4199-6.0488z" fill="#fff" stroke-width=".275"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_downloadas-ppt.svg b/loleaflet/images/lc_downloadas-ppt.svg
index e38938026..227e6ab1b 100644
--- a/loleaflet/images/lc_downloadas-ppt.svg
+++ b/loleaflet/images/lc_downloadas-ppt.svg
@@ -1,6 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m14.283 22h5.7168v-3.3555l-5e-5 -1.5272v-9.0762c0-0.45068 0.09804-0.42541-0.60547-1.0664l-3.3066-3.2383c-0.70952-0.73686-0.71017-0.73633-1.0938-0.73633h-0.99414l-8.9999 8e-5c-0.554 0-1 0.446-1 1v17c0 0.554 0.446 1 1 1h5.1836m0.79295-0.99999h-5.9766v-17h9v4c0 0.554 0.446 1 1 1h4v7.623l5e-5 3.498v0.87893h-3.1816" fill="#808080"/>
- <path d="m15 8h4l-4-4z" fill="#fff" fill-rule="evenodd"/>
- <path d="m2.8 11.925c-0.6075 0-1.1 0.4925-1.1 1.1v8.8c0 0.6075 0.4925 1.1 1.1 1.1h8.8c0.6075 0 1.1-0.4925 1.1-1.1v-8.8c0-0.6075-0.4925-1.1-1.1-1.1z" fill="#c43e1c" stroke-width=".275"/>
- <path d="m10.2 17.925a3.5 3.5 0 0 1-2.1606 3.2336 3.5 3.5 0 0 1-3.8143-0.7587 3.5 3.5 0 0 1-0.7587-3.8143 3.5 3.5 0 0 1 3.2336-2.1606l-1e-7 3.5z" fill="#fcfcfc" stroke-dasharray="10.96845411, 10.96845411" stroke-linecap="round" stroke-linejoin="round" stroke-width="10.968" style="paint-order:markers stroke fill"/>
-</svg>
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m14.283 22h5.7168v-3.3555l-.00005-1.5272v-9.0762c0-.45068.09804-.42541-.60547-1.0664l-3.3066-3.2383c-.70952-.73686-.71017-.73633-1.0938-.73633h-.99414l-8.9999.00008c-.554 0-1 .446-1 1v17c0 .554.446 1 1 1h5.1836m.79295-.99999h-5.9766v-17h9v4c0 .554.446 1 1 1h4v7.623l.00005 3.498v.87893h-3.1816" fill="#808080"/><path d="m15 8h4l-4-4z" fill="#fff" fill-rule="evenodd"/><path d="m3 12c-.554 0-1 .446-1 1v9c0 .554.446 1 1 1h9c.554 0 1-.446 1-1v-9c0-.554-.446-1-1-1z" fill="#c43e1c"/><path d="m7.5 14c-1.9329966 0-3.5 1.567003-3.5 3.5s1.5670034 3.5 3.5 3.5 3.5-1.567003 3.5-3.5c-.001-.167386-.0141-.334482-.03906-.5h-2.96094v-1-1.958984c-.165471-.025615-.3325668-.039322-.5-.041016z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_downloadas-pptx.svg b/loleaflet/images/lc_downloadas-pptx.svg
index 461ddcbc4..76bfeffad 100644
--- a/loleaflet/images/lc_downloadas-pptx.svg
+++ b/loleaflet/images/lc_downloadas-pptx.svg
@@ -1,5 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m14.283 22h5.7168v-3.3555l-5e-5 -1.5272v-9.0762c0-0.45068 0.09804-0.42541-0.60547-1.0664l-3.3066-3.2383c-0.70952-0.73686-0.71017-0.73633-1.0938-0.73633h-0.99414l-8.9999 8e-5c-0.554 0-1 0.446-1 1v17c0 0.554 0.446 1 1 1h5.1836m0.79295-0.99999h-5.9766v-17h9v4c0 0.554 0.446 1 1 1h4v7.623l5e-5 3.498v0.87893h-3.1816" fill="#808080"/>
- <path d="m15 8h4l-4-4z" fill="#fff" fill-rule="evenodd"/>
- <path d="m2.8 11.925c-0.6075 0-1.1 0.4925-1.1 1.1v8.8c0 0.6075 0.4925 1.1 1.1 1.1h8.8c0.6075 0 1.1-0.4925 1.1-1.1v-8.8c0-0.6075-0.4925-1.1-1.1-1.1zm2.2 2.2h2.7097c0.81273 0 1.4353 0.18261 1.867 0.54624 0.432 0.36388 0.64829 0.89085 0.64829 1.5807 0 0.443-0.10712 0.83685-0.32065 1.1816-0.21354 0.34507-0.51714 0.61311-0.91094 0.80459-0.39383 0.19121-0.85033 0.28682-1.3691 0.28682h-1.2499v2.475h-1.3745zm1.3745 1.1v2.2h1.0909c0.42526 0 0.74667-0.0959 0.96411-0.28735 0.21717-0.19173 0.32549-0.47139 0.32549-0.8395 0-0.71511-0.416-1.0731-1.2488-1.0731z" fill="#c43e1c" stroke-width=".275"/>
-</svg>
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m14.283 22h5.7168v-3.3555l-.00005-1.5272v-9.0762c0-.45068.09804-.42541-.60547-1.0664l-3.3066-3.2383c-.70952-.73686-.71017-.73633-1.0938-.73633h-.99414l-8.9999.00008c-.554 0-1 .446-1 1v17c0 .554.446 1 1 1h5.1836m.79295-.99999h-5.9766v-17h9v4c0 .554.446 1 1 1h4v7.623l.00005 3.498v.87893h-3.1816" fill="#808080"/><path d="m15 8h4l-4-4z" fill="#fff" fill-rule="evenodd"/><path d="m3 12c-.554 0-1 .446-1 1v9c0 .554.446 1 1 1h9c.554 0 1-.446 1-1v-9c0-.554-.446-1-1-1zm2 2h2.7089844c.81273 0 1.4354875.183245 1.8671875.546875.4320001.36388.6484371.890228.6484371 1.580078 0 .443-.106782.836891-.3203121 1.181641-.21354.34507-.5163563.613207-.9101563.804687-.39383.19121-.8503706.28711-1.3691406.28711h-1.25v2.474609h-1.375zm1.375 1.099609v2.201172h1.0898438c.4252599 0 .7474037-.097612.9648437-.289062.21717-.19173.3261719-.469781.3261719-.837891 0-.71511-.4172-1.074219-1.25-1.074219z" fill="#c43e1c"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_downloadas-xls.svg b/loleaflet/images/lc_downloadas-xls.svg
index fde346b5b..c20ee3a0a 100644
--- a/loleaflet/images/lc_downloadas-xls.svg
+++ b/loleaflet/images/lc_downloadas-xls.svg
@@ -1,16 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m14.283 22h5.7168v-3.3555l-5e-5 -1.5272v-9.0762c0-0.45068 0.09804-0.42541-0.60547-1.0664l-3.3066-3.2383c-0.70952-0.73686-0.71017-0.73633-1.0938-0.73633h-0.99414l-8.9999 8e-5c-0.554 0-1 0.446-1 1v17c0 0.554 0.446 1 1 1h5.1836m0.79295-0.99999h-5.9766v-17h9v4c0 0.554 0.446 1 1 1h4v7.623l5e-5 3.498v0.87893h-3.1816" fill="#808080"/>
- <path d="m15 8h4l-4-4z" fill="#fff" fill-rule="evenodd"/>
- <path d="m2.8008 11.926c-0.6075 0-1.1016 0.49211-1.1016 1.0996v8.7988c0 0.6075 0.49406 1.1016 1.1016 1.1016h8.7988c0.6075 0 1.0996-0.49406 1.0996-1.1016v-8.7988c0-0.6075-0.49211-1.0996-1.0996-1.0996z" fill="#107c41" stroke-width=".275"/>
- <g fill="#fcfcfc" stroke-dasharray="6.56125364, 6.56125364" stroke-linecap="round" stroke-linejoin="round" stroke-width="6.5613">
-  <rect x="2.9492" y="18" width="2" height="1" style="paint-order:markers stroke fill"/>
-  <rect x="2.9492" y="16" width="2" height="1" style="paint-order:markers stroke fill"/>
-  <rect x="6.1992" y="18" width="2" height="1" style="paint-order:markers stroke fill"/>
-  <rect x="6.1992" y="16" width="2" height="1" style="paint-order:markers stroke fill"/>
-  <rect x="9.674" y="18" width="2" height="1" style="paint-order:markers stroke fill"/>
-  <rect x="9.674" y="16" width="2" height="1" style="paint-order:markers stroke fill"/>
-  <rect x="2.9492" y="20" width="2" height="1" style="paint-order:markers stroke fill"/>
-  <rect x="6.1992" y="20" width="2" height="1" style="paint-order:markers stroke fill"/>
-  <rect x="9.674" y="20" width="2" height="1" style="paint-order:markers stroke fill"/>
- </g>
-</svg>
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m14.283 22h5.7168v-3.3555l-.00005-1.5272v-9.0762c0-.45068.09804-.42541-.60547-1.0664l-3.3066-3.2383c-.70952-.73686-.71017-.73633-1.0938-.73633h-.99414l-8.9999.00008c-.554 0-1 .446-1 1v17c0 .554.446 1 1 1h5.1836m.79295-.99999h-5.9766v-17h9v4c0 .554.446 1 1 1h4v7.623l.00005 3.498v.87893h-3.1816" fill="#808080"/><path d="m15 8h4l-4-4z" fill="#fff" fill-rule="evenodd"/><path d="m3 12c-.554 0-1 .446-1 1v9c0 .554.446 1 1 1h9c.554 0 1-.446 1-1v-9c0-.554-.446-1-1-1z" fill="#107c41"/><g fill="#fff"><path d="m3 16h2v1h-2z"/><path d="m6 16h3v1h-3z"/><path d="m10 16h2v1h-2z"/><path d="m3 18h2v1h-2z"/><path d="m6 18h3v1h-3z"/><path d="m10 18h2v1h-2z"/><path d="m3 20h2v1h-2z"/><path d="m6 20h3v1h-3z"/><path d="m10 20h2v1h-2z"/></g></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_downloadas-xlsx.svg b/loleaflet/images/lc_downloadas-xlsx.svg
index 1e7eef0cf..292c6e50f 100644
--- a/loleaflet/images/lc_downloadas-xlsx.svg
+++ b/loleaflet/images/lc_downloadas-xlsx.svg
@@ -1,6 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m14.283 22h5.7168v-3.3555l-5e-5 -1.5272v-9.0762c0-0.45068 0.09804-0.42541-0.60547-1.0664l-3.3066-3.2383c-0.70952-0.73686-0.71017-0.73633-1.0938-0.73633h-0.99414l-8.9999 8e-5c-0.554 0-1 0.446-1 1v17c0 0.554 0.446 1 1 1h5.1836m0.79295-0.99999h-5.9766v-17h9v4c0 0.554 0.446 1 1 1h4v7.623l5e-5 3.498v0.87893h-3.1816" fill="#808080"/>
- <path d="m15 8h4l-4-4z" fill="#fff" fill-rule="evenodd"/>
- <path d="m2.8008 11.926c-0.6075 0-1.1016 0.49211-1.1016 1.0996v8.7988c0 0.6075 0.49406 1.1016 1.1016 1.1016h8.7988c0.6075 0 1.0996-0.49406 1.0996-1.1016v-8.7988c0-0.6075-0.49211-1.0996-1.0996-1.0996z" fill="#fcfcfc" stroke-width=".275"/>
- <path d="m2.8008 11.926c-0.6075 0-1.1016 0.49211-1.1016 1.0996v8.7988c0 0.6075 0.49406 1.1016 1.1016 1.1016h8.7988c0.6075 0 1.0996-0.49406 1.0996-1.1016v-8.7988c0-0.6075-0.49211-1.0996-1.0996-1.0996h-8.7988zm1.5879 2.1992h1.5977l1.084 2.1035c0.099633 0.19943 0.16773 0.34914 0.20508 0.44726h0.015625c0.071968-0.1595 0.14673-0.31458 0.22461-0.46484l1.1582-2.0859h1.4668l-2.0371 3.2734 2.0879 3.3281h-1.5605l-1.252-2.3105c-0.05291-0.08569-0.10172-0.18878-0.14844-0.30859h-0.019531c-0.021752 0.07381-0.069868 0.17321-0.14453 0.29883l-1.2891 2.3203h-1.5703l2.168-3.3105-1.9863-3.291z" fill="#107c41" stroke-width=".275"/>
-</svg>
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m14.283 22h5.7168v-3.3555l-.00005-1.5272v-9.0762c0-.45068.09804-.42541-.60547-1.0664l-3.3066-3.2383c-.70952-.73686-.71017-.73633-1.0938-.73633h-.99414l-8.9999.00008c-.554 0-1 .446-1 1v17c0 .554.446 1 1 1h5.1836m.79295-.99999h-5.9766v-17h9v4c0 .554.446 1 1 1h4v7.623l.00005 3.498v.87893h-3.1816" fill="#808080"/><path d="m15 8h4l-4-4z" fill="#fff" fill-rule="evenodd"/><path d="m3 12c-.554 0-1 .446-1 1v9c0 .554.446 1 1 1h9c.554 0 1-.446 1-1v-9c0-.554-.446-1-1-1z" fill="#107c41"/><path d="m4.5197316 13.999979h1.6941401l1.1494323 2.230471c.105647.211468.1778545.370215.217459.474257h.016568c.0763123-.169127.1555871-.333568.238168-.492898l1.2281111-2.211809h1.5553389l-2.1600632 3.470988 2.2139292 3.528991h-1.6546944l-1.327573-2.449966c-.056104-.09086-.10786-.200175-.1574001-.327217h-.02071c-.023065.07827-.074085.183665-.1532541.316868l-1.3669124 2.460357h-1.6650863l2.2988645-3.510328-2.1061967-3.489651z" fill="#fff" stroke
 -width=".2916"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_formattingmark.svg b/loleaflet/images/lc_formattingmark.svg
index 2c8bbb6da..2c735e722 100644
--- a/loleaflet/images/lc_formattingmark.svg
+++ b/loleaflet/images/lc_formattingmark.svg
@@ -1,3 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m2 9.5h3v4h14v-4h2.9998" fill="none" stroke="#4d82b8" stroke-width="2"/>
-</svg>
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m2 8v2h2v5h16v-2-3h2v-2h-2-2v5h-12v-5z" fill="#4d82b8"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_gallery.svg b/loleaflet/images/lc_gallery.svg
index e1a05ae69..1de3af1b8 100644
--- a/loleaflet/images/lc_gallery.svg
+++ b/loleaflet/images/lc_gallery.svg
@@ -1 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m3 3h18v18h-18z" fill="#fff"/><path d="m2 2v20h20v-20zm1 1h18v18h-18z" fill="#808080"/><circle cx="7.5" cy="7.5" fill="#eac282" r="2.5"/><path d="m3 21c.4875945 0 6-6 6-6l2 1.593356 5-4.593356 5 5v4z" fill="#4d82b8" fill-rule="evenodd"/></svg>
\ No newline at end of file
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><g fill-rule="evenodd" transform="translate(0 -2)"><path d="m15 4c-.265199.0000511-.519519.1054326-.707031.2929688l-3.707031 2.7070312h-8.585938c-.5522619.0000552-.9999448.4477381-1 1v13h1 18 1l2.702146-10.007153c.297854-.992847.297854-.992847-.744519-.992847h-1.957627v-5c-.000055-.5522619-.447738-.9999448-1-1zm0 1h5v5h-14.9788136c-1.0211864 0-1.0211864 0-1.2796742.990786l-1.7415122 6.67523v-9.666016h9z" fill="#eac282"/><path d="m15 5-4 3h-9v9.666016l1.7421875-6.675782c.2584878-.9907856.2581105-.990234 1.2792969-.990234h14.9785156v-5z" fill="#fff"/></g><g stroke-width=".65"><path d="m10 10h11v11h-11z" fill="#fff"/><path d="m9 9v13h13v-13zm1 1h11v11h-11z" fill="#808080"/><path d="m10 21c.316936 0 3.5-3 3.5-3l1.5 1 3-3 3 2.5v2.5z" fill="#4d82b8" fill-rule="evenodd"/></g><circle cx="12.5" cy="12.5" fill="#eac282" r="1.5"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_insertion_mobile_wizard.svg b/loleaflet/images/lc_insertion_mobile_wizard.svg
index fae43963d..14f247ef1 100644
--- a/loleaflet/images/lc_insertion_mobile_wizard.svg
+++ b/loleaflet/images/lc_insertion_mobile_wizard.svg
@@ -1,69 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   sodipodi:docname="lc_addelement_AMX_mobile.svg"
-   inkscape:version="0.92.4 (unknown)">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1017"
-     id="namedview6"
-     showgrid="false"
-     inkscape:snap-bbox="true"
-     inkscape:snap-nodes="false"
-     inkscape:bbox-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:zoom="13.906433"
-     inkscape:cx="2.151365"
-     inkscape:cy="11.383869"
-     inkscape:window-x="0"
-     inkscape:window-y="30"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg4" />
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <g
-     id="g878"
-     transform="matrix(0.85826837,0,0,0.85826837,2.3943405,1.4015591)"
-     style="stroke-width:1.16513681">
-    <path
-       inkscape:connector-curvature="0"
-       id="path1595"
-       d="m 15.512612,0.6972654 c -0.3189,0 -0.64985,0.0486749 -0.96875,0.1835937 l -3.111329,1.2871094 a 8.5630703,8.5630703 0 0 1 2.986329,6.4921875 8.5630703,8.5630703 0 0 1 -6.4511725,8.292969 l 2.2949225,5.539062 c 0.380226,0.932169 1.287439,1.495547 2.24414,1.507813 0.3189,0 0.638679,-0.06094 0.945313,-0.183594 l 9.027343,-3.740234 c 1.251069,-0.515145 1.851085,-1.950649 1.335938,-3.189453 L 17.733315,2.2050779 C 17.353088,1.285174 16.457046,0.7217962 15.512612,0.6972654 Z M -0.04207611,14.855469 -1.4385605,18.224609 c -0.5028808,1.251069 0.099087,2.686026 1.33789069,3.201172 L 1.5419083,22.111328 V 16.046875 A 8.5630703,8.5630703 0 0 1 -0.04207611,14.855469 Z M 4.006752,17.015625 v 4.53125 C 4.006752,22.896067 5.1106846,24 6.459877,24 h 1.7792969 l -2.8125,-6.796875 a 8.5630703,8.5630703 0 0 1 -1.4199219,-0.1875 z"
-       style="fill:#555555;fill-opacity:1;stroke-width:1.16513669" />
-    <path
-       inkscape:connector-curvature="0"
-       d="M 11.355452,9.4466509 H 6.641177 V 14.16095 H 5.0697281 V 9.4466509 H 0.35545339 V 7.875226 H 5.0697281 V 3.1609393 H 6.641177 V 7.875226 h 4.714275 z"
-       id="path1603"
-       style="fill:#555555;fill-opacity:1;stroke-width:1.16513681" />
-  </g>
-</svg>
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><g fill="#555" stroke-width="1.165137" transform="matrix(.85826837 0 0 .85826837 2.394341 1.401559)"><path d="m15.512612.6972654c-.3189 0-.64985.0486749-.96875.1835937l-3.111329 1.2871094a8.5630703 8.5630703 0 0 1 2.986329 6.4921875 8.5630703 8.5630703 0 0 1 -6.4511725 8.292969l2.2949225 5.539062c.380226.932169 1.287439 1.495547 2.24414 1.507813.3189 0 .638679-.06094.945313-.183594l9.027343-3.740234c1.251069-.515145 1.851085-1.950649 1.335938-3.189453l-6.082031-14.6816411c-.380227-.9199039-1.276269-1.4832817-2.220703-1.5078125zm-15.55468811 14.1582036-1.39648439 3.36914c-.5028808 1.251069.099087 2.686026 1.33789069 3.201172l1.64257811.685547v-6.064453a8.5630703 8.5630703 0 0 1 -1.58398441-1.191406zm4.04882811 2.160156v4.53125c0 1.349192 1.1039326 2.453125 2.453125 2.453125h1.7792969l-2.8125-6.796875a8.5630703 8.5630703 0 0 1 -1.4199219-.1875z"/><path d="m11.191907 10.018359h-4.6605472v4.660547h-2.3302735v-4.660547h-4.660546
 9v-2.3302732h4.6605469v-4.6605469h2.3302735v4.6605469h4.6605472z"/></g></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_insertnonbreakingspace.svg b/loleaflet/images/lc_insertnonbreakingspace.svg
index 2c8bbb6da..2c735e722 100644
--- a/loleaflet/images/lc_insertnonbreakingspace.svg
+++ b/loleaflet/images/lc_insertnonbreakingspace.svg
@@ -1,3 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m2 9.5h3v4h14v-4h2.9998" fill="none" stroke="#4d82b8" stroke-width="2"/>
-</svg>
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m2 8v2h2v5h16v-2-3h2v-2h-2-2v5h-12v-5z" fill="#4d82b8"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_insertzwnbsp.svg b/loleaflet/images/lc_insertzwnbsp.svg
index a0879e27f..05a192480 100644
--- a/loleaflet/images/lc_insertzwnbsp.svg
+++ b/loleaflet/images/lc_insertzwnbsp.svg
@@ -1,5 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <rect x="8" y="7.5" width="3" height="3" fill="#4d82b8" stroke-width="1.5" style="paint-order:stroke markers fill"/>
- <rect x="13" y="7.5" width="3" height="3" fill="#4d82b8" stroke-width="1.5" style="paint-order:stroke markers fill"/>
- <path d="m11 2.2119h2v13.576h-2z" fill="#e68497" style="paint-order:stroke markers fill"/>
-</svg>
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m8 8h3v3h-3z" fill="#4d82b8" stroke-width="1.5"/><path d="m13 8h3v3h-3z" fill="#4d82b8" stroke-width="1.5"/><path d="m11 2h2v14h-2z" fill="#e68497"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_insertzwsp.svg b/loleaflet/images/lc_insertzwsp.svg
index 3e732e8e4..db3d8774a 100644
--- a/loleaflet/images/lc_insertzwsp.svg
+++ b/loleaflet/images/lc_insertzwsp.svg
@@ -1,7 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <rect x="8" y="7.5" width="3" height="3" fill="#4d82b8" stroke-width="1.5" style="paint-order:stroke markers fill"/>
- <rect x="13" y="7.5" width="3" height="3" fill="#4d82b8" stroke-width="1.5" style="paint-order:stroke markers fill"/>
- <path d="m11 2.2119h2v13.576h-2z" fill="#e68497" style="paint-order:stroke markers fill"/>
- <path d="m4.0591 9.1006q0 1.8803 0.4486 3.7129 0.45815 1.823 1.279 3.417 0.10499 0.20044 0.12408 0.34361 0.01909 0.15272-0.02863 0.26725-0.03818 0.11454-0.12408 0.1909-0.0859 0.0859-0.18135 0.15272l-1.0786 0.64904q-0.68722-1.0499-1.174-2.1094-0.47724-1.0595-0.78267-2.1476t-0.4486-2.1953q-0.13363-1.1167-0.13363-2.2812t0.13363-2.2812q0.14317-1.1167 0.4486-2.1953 0.30543-1.0881 0.78267-2.1476 0.48678-1.0595 1.174-2.1094l1.0786 0.64904q0.09545 0.066813 0.18135 0.15272 0.0859 0.076358 0.12408 0.19089 0.04772 0.11454 0.02863 0.26725-0.01909 0.14317-0.12408 0.34361-0.82085 1.594-1.279 3.4266-0.4486 1.823-0.4486 3.7034z" fill="#4d82b8" stroke-width=".48869"/>
- <path d="m19.941 9.1006q0 1.8803-0.4486 3.7129-0.45815 1.823-1.279 3.417-0.10499 0.20044-0.12408 0.34361-0.01909 0.15272 0.02863 0.26725 0.03818 0.11454 0.12408 0.1909 0.0859 0.0859 0.18135 0.15272l1.0786 0.64904q0.68722-1.0499 1.174-2.1094 0.47724-1.0595 0.78267-2.1476t0.4486-2.1953q0.13363-1.1167 0.13363-2.2812t-0.13363-2.2812q-0.14317-1.1167-0.4486-2.1953-0.30543-1.0881-0.78267-2.1476-0.48678-1.0595-1.174-2.1094l-1.0786 0.64904q-0.09545 0.066813-0.18135 0.15272-0.0859 0.076358-0.12408 0.19089-0.04772 0.11454-0.02863 0.26725 0.01909 0.14317 0.12408 0.34361 0.82085 1.594 1.279 3.4266 0.4486 1.823 0.4486 3.7034z" fill="#4d82b8" stroke-width=".48869"/>
-</svg>
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m8 8h3v3h-3z" fill="#4d82b8" stroke-width="1.5"/><path d="m13 8h3v3h-3z" fill="#4d82b8" stroke-width="1.5"/><path d="m11 2h2v14h-2z" fill="#e68497" stroke-width="1.015496"/><g fill="#4d82b8" stroke-width=".48869"><path d="m4.0591 9.1006q0 1.8803.4486 3.7129.45815 1.823 1.279 3.417.10499.20044.12408.34361.01909.15272-.02863.26725-.03818.11454-.12408.1909-.0859.0859-.18135.15272l-1.0786.64904q-.68722-1.0499-1.174-2.1094-.47724-1.0595-.78267-2.1476t-.4486-2.1953q-.13363-1.1167-.13363-2.2812t.13363-2.2812q.14317-1.1167.4486-2.1953.30543-1.0881.78267-2.1476.48678-1.0595 1.174-2.1094l1.0786.64904q.09545.066813.18135.15272.0859.076358.12408.19089.04772.11454.02863.26725-.01909.14317-.12408.34361-.82085 1.594-1.279 3.4266-.4486 1.823-.4486 3.7034z"/><path d="m19.941 9.1006q0 1.8803-.4486 3.7129-.45815 1.823-1.279 3.417-.10499.20044-.12408.34361-.01909.15272.02863.26725.03818.11454.12408.1909.0859.0859.18135.15272l1.0786.64
 904q.68722-1.0499 1.174-2.1094.47724-1.0595.78267-2.1476t.4486-2.1953q.13363-1.1167.13363-2.2812t-.13363-2.2812q-.14317-1.1167-.4486-2.1953-.30543-1.0881-.78267-2.1476-.48678-1.0595-1.174-2.1094l-1.0786.64904q-.09545.066813-.18135.15272-.0859.076358-.12408.19089-.04772.11454-.02863.26725.01909.14317.12408.34361.82085 1.594 1.279 3.4266.4486 1.823.4486 3.7034z"/></g></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_masterslide.svg b/loleaflet/images/lc_masterslide.svg
index 3ed432c99..768821edc 100644
--- a/loleaflet/images/lc_masterslide.svg
+++ b/loleaflet/images/lc_masterslide.svg
@@ -1,24 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
-  <path
-     style="fill:#ffffff"
-     d="M 3 5 L 3 18 L 11.673828 18 C 14.17979 15.495595 16.680211 12.990736 19.189453 10.509766 C 19.524376 10.175251 19.978129 10 20.419922 10 C 20.615312 10 20.811255 10.038717 21 10.105469 L 21 5 L 3 5 z M 21 17.216797 C 20.730874 17.47813 20.459641 17.737778 20.191406 18 L 21 18 L 21 17.216797 z "
-     />
-  <path
-     style="fill:#4d82b8"
-     d="M 2 4 L 2 19 L 10.955078 19 L 11.046875 18.625 C 11.256041 18.416048 11.464753 18.208945 11.673828 18 L 3 18 L 3 5 L 21 5 L 21 10.105469 C 21.238067 10.189663 21.463775 10.321444 21.652344 10.509766 L 22 10.857422 L 22 4 L 2 4 z M 5 10 L 5 11 L 6 11 L 6 10 L 5 10 z M 7 10 L 7 11 L 18.697266 11 C 18.798138 10.900106 18.8991 10.799045 19 10.699219 L 19 10 L 7 10 z M 5 12 L 5 13 L 6 13 L 6 12 L 5 12 z M 7 12 L 7 13 L 16.691406 13 C 17.025573 12.66736 17.359008 12.332051 17.693359 12 L 7 12 z M 5 14 L 5 15 L 6 15 L 6 14 L 5 14 z M 7 14 L 7 15 L 14.683594 15 C 15.017933 14.666149 15.35312 14.333457 15.6875 14 L 7 14 z M 22 16.248047 C 21.665915 16.570229 21.332857 16.893578 21 17.216797 L 21 18 L 20.191406 18 C 19.850549 18.333217 19.507243 18.664999 19.167969 19 L 22 19 L 22 16.248047 z "
-     />
-  <path
-     style="fill:#eac282"
-     d="M 5,7 V 9 H 19 V 7 Z"
-     />
-  <g
-     fill="#eac282"
-     >
-    <path
-       d="m17.480469 13.611328-5.529297 5.523438-.951172 3.865234 3.806641-1.011719 5.509765-5.544922z"
-       />
-    <path
-       d="m20.419922 11c-.189562 0-.378184.07172-.523438.216797l-1.673828 1.669922 2.847656 2.849609 1.710938-1.638672c.290506-.290127.290506-.756747 0-1.046875l-1.835938-1.833984c-.145254-.145064-.335828-.216797-.52539-.216797z"
-       />
-  </g>
-</svg>
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m3 4v5.105469 9.111328.783203h.8085938 7.8652342c.108615-.108547.217577-.215672.326172-.324219.108595.108547.217557.215672.326172.324219h7.865234.808594v-.783203-9.111328-5.105469z" fill="#4d82b8"/><path d="m2 3v17h7.5 1.455078 8.212891 1.332031 1.5v-2.751953-5.390625-8.857422zm1 1h18v5.105469 9.394531.5h-.5-.308594-8.517578-2.173828-6.5z" fill="#808080"/><g fill="#fff"><path d="m20 5h-16v1 2 1h16v-1-2zm-1 1v2h-14v-2z"/><path d="m20 10h-16v1 6 1h16v-1-6zm-1 1v6h-14v-6z"/></g></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_mobile_wizard.svg b/loleaflet/images/lc_mobile_wizard.svg
index 58dd0cd8c..349ac1bde 100644
--- a/loleaflet/images/lc_mobile_wizard.svg
+++ b/loleaflet/images/lc_mobile_wizard.svg
@@ -1,57 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   viewBox="0 0 24 24"
-   version="1.1"
-   id="svg4">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     style="fill:#555555;fill-opacity:1;stroke-width:1"
-     id="path1581"
-     d="M 13.686188,13.94935 H 10.284572 L 9.5730593,15.8987 H 7.9940859 L 11.307981,7.1266252 h 1.364545 L 15.996167,15.8987 h -1.58872 z m -2.963012,-1.228091 h 2.543901 L 12,8.9882543 Z" />
-  <circle
-     r="2.2026002"
-     cy="4.2026"
-     cx="4.2026"
-     id="circle1583"

... etc. - the rest is truncated