diff --git a/loleaflet/dist/contextMenu/jquery.contextMenu.css b/loleaflet/dist/contextMenu/jquery.contextMenu.css
index 5b1bc7e7ac..b74941f2b4 100644
--- a/loleaflet/dist/contextMenu/jquery.contextMenu.css
+++ b/loleaflet/dist/contextMenu/jquery.contextMenu.css
@@ -103,8 +103,8 @@
 
 .context-menu-item {
   position: relative;
-  padding: 3px 28px;
-  color: #2f2f2f;
+  padding: 5px 28px;
+  color: #000;
   -webkit-user-select: none;
      -moz-user-select: none;
       -ms-user-select: none;
diff --git a/loleaflet/dist/loleaflet.css b/loleaflet/dist/loleaflet.css
index a7c75972fd..15d7f9e1ce 100644
--- a/loleaflet/dist/loleaflet.css
+++ b/loleaflet/dist/loleaflet.css
@@ -29,3 +29,9 @@
 body {
     margin: 0;
 }
+
+.loleaflet-font {
+    font-family: "Segoe UI", Tahoma, Arial, Helvetica, sans-serif !important;
+    font-size: 12px !important;
+    font-weight: normal !important;
+}
\ No newline at end of file
diff --git a/loleaflet/dist/smartmenus/sm-simple.css b/loleaflet/dist/smartmenus/sm-simple.css
index 1f080dfc50..ac38a70f9a 100644
--- a/loleaflet/dist/smartmenus/sm-simple.css
+++ b/loleaflet/dist/smartmenus/sm-simple.css
@@ -6,7 +6,7 @@
     /* make room for the toggle button (sub indicator) */
     padding-right: 58px;
     color: #555555;
-    font-family: "Lucida Sans Unicode", "Lucida Sans", "Lucida Grande", Arial, sans-serif;
+    font-family: "Segoe UI", Tahoma, Arial, Helvetica, sans-serif;
     font-size: 12px;
     font-weight: normal;
     line-height: 15px;
@@ -46,7 +46,7 @@
     background: #fff;
 }
 .sm-simple ul a, .sm-simple ul a:hover, .sm-simple ul a:focus, .sm-simple ul a:active {
-    font-size: 14px;
+    font-size: 12px;
     border-left: 8px solid transparent;
 }
 .sm-simple ul ul a,
diff --git a/loleaflet/dist/spreadsheet.css b/loleaflet/dist/spreadsheet.css
index 8e1c0f3b98..7537600c54 100644
--- a/loleaflet/dist/spreadsheet.css
+++ b/loleaflet/dist/spreadsheet.css
@@ -38,7 +38,7 @@
 	padding-top: 3px;
 	padding-bottom: 3px;
 
-	font: 12px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif;
+	font: 12px/1.5 "Segoe UI", Tahoma, Arial, Helvetica, sans-serif;
 	display: inline-block;
 	border: 1px solid darkgrey;
 	background-color: lightgrey;
@@ -99,7 +99,7 @@
 
 .spreadsheet-header-column {
 	border-right: 1px solid darkgrey;
-	font: 12px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif;
+	font: 12px/1.5 "Segoe UI", Tahoma, Arial, Helvetica, sans-serif;
 
 	display: inline-block;
 	text-align: center;
@@ -146,7 +146,7 @@
 
 .spreadsheet-header-row {
 	border-bottom: 1px solid darkgrey;
-	font: 12px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif;
+	font: 12px/1.5 "Segoe UI", Tahoma, Arial, Helvetica, sans-serif;
 
 	text-overflow: ellipsis;
 	text-align: center;
diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css
index 022d3831e1..51d38dc53c 100644
--- a/loleaflet/dist/toolbar.css
+++ b/loleaflet/dist/toolbar.css
@@ -166,10 +166,15 @@ button.leaflet-control-search-next
 /* select box */
 .select2-results__option {
     padding: 5px;
-    font-size: 14px;
+    font-family: "Segoe UI", Tahoma, Arial, Helvetica, sans-serif;
+    font-size: 12px;
     overflow: hidden;
     text-overflow: ellipsis;
 }
+.select2-selection__rendered {
+    font-family: "Segoe UI", Tahoma, Arial, Helvetica, sans-serif;
+    font-size: 12px;
+}
 .styles-select {
     width: 180px;
 }
@@ -272,4 +277,4 @@ button.leaflet-control-search-next
 
 #tablePicker div {
     text-align:left;
-}
\ No newline at end of file
+}
diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js
index 1ca5a022d2..84f7af5224 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -127,10 +127,10 @@ $(function () {
 			{ type: 'button',  id: 'cancelsearch', img: 'cancel', hint: _("Cancel the search"), hidden: true },
 			{ type: 'html',  id: 'left' },
 			{ type: 'html',  id: 'right' },
-			{ type: 'html',    id: 'modifiedstatuslabel', html: '<div id="modifiedstatuslabel"></div>' },
+			{ type: 'html',    id: 'modifiedstatuslabel', html: '<div id="modifiedstatuslabel" class="loleaflet-font"></div>' },
 			{ type: 'break' },
 			{ type: 'button',  id: 'takeedit', img: 'edit', hint: _("Take edit lock (others can only view)")},
-			{ type: 'html',    id: 'takeeditlabel', html: '<div id="takeeditlabel">VIEWING</div>' },
+			{ type: 'html',    id: 'takeeditlabel', html: '<div id="takeeditlabel" class="loleaflet-font">VIEWING</div>' },
 			{ type: 'break' },
 			{ type: 'button',  id: 'prev', img: 'prev', hint: _("Previous page") },
 			{ type: 'button',  id: 'next', img: 'next', hint: _("Next page") },
diff --git a/loleaflet/src/control/Control.ContextMenu.js b/loleaflet/src/control/Control.ContextMenu.js
index 3b8399256c..f0cfc5287e 100644
--- a/loleaflet/src/control/Control.ContextMenu.js
+++ b/loleaflet/src/control/Control.ContextMenu.js
@@ -60,6 +60,7 @@ L.Control.ContextMenu = L.Control.extend({
 		var contextMenu = this._createContextMenuStructure(obj);
 		$.contextMenu({
 			selector: '.leaflet-layer',
+			className: 'loleaflet-font',
 			trigger: 'none',
 			build: function(triggerEle, e) {
 				return {