diff --git a/administrator/templates/isis/css/template-rtl.css b/administrator/templates/isis/css/template-rtl.css
index bf8893d1431cd..61df1ad6d7bc3 100644
--- a/administrator/templates/isis/css/template-rtl.css
+++ b/administrator/templates/isis/css/template-rtl.css
@@ -7774,8 +7774,6 @@ ul.manager .height-50 .icon-folder-2 {
 .thumbnails-media .thumbnail *:before {
 	-webkit-transition: all 0.2s ease;
 	transition: all 0.2s ease;
-	-webkit-background-clip: padding-box;
-	background-clip: padding-box;
 	-webkit-box-sizing: border-box;
 	box-sizing: border-box;
 }
@@ -7867,6 +7865,9 @@ ul.manager .height-50 .icon-folder-2 {
 	height: 26px;
 	width: 26px;
 }
+.thumbnails-media .imgPreview a {
+	width: 100%;
+}
 .thumbnails-media .imgDelete a.close {
 	background-color: #bd362f;
 	border-color: #bd362f rgba(0,0,0,0.2) rgba(0,0,0,0.2) #bd362f;
@@ -7894,12 +7895,13 @@ ul.manager .height-50 .icon-folder-2 {
 .thumbnails-media .imgDetails {
 	position: absolute;
 	left: 0;
+	text-align: left;
 	background-color: #fff;
 	border-color: rgba(0,0,0,0.2);
 	bottom: 0;
 	line-height: 26px;
 	border: 1px solid rgba(0,0,0,0.1);
-	border-width: 1px 1px 0 0;
+	border-width: 1px;
 	border-radius: 0 3px 0 0;
 	z-index: 1;
 }
@@ -7954,6 +7956,10 @@ ul.manager .height-50 .icon-folder-2 {
 #mediamanager-form .thumbnails .imgTotal {
 	line-height: 120px;
 }
+#mediamanager-form .icon-search::before {
+	padding-right: 5px;
+	padding-left: 1px;
+}
 #mediamanager-form .height-50 {
 	background-color: #fafafa;
 	height: 77px;
@@ -9989,6 +9995,8 @@ a.grid_true {
 #mediamanager-form .thumbnails-media .thumbnail {
 	margin-left: 18px !important;
 	margin-right: 0;
+	direction: ltr;
+	text-align: center;
 }
 .thumbnails-media .imgThumb label::before,
 .thumbnails-media .imgThumb .imgThumbInside::before {
@@ -10007,9 +10015,14 @@ a.grid_true {
 .thumbnails-media .imgPreview a,
 .thumbnails-media .imgDetails {
 	border-radius: 3px 0;
-	border-width: 1px 0 0 1px;
-	left: auto;
+	border-width: 1px;
+	left: 0;
 	right: 0;
+	text-align: left;
+	direction: ltr;
+}
+.thumbnails-media .imgPreview a {
+	width: 100%;
 }
 .subform-table-layout td {
 	padding-left: 10px;
diff --git a/administrator/templates/isis/css/template.css b/administrator/templates/isis/css/template.css
index 882f27a858477..07038a3560feb 100644
--- a/administrator/templates/isis/css/template.css
+++ b/administrator/templates/isis/css/template.css
@@ -7774,8 +7774,6 @@ ul.manager .height-50 .icon-folder-2 {
 .thumbnails-media .thumbnail *:before {
 	-webkit-transition: all 0.2s ease;
 	transition: all 0.2s ease;
-	-webkit-background-clip: padding-box;
-	background-clip: padding-box;
 	-webkit-box-sizing: border-box;
 	box-sizing: border-box;
 }
@@ -7867,6 +7865,9 @@ ul.manager .height-50 .icon-folder-2 {
 	height: 26px;
 	width: 26px;
 }
+.thumbnails-media .imgPreview a {
+	width: 100%;
+}
 .thumbnails-media .imgDelete a.close {
 	background-color: #bd362f;
 	border-color: #bd362f rgba(0,0,0,0.2) rgba(0,0,0,0.2) #bd362f;
@@ -7894,12 +7895,13 @@ ul.manager .height-50 .icon-folder-2 {
 .thumbnails-media .imgDetails {
 	position: absolute;
 	left: 0;
+	text-align: left;
 	background-color: #fff;
 	border-color: rgba(0,0,0,0.2);
 	bottom: 0;
 	line-height: 26px;
 	border: 1px solid rgba(0,0,0,0.1);
-	border-width: 1px 1px 0 0;
+	border-width: 1px;
 	border-radius: 0 3px 0 0;
 	z-index: 1;
 }
@@ -7954,6 +7956,10 @@ ul.manager .height-50 .icon-folder-2 {
 #mediamanager-form .thumbnails .imgTotal {
 	line-height: 120px;
 }
+#mediamanager-form .icon-search::before {
+	padding-right: 5px;
+	padding-left: 1px;
+}
 #mediamanager-form .height-50 {
 	background-color: #fafafa;
 	height: 77px;
diff --git a/administrator/templates/isis/html/com_media/medialist/thumbs_imgs.php b/administrator/templates/isis/html/com_media/medialist/thumbs_imgs.php
index 6e892117ed003..bac9b6ec5b9ec 100644
--- a/administrator/templates/isis/html/com_media/medialist/thumbs_imgs.php
+++ b/administrator/templates/isis/html/com_media/medialist/thumbs_imgs.php
@@ -36,9 +36,9 @@
 			</label>
 		</div>
 
- 		<div class="imgPreview">
-			<a href="<?php echo COM_MEDIA_BASEURL, '/', $img->path_relative; ?>" title="<?php echo $img->name; ?>" class="preview">
-				<span class="icon-search"> </span>
+ 		<div class="imgPreview nowrap small">
+			<a href="<?php echo COM_MEDIA_BASEURL, '/', $img->path_relative; ?>" title="<?php echo $img->name; ?>" class="preview truncate">
+				<span class="icon-search" aria-hidden="true"></span><?php echo $img->name; ?>
 			</a>
 		</div>
 	</li>
diff --git a/administrator/templates/isis/less/blocks/_media.less b/administrator/templates/isis/less/blocks/_media.less
index 94f0eb4ada597..8154a7c527117 100644
--- a/administrator/templates/isis/less/blocks/_media.less
+++ b/administrator/templates/isis/less/blocks/_media.less
@@ -45,10 +45,8 @@ ul.manager .height-50 .icon-folder-2 {
 		    }
 		}
 		*, *:before {
-	    	-webkit-transition: all 0.2s ease;
+			-webkit-transition: all 0.2s ease;
 			transition: all 0.2s ease;
-			-webkit-background-clip: padding-box;
-			background-clip: padding-box;
 			-webkit-box-sizing: border-box;
 			box-sizing: border-box;
 	    }
@@ -129,6 +127,9 @@ ul.manager .height-50 .icon-folder-2 {
 	    height: 26px;
 	    width: 26px;
 	}
+	.imgPreview a {
+		width: 100%;
+	}
 	.imgDelete a.close {
 	    background-color: @btnDangerBackground;
 	    border-color: @btnDangerBackground rgba(0, 0, 0, 0.2) rgba(0, 0, 0, 0.2) @btnDangerBackground;
@@ -155,12 +156,13 @@ ul.manager .height-50 .icon-folder-2 {
 	.imgPreview a, .imgDetails {
 		position: absolute;
 		left:0;
+		text-align: left;
 	    background-color: #fff;
 	    border-color: rgba(0, 0, 0, 0.2);
 	    bottom: 0;
 	    line-height: 26px;
 		border: 1px solid rgba(0, 0, 0, 0.1);
-		border-width: 1px 1px 0 0; 
+		border-width: 1px; 
 		border-radius: 0 @inputBorderRadius 0 0;
 		z-index: 1;
 		&:hover {
@@ -221,7 +223,10 @@ ul.manager .height-50 .icon-folder-2 {
 			line-height: 120px;
 		}
 	}
-
+	.icon-search::before {
+		padding-right: 5px;
+		padding-left: 1px;
+	}
 	.height-50 {
 	    background-color: #fafafa;
 	    height: 77px;
diff --git a/administrator/templates/isis/less/template-rtl.less b/administrator/templates/isis/less/template-rtl.less
index f1580706e2f94..348c7639b60fb 100644
--- a/administrator/templates/isis/less/template-rtl.less
+++ b/administrator/templates/isis/less/template-rtl.less
@@ -368,6 +368,8 @@ a.grid_true {
 #mediamanager-form .thumbnails-media .thumbnail {
     margin-left: 18px !important;
     margin-right: 0;
+    direction: ltr;
+    text-align: center;
 }
 .thumbnails-media .imgThumb label::before, .thumbnails-media .imgThumb .imgThumbInside::before {
 	left: 0;
@@ -383,9 +385,14 @@ a.grid_true {
 }
 .thumbnails-media .imgPreview a, .thumbnails-media .imgDetails {
     border-radius: 3px 0;
-    border-width: 1px 0 0 1px;
-    left: auto;
+    border-width: 1px;
+    left: 0;
     right: 0;
+    text-align: left;
+    direction: ltr;
+}
+.thumbnails-media .imgPreview a {
+	width: 100%;
 }
 
 /* SubForms (Table) */