diff --git a/administrator/components/com_media/views/imageslist/tmpl/default.php b/administrator/components/com_media/views/imageslist/tmpl/default.php
index 3c57623633fab..87b35908186ee 100644
--- a/administrator/components/com_media/views/imageslist/tmpl/default.php
+++ b/administrator/components/com_media/views/imageslist/tmpl/default.php
@@ -48,7 +48,7 @@
 }
 ?>
 <?php if (count($this->images) > 0 || count($this->folders) > 0) : ?>
-	<ul class="manager thumbnails">
+	<ul class="manager thumbnails thumbnails-media">
 		<?php for ($i = 0, $n = count($this->folders); $i < $n; $i++) :
 			$this->setFolder($i);
 			echo $this->loadTemplate('folder');
diff --git a/administrator/components/com_media/views/medialist/tmpl/thumbs.php b/administrator/components/com_media/views/medialist/tmpl/thumbs.php
index a3eefc89de627..44ff5c3e49013 100644
--- a/administrator/components/com_media/views/medialist/tmpl/thumbs.php
+++ b/administrator/components/com_media/views/medialist/tmpl/thumbs.php
@@ -100,7 +100,7 @@
 		</label>
 	</div>
 
-	<ul class="manager thumbnails">
+	<ul class="manager thumbnails thumbnails-media">
 		<?php
 			echo $this->loadTemplate('up'),
 				$this->loadTemplate('folders'),
diff --git a/administrator/templates/isis/css/template-rtl.css b/administrator/templates/isis/css/template-rtl.css
index 1fd5b0bdfb116..298fff2841810 100644
--- a/administrator/templates/isis/css/template-rtl.css
+++ b/administrator/templates/isis/css/template-rtl.css
@@ -8484,10 +8484,10 @@ textarea.noResize {
 #imageForm .well {
 	margin-bottom: 5px;
 }
