diff --git a/app/store/ServicesList.js b/app/store/ServicesList.js
index a4b619b0..7311664f 100644
--- a/app/store/ServicesList.js
+++ b/app/store/ServicesList.js
@@ -407,7 +407,7 @@ Ext.define('Rambox.store.ServicesList', {
 			,description: locale['services[43]']
 			,url: '___'
 			,type: 'email'
-			,js_unread: `let checkUnread=()=>{const e=document.getElementsByClassName("count");let t=0;for(let i in e)t+=parseInt(i.innerHTML.match(/\d+/g));rambox.updateBadge(t)};setInterval(checkUnread,3e3);`
+			,js_unread: `let checkUnread=()=>{const e=document.getElementsByClassName("count");let t=0;for(let i in e)t+=parseInt(i.innerHTML.match(/[0-9]+/g));rambox.updateBadge(t)};setInterval(checkUnread,3e3);`
 			,note: 'To enable desktop notifications and automatic mail check, you have to go to Options inside Horde.'
 		},
 		{
@@ -769,7 +769,7 @@ Ext.define('Rambox.store.ServicesList', {
 			,description: 'Simple and Easy App for Messaging on VK.'
 			,url: 'https://m.vk.com/im'
 			,type: 'messaging'
-			,js_unread: `let checkUnread=()=>{rambox.updateBadge(parseInt(document.getElementById("l_msg").innerText.replace(/\D+/g,"")))};setInterval(checkUnread,3e3);`
+			,js_unread: `let checkUnread=()=>{rambox.updateBadge(parseInt(document.getElementById("l_msg").innerText.replace(/[^0-9]+/g,"")))};setInterval(checkUnread,3e3);`
 		},
 		{
 			 id: 'mastodon'
@@ -831,7 +831,7 @@ Ext.define('Rambox.store.ServicesList', {
 			,description: 'A free phone number for life.  Stay in touch from any screen.  Use your free number to text, call, and check voicemail  all from one app. Plus, Google Voice works on all of your devices so you can connect and communicate how you want.'
 			,url: 'https://voice.google.com'
 			,type: 'messaging'
-			,js_unread: `let parseIntOrZero=e=>isNaN(parseInt(e))?0:parseInt(e),checkUnread=()=>{const e=document.querySelector(".msgCount");let n=0;e?n=parseIntOrZero(e.innerHTML.replace(/[\(\) ]/gi,"")):["Messages","Calls","Voicemail"].forEach(function(e){const r=document.querySelector('gv-nav-tab[tooltip="+e+"] div[aria-label="Unread count"]');r&&(n+=parseIntOrZero(r.innerHTML))}),rambox.updateBadge(n)};setInterval(checkUnread,3e3);`
+			,js_unread: `let parseIntOrZero=e=>isNaN(parseInt(e))?0:parseInt(e),checkUnread=()=>{const e=document.querySelector(".msgCount");let n=0;e?n=parseIntOrZero(e.innerHTML.replace(/[() ]/gi,"")):["Messages","Calls","Voicemail"].forEach(function(e){const r=document.querySelector('gv-nav-tab[tooltip="+e+"] div[aria-label="Unread count"]');r&&(n+=parseIntOrZero(r.innerHTML))}),rambox.updateBadge(n)};setInterval(checkUnread,3e3);;`
 		},
 		{
 			 id: 'sandstorm'
diff --git a/app/ux/WebView.js b/app/ux/WebView.js
index a138914a..229cd403 100644
--- a/app/ux/WebView.js
+++ b/app/ux/WebView.js
@@ -22,7 +22,7 @@ Ext.define('Rambox.ux.WebView',{
 		var me = this;
 
 		function getLocation(href) {
-			var match = href.match(/^(https?\:)\/\/(([^:\/?#]*)(?:\:([0-9]+))?)(\/[^?#]*)(\?[^#]*|)(#.*|)$/);
+			var match = href.match(/^(https?):\/\/([-.\w]*)(\/[^#?]*)(\?[^#]*|)(#.*|)$/);
 			return match && {
 				protocol: match[1],
 				host: match[2],
@@ -252,7 +252,7 @@ Ext.define('Rambox.ux.WebView',{
 			switch ( me.type ) {
 				case 'skype':
 					// hack to fix multiple browser tabs on Skype link click, re #11
-					if ( e.url.match('https:\/\/web.skype.com\/..\/undefined') ) {
+					if ( e.url.match(/https:\/\/web.skype.com\/..\/undefined/) ) {
 						e.preventDefault();
 						return;
 					} else if ( e.url.indexOf('imgpsh_fullsize') >= 0 ) {
diff --git a/packages/local/rambox-default-theme/sass/src/button/Button.scss b/packages/local/rambox-default-theme/sass/src/button/Button.scss
index 52344945..245a78cf 100644
--- a/packages/local/rambox-default-theme/sass/src/button/Button.scss
+++ b/packages/local/rambox-default-theme/sass/src/button/Button.scss
@@ -2,7 +2,7 @@
  * Aplica estilo decline a botones
  */
 @include extjs-button-small-ui(
-	$ui: 'decline',
+	$ui: 'default',
 	$background-color: transparent,
 	$background-color-over: transparent,
 	$background-color-pressed: transparent,
diff --git a/packages/local/rambox-default-theme/sass/src/toolbar/Toolbar.scss b/packages/local/rambox-default-theme/sass/src/toolbar/Toolbar.scss
index c14c136d..21ab2d42 100644
--- a/packages/local/rambox-default-theme/sass/src/toolbar/Toolbar.scss
+++ b/packages/local/rambox-default-theme/sass/src/toolbar/Toolbar.scss
@@ -2,12 +2,12 @@
  * Aplica estilo a la barra de login
  */
 @include extjs-toolbar-ui(
-	$ui: 'main',
+	$ui: 'default',
 	$background-color: $base-color
 );
 
 @include extjs-toolbar-ui(
-	$ui: 'newversion',
+	$ui: 'default',
 	$background-color: #31B96E
 );