diff --git a/customize.dist/ckeditor-contents.css b/customize.dist/ckeditor-contents.css
index 663cd8cb9..0d5b5cff7 100644
--- a/customize.dist/ckeditor-contents.css
+++ b/customize.dist/ckeditor-contents.css
@@ -248,6 +248,9 @@ media-tag button.mediatag-download-btn > span {
 media-tag button.mediatag-download-btn * {
     width: auto;
 }
+media-tag button.mediatag-download-btn > span.mediatag-download-name {
+    max-width: 100%;
+}
 media-tag button.mediatag-download-btn > span.mediatag-download-name b {
     white-space: nowrap;
     overflow: hidden;
@@ -259,8 +262,12 @@ media-tag button.btn:hover, media-tag button.btn:active, media-tag button.btn:fo
 }
 media-tag button.btn b {
     margin-left: 5px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
 }
 media-tag button.btn .fa {
     display: inline;
     margin-right: 5px;
+    flex: 0;
 }
diff --git a/customize.dist/src/less2/include/markdown.less b/customize.dist/src/less2/include/markdown.less
index 677ec13a3..37fd4fce8 100644
--- a/customize.dist/src/less2/include/markdown.less
+++ b/customize.dist/src/less2/include/markdown.less
@@ -101,6 +101,9 @@
             }
             b {
                 margin-left: 5px;
+                white-space: nowrap;
+                overflow: hidden;
+                text-overflow: ellipsis;
             }
         }
     }
diff --git a/www/common/media-tag.js b/www/common/media-tag.js
index c328399c5..6755df5a2 100644
--- a/www/common/media-tag.js
+++ b/www/common/media-tag.js
@@ -149,6 +149,7 @@ var factory = function () {
     width: 0%;
 }
 .mediatag-progress-text {
+    font-size: 14px;
     height: 25px;
     width: 50px;
     margin-left: 5px;