-.thumbnails {
+.thumbnails-media {
 	margin-left: 0;
 }
-.thumbnails .thumbnail {
+.thumbnails-media .thumbnail {
 	background-color: #f4f4f4;
 	border-radius: 3px;
 	border: 0;
@@ -8501,7 +8501,7 @@ textarea.noResize {
 	text-align: center;
 	overflow: hidden;
 }
-.thumbnails .thumbnail .close {
+.thumbnails-media .thumbnail .close {
 	background-color: #ccc;
 	border-left: 1px solid rgba(0,0,0,0.1);
 	height: 22px;
@@ -8512,11 +8512,11 @@ textarea.noResize {
 	top: 0;
 	right: 0;
 }
-.thumbnails .thumbnail .close:hover {
+.thumbnails-media .thumbnail .close:hover {
 	background-color: #bbb;
 }
-.thumbnails .thumbnail *,
-.thumbnails .thumbnail *:before {
+.thumbnails-media .thumbnail *,
+.thumbnails-media .thumbnail *:before {
 	-webkit-transition: all 0.2s ease;
 	transition: all 0.2s ease;
 	-webkit-background-clip: padding-box;
@@ -8524,29 +8524,29 @@ textarea.noResize {
 	-webkit-box-sizing: border-box;
 	box-sizing: border-box;
 }
-.thumbnails .thumbnail input[type="radio"],
-.thumbnails .thumbnail input[type="checkbox"] {
+.thumbnails-media .thumbnail input[type="radio"],
+.thumbnails-media .thumbnail input[type="checkbox"] {
 	margin: 0;
 	opacity: 0.55;
 	position: absolute;
 	top: 5px;
 	left: 5px;
 }
-.thumbnails .thumbnail .controls,
-.thumbnails .thumbnail .imginfoBorder {
+.thumbnails-media .thumbnail .controls,
+.thumbnails-media .thumbnail .imginfoBorder {
 	display: none;
 }
-.thumbnails .imgThumb {
+.thumbnails-media .imgThumb {
 	position: relative;
 	z-index: 1;
 	width: 100%;
 	display: inline-block;
 }
-.thumbnails .imgThumb input {
+.thumbnails-media .imgThumb input {
 	display: none;
 }
-.thumbnails .imgThumb label,
-.thumbnails .imgThumb .imgThumbInside {
+.thumbnails-media .imgThumb label,
+.thumbnails-media .imgThumb .imgThumbInside {
 	display: block;
 	line-height: 100px;
 	position: relative;
@@ -8554,8 +8554,8 @@ textarea.noResize {
 	border-radius: 3px;
 	overflow: hidden;
 }
-.thumbnails .imgThumb label:before,
-.thumbnails .imgThumb .imgThumbInside:before {
+.thumbnails-media .imgThumb label:before,
+.thumbnails-media .imgThumb .imgThumbInside:before {
 	font-family: "IcoMoon";
 	font-style: normal;
 	content: 'G';
@@ -8573,27 +8573,27 @@ textarea.noResize {
 	box-shadow: 0 1px 2px rgba(0,0,0,0.05);
 	border-radius: 0 3px;
 }
-.thumbnails .imgThumb img {
+.thumbnails-media .imgThumb img {
 	width: auto;
 }
-.thumbnails .selected :checked + label,
-.thumbnails .selected .imgThumbInside,
-.thumbnails .imgInput :checked + label,
-.thumbnails .imgInput .imgThumbInside {
+.thumbnails-media .selected :checked + label,
+.thumbnails-media .selected .imgThumbInside,
+.thumbnails-media .imgInput :checked + label,
+.thumbnails-media .imgInput .imgThumbInside {
 	background-color: #ddd;
 }
-.thumbnails .selected :checked + label:before,
-.thumbnails .selected .imgThumbInside:before,
-.thumbnails .imgInput :checked + label:before,
-.thumbnails .imgInput .imgThumbInside:before {
+.thumbnails-media .selected :checked + label:before,
+.thumbnails-media .selected .imgThumbInside:before,
+.thumbnails-media .imgInput :checked + label:before,
+.thumbnails-media .imgInput .imgThumbInside:before {
 	-webkit-transform: scale(1);
 	transform: scale(1);
 	opacity: 1;
 }
-.thumbnails .selected :checked + label:after,
-.thumbnails .selected .imgThumbInside:after,
-.thumbnails .imgInput :checked + label:after,
-.thumbnails .imgInput .imgThumbInside:after {
+.thumbnails-media .selected :checked + label:after,
+.thumbnails-media .selected .imgThumbInside:after,
+.thumbnails-media .imgInput :checked + label:after,
+.thumbnails-media .imgInput .imgThumbInside:after {
 	position: absolute;
 	top: 0;
 	left: 0;
@@ -8603,8 +8603,8 @@ textarea.noResize {
 	border: 3px solid #46a546;
 	border-radius: 5px;
 }
-.thumbnails .imgDelete a.close,
-.thumbnails .imgPreview a {
+.thumbnails-media .imgDelete a.close,
+.thumbnails-media .imgPreview a {
 	padding: 0;
 	position: absolute;
 	left: 0;
@@ -8612,7 +8612,7 @@ textarea.noResize {
 	height: 26px;
 	width: 26px;
 }
-.thumbnails .imgDelete a.close {
+.thumbnails-media .imgDelete a.close {
 	background-color: #bd362f;
 	border-color: #bd362f rgba(0,0,0,0.2) rgba(0,0,0,0.2) #bd362f;
 	top: 0;
@@ -8627,16 +8627,16 @@ textarea.noResize {
 	-webkit-transform: scale(0.5);
 	transform: scale(0.5);
 }
-.thumbnails .imgDelete a.close:hover {
+.thumbnails-media .imgDelete a.close:hover {
 	background-color: #802420;
 }
-.thumbnails .thumbnail:hover .imgDelete a.close {
+.thumbnails-media .thumbnail:hover .imgDelete a.close {
 	opacity: 1;
 	-webkit-transform: scale(1);
 	transform: scale(1);
 }
-.thumbnails .imgPreview a,
-.thumbnails .imgDetails {
+.thumbnails-media .imgPreview a,
+.thumbnails-media .imgDetails {
 	position: absolute;
 	left: 0;
 	background-color: #fff;
@@ -8648,22 +8648,22 @@ textarea.noResize {
 	border-radius: 0 3px 0 0;
 	z-index: 1;
 }
-.thumbnails .imgPreview a:hover,
-.thumbnails .imgDetails:hover {
+.thumbnails-media .imgPreview a:hover,
+.thumbnails-media .imgDetails:hover {
 	background-color: #eee;
 }
-.thumbnails .imgDetails {
+.thumbnails-media .imgDetails {
 	padding: 0 5px;
 	line-height: 20px;
 	color: #555;
 }
-.thumbnails .imgFolder span {
+.thumbnails-media .imgFolder span {
 	line-height: 90px;
 	font-size: 38px;
 	margin: 0;
 	width: auto;
 }
-.thumbnails .imgFolder + .imgDetails {
+.thumbnails-media .imgFolder + .imgDetails {
 	color: inherit;
 }
 #folderframe.thumbnail {
@@ -9711,26 +9711,26 @@ a.grid_true {
 .modal-header {
 	text-align: right;
 }
-#mediamanager-form .thumbnails .thumbnail {
+#mediamanager-form .thumbnails-media .thumbnail {
 	margin-left: 18px !important;
 	margin-right: 0;
 }
-.thumbnails .imgThumb label::before,
-.thumbnails .imgThumb .imgThumbInside::before {
+.thumbnails-media .imgThumb label::before,
+.thumbnails-media .imgThumb .imgThumbInside::before {
 	left: 0;
 	right: auto;
 	border-radius: 3px 0;
 }
-.thumbnails .thumbnail input[type="radio"],
-.thumbnails .thumbnail input[type="checkbox"] {
+.thumbnails-media .thumbnail input[type="radio"],
+.thumbnails-media .thumbnail input[type="checkbox"] {
 	left: auto;
 	right: 5px;
 }
-.thumbnails .imgDelete a.close {
+.thumbnails-media .imgDelete a.close {
 	border-radius: 0 3px;
 }
-.thumbnails .imgPreview a,
-.thumbnails .imgDetails {
+.thumbnails-media .imgPreview a,
+.thumbnails-media .imgDetails {
 	border-radius: 3px 0;
 	border-width: 1px 0 0 1px;
 	left: auto;
diff --git a/administrator/templates/isis/css/template.css b/administrator/templates/isis/css/template.css
index 72ac97efcd361..8a435c0052c4d 100644
--- a/administrator/templates/isis/css/template.css
+++ b/administrator/templates/isis/css/template.css
@@ -8484,10 +8484,10 @@ textarea.noResize {
 #imageForm .well {
 	margin-bottom: 5px;
 }
-.thumbnails {
+.thumbnails-media {
 	margin-left: 0;
 }
-.thumbnails .thumbnail {
+.thumbnails-media .thumbnail {
 	background-color: #f4f4f4;
 	border-radius: 3px;
 	border: 0;
@@ -8501,7 +8501,7 @@ textarea.noResize {
 	text-align: center;
 	overflow: hidden;
 }
-.thumbnails .thumbnail .close {
+.thumbnails-media .thumbnail .close {
 	background-color: #ccc;
 	border-left: 1px solid rgba(0,0,0,0.1);
 	height: 22px;
@@ -8512,11 +8512,11 @@ textarea.noResize {
 	top: 0;
 	right: 0;
 }
-.thumbnails .thumbnail .close:hover {
+.thumbnails-media .thumbnail .close:hover {
 	background-color: #bbb;
 }
-.thumbnails .thumbnail *,
-.thumbnails .thumbnail *:before {
+.thumbnails-media .thumbnail *,
+.thumbnails-media .thumbnail *:before {
 	-webkit-transition: all 0.2s ease;
 	transition: all 0.2s ease;
 	-webkit-background-clip: padding-box;
@@ -8524,29 +8524,29 @@ textarea.noResize {
 	-webkit-box-sizing: border-box;
 	box-sizing: border-box;
 }
-.thumbnails .thumbnail input[type="radio"],
-.thumbnails .thumbnail input[type="checkbox"] {
+.thumbnails-media .thumbnail input[type="radio"],
+.thumbnails-media .thumbnail input[type="checkbox"] {
 	margin: 0;
 	opacity: 0.55;
 	position: absolute;
 	top: 5px;
 	left: 5px;
 }
-.thumbnails .thumbnail .controls,
-.thumbnails .thumbnail .imginfoBorder {
+.thumbnails-media .thumbnail .controls,
+.thumbnails-media .thumbnail .imginfoBorder {
 	display: none;
 }
-.thumbnails .imgThumb {
+.thumbnails-media .imgThumb {
 	position: relative;
 	z-index: 1;
 	width: 100%;
 	display: inline-block;
 }
-.thumbnails .imgThumb input {
+.thumbnails-media .imgThumb input {
 	display: none;
 }
-.thumbnails .imgThumb label,
-.thumbnails .imgThumb .imgThumbInside {
+.thumbnails-media .imgThumb label,
+.thumbnails-media .imgThumb .imgThumbInside {
 	display: block;
 	line-height: 100px;
 	position: relative;
@@ -8554,8 +8554,8 @@ textarea.noResize {
 	border-radius: 3px;
 	overflow: hidden;
 }
-.thumbnails .imgThumb label:before,
-.thumbnails .imgThumb .imgThumbInside:before {
+.thumbnails-media .imgThumb label:before,
+.thumbnails-media .imgThumb .imgThumbInside:before {
 	font-family: "IcoMoon";
 	font-style: normal;
 	content: 'G';
@@ -8573,27 +8573,27 @@ textarea.noResize {
 	box-shadow: 0 1px 2px rgba(0,0,0,0.05);
 	border-radius: 0 3px;
 }
-.thumbnails .imgThumb img {
+.thumbnails-media .imgThumb img {
 	width: auto;
 }
-.thumbnails .selected :checked + label,
-.thumbnails .selected .imgThumbInside,
-.thumbnails .imgInput :checked + label,
-.thumbnails .imgInput .imgThumbInside {
+.thumbnails-media .selected :checked + label,
+.thumbnails-media .selected .imgThumbInside,
+.thumbnails-media .imgInput :checked + label,
+.thumbnails-media .imgInput .imgThumbInside {
 	background-color: #ddd;
 }
-.thumbnails .selected :checked + label:before,
-.thumbnails .selected .imgThumbInside:before,
-.thumbnails .imgInput :checked + label:before,
-.thumbnails .imgInput .imgThumbInside:before {
+.thumbnails-media .selected :checked + label:before,
+.thumbnails-media .selected .imgThumbInside:before,
+.thumbnails-media .imgInput :checked + label:before,
+.thumbnails-media .imgInput .imgThumbInside:before {
 	-webkit-transform: scale(1);
 	transform: scale(1);
 	opacity: 1;
 }
-.thumbnails .selected :checked + label:after,
-.thumbnails .selected .imgThumbInside:after,
-.thumbnails .imgInput :checked + label:after,
-.thumbnails .imgInput .imgThumbInside:after {
+.thumbnails-media .selected :checked + label:after,
+.thumbnails-media .selected .imgThumbInside:after,
+.thumbnails-media .imgInput :checked + label:after,
+.thumbnails-media .imgInput .imgThumbInside:after {
 	position: absolute;
 	top: 0;
 	left: 0;
@@ -8603,8 +8603,8 @@ textarea.noResize {
 	border: 3px solid #46a546;
 	border-radius: 5px;
 }
-.thumbnails .imgDelete a.close,
-.thumbnails .imgPreview a {
+.thumbnails-media .imgDelete a.close,
+.thumbnails-media .imgPreview a {
 	padding: 0;
 	position: absolute;
 	left: 0;
@@ -8612,7 +8612,7 @@ textarea.noResize {
 	height: 26px;
 	width: 26px;
 }
-.thumbnails .imgDelete a.close {
+.thumbnails-media .imgDelete a.close {
 	background-color: #bd362f;
 	border-color: #bd362f rgba(0,0,0,0.2) rgba(0,0,0,0.2) #bd362f;
 	top: 0;
@@ -8627,16 +8627,16 @@ textarea.noResize {
 	-webkit-transform: scale(0.5);
 	transform: scale(0.5);
 }
-.thumbnails .imgDelete a.close:hover {
+.thumbnails-media .imgDelete a.close:hover {
 	background-color: #802420;
 }
-.thumbnails .thumbnail:hover .imgDelete a.close {
+.thumbnails-media .thumbnail:hover .imgDelete a.close {
 	opacity: 1;
 	-webkit-transform: scale(1);
 	transform: scale(1);
 }
-.thumbnails .imgPreview a,
-.thumbnails .imgDetails {
+.thumbnails-media .imgPreview a,
+.thumbnails-media .imgDetails {
 	position: absolute;
 	left: 0;
 	background-color: #fff;
@@ -8648,22 +8648,22 @@ textarea.noResize {
 	border-radius: 0 3px 0 0;
 	z-index: 1;
 }
-.thumbnails .imgPreview a:hover,
-.thumbnails .imgDetails:hover {
+.thumbnails-media .imgPreview a:hover,
+.thumbnails-media .imgDetails:hover {
 	background-color: #eee;
 }
-.thumbnails .imgDetails {
+.thumbnails-media .imgDetails {
 	padding: 0 5px;
 	line-height: 20px;
 	color: #555;
 }
-.thumbnails .imgFolder span {
+.thumbnails-media .imgFolder span {
 	line-height: 90px;
 	font-size: 38px;
 	margin: 0;
 	width: auto;
 }
-.thumbnails .imgFolder + .imgDetails {
+.thumbnails-media .imgFolder + .imgDetails {
 	color: inherit;
 }
 #folderframe.thumbnail {
diff --git a/administrator/templates/isis/less/template-rtl.less b/administrator/templates/isis/less/template-rtl.less
index 0e4f19231a489..5489b87dcb0ec 100644
--- a/administrator/templates/isis/less/template-rtl.less
+++ b/administrator/templates/isis/less/template-rtl.less
@@ -353,23 +353,23 @@ a.grid_true {
 
 
 /* Media Manager */
-#mediamanager-form .thumbnails .thumbnail {
+#mediamanager-form .thumbnails-media .thumbnail {
     margin-left: 18px !important;
     margin-right: 0;
 }
-.thumbnails .imgThumb label::before, .thumbnails .imgThumb .imgThumbInside::before {
+.thumbnails-media .imgThumb label::before, .thumbnails-media .imgThumb .imgThumbInside::before {
 	left: 0;
 	right: auto;
 	border-radius: 3px 0;
 }
-.thumbnails .thumbnail input[type="radio"], .thumbnails .thumbnail input[type="checkbox"] {
+.thumbnails-media .thumbnail input[type="radio"], .thumbnails-media .thumbnail input[type="checkbox"] {
     left: auto;
     right: 5px;
 }
-.thumbnails .imgDelete a.close {
+.thumbnails-media .imgDelete a.close {
 	border-radius: 0 3px;
 }
-.thumbnails .imgPreview a, .thumbnails .imgDetails {
+.thumbnails-media .imgPreview a, .thumbnails-media .imgDetails {
     border-radius: 3px 0;
     border-width: 1px 0 0 1px;
     left: auto;
diff --git a/administrator/templates/isis/less/template.less b/administrator/templates/isis/less/template.less
index 113766ca9f5b3..b5a78a7d0f8db 100644
--- a/administrator/templates/isis/less/template.less
+++ b/administrator/templates/isis/less/template.less
@@ -1520,7 +1520,7 @@ textarea.noResize {
 		margin-bottom: 5px;
 	}
 }
-.thumbnails {
+.thumbnails-media {
 	@thumbSize:100px;
 	margin-left: 0;
 	.thumbnail {