7 files changed, 38 insertions, 3 deletions
diff --git a/core/css/icons.css b/core/css/icons.css
index 6cfe67c3a4d..3b12f9ea2e6 100644
--- a/core/css/icons.css
+++ b/core/css/icons.css
@@ -114,6 +114,13 @@ img.icon-loading-small-dark, object.icon-loading-small-dark, video.icon-loading-
 	background-image: url('../img/actions/add.svg?v=1');
 }
 
+.icon-audio {
+	background-image: url('../img/actions/audio.svg?v=1');
+}
+.icon-audio-white {
+	background-image: url('../img/actions/audio-white.svg?v=1');
+}
+
 .icon-caret {
 	background-image: url('../img/actions/caret.svg?v=1');
 }
@@ -313,6 +320,13 @@ img.icon-loading-small-dark, object.icon-loading-small-dark, video.icon-loading-
 	background-image: url('../img/actions/user.svg?v=1');
 }
 
+.icon-video {
+	background-image: url('../img/actions/video.svg?v=1');
+}
+.icon-video-white {
+	background-image: url('../img/actions/video-white.svg?v=1');
+}
+
 .icon-view-close {
 	background-image: url('../img/actions/view-close.svg?v=1');
 }
diff --git a/core/css/inputs.css b/core/css/inputs.css
index ebde986d584..21778cd0ee4 100644
--- a/core/css/inputs.css
+++ b/core/css/inputs.css
@@ -5,6 +5,10 @@ input, textarea, select, button {
 	font-family: 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
 }
 
+.select2-container-multi .select2-choices .select2-search-field input {
+	font-family: 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif !important;
+}
+
 input[type="text"],
 input[type="password"],
 input[type="search"],
diff --git a/core/img/actions/audio-white.svg b/core/img/actions/audio-white.svg
new file mode 100644
index 00000000000..dc12a026ad2
--- /dev/null
+++ b/core/img/actions/audio-white.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1">
+ <path d="m8 1c-1.108 0-2 0.892-2 2v4c0 1.108 0.892 2 2 2s2-0.892 2-2v-4c0-1.108-0.892-2-2-2zm-4 4c-0.554 0-1 0.446-1 1v1c0 2.4272 1.7126 4.439 4 4.9v1.1h-2v2h6v-2h-2v-1.1c2.287-0.461 4-2.4728 4-4.9v-1c0-0.554-0.446-1-1-1s-1 0.446-1 1v1c0 1.662-1.338 3-3 3s-3-1.338-3-3v-1c0-0.554-0.446-1-1-1z" fill-rule="evenodd" fill="#fff"/>
+</svg>
diff --git a/core/img/actions/audio.svg b/core/img/actions/audio.svg
new file mode 100644
index 00000000000..9880758e438
--- /dev/null
+++ b/core/img/actions/audio.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1">
+ <path d="m8 1c-1.108 0-2 0.892-2 2v4c0 1.108 0.892 2 2 2s2-0.892 2-2v-4c0-1.108-0.892-2-2-2zm-4 4c-0.554 0-1 0.446-1 1v1c0 2.4272 1.7126 4.439 4 4.9v1.1h-2v2h6v-2h-2v-1.1c2.287-0.461 4-2.4728 4-4.9v-1c0-0.554-0.446-1-1-1s-1 0.446-1 1v1c0 1.662-1.338 3-3 3s-3-1.338-3-3v-1c0-0.554-0.446-1-1-1z" fill-rule="evenodd"/>
+</svg>
diff --git a/core/img/actions/video-white.svg b/core/img/actions/video-white.svg
new file mode 100644
index 00000000000..0719ef024ed
--- /dev/null
+++ b/core/img/actions/video-white.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1">
+ <path d="m3 3c-1.108 0-2 0.892-2 2v6c0 1.108 0.892 2 2 2h6c1.108 0 2-0.892 2-2v-1.334l4 3.334v-10l-4 3.334v-1.334c0-1.108-0.892-2-2-2z" fill="#fff"/>
+</svg>
diff --git a/core/img/actions/video.svg b/core/img/actions/video.svg
new file mode 100644
index 00000000000..72fab50f0ce
--- /dev/null
+++ b/core/img/actions/video.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1">
+ <path d="m3 3c-1.108 0-2 0.892-2 2v6c0 1.108 0.892 2 2 2h6c1.108 0 2-0.892 2-2v-1.334l4 3.334v-10l-4 3.334v-1.334c0-1.108-0.892-2-2-2z"/>
+</svg>
diff --git a/core/js/js.js b/core/js/js.js
index c7a06b85e53..67487ec979c 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -1722,9 +1722,10 @@ function formatDate(timestamp){
  * @return {string}
  */
 function getURLParameter(name) {
-	return decodeURI(
-			(RegExp(name + '=' + '(.+?)(&|$)').exec(location.search) || [, null])[1]
-			);
+	return decodeURIComponent(
+		(new RegExp('[?|&]' + name + '=' + '([^&;]+?)(&|#|;|$)').exec(
+			location.search)||[,''])[1].replace(/\+/g, '%20')
+		)||'';
 }
 
 /**