diff --git a/views/album.njk b/views/album.njk
index c765c52..e3795e2 100644
--- a/views/album.njk
+++ b/views/album.njk
@@ -61,15 +61,35 @@
       <div class="level-right">
         <p class="level-item">
           {% if not files.length -%}
-          <a class="button is-primary is-outlined" title="There are no files in the album" disabled>Download album</a>
+          <a class="button is-primary is-outlined" disabled>
+            <span class="icon">
+              <i class="icon-cancel"></i>
+            </span>
+            <span>Empty album</span>
+          </a>
           {%- elif album.downloadLink -%}
             {%- if usingCDN -%}
-            <a class="button is-primary is-outlined" title="Be aware that album archive may be cached by CDN" href="../{{ album.downloadLink }}">Download album</a>
+            <a class="button is-primary is-outlined" title="Be aware that album archive may be cached by CDN" href="../{{ album.downloadLink }}">
+              <span class="icon">
+                <i class="icon-download"></i>
+              </span>
+              <span>Download album</span>
+            </a>
             {%- else -%}
-            <a class="button is-primary is-outlined" href="../{{ album.downloadLink }}">Download album</a>
+            <a class="button is-primary is-outlined" href="../{{ album.downloadLink }}">
+              <span class="icon">
+                <i class="icon-download"></i>
+              </span>
+              <span>Download album</span>
+            </a>
             {%- endif -%}
           {%- else -%}
-          <a class="button is-primary is-outlined" title="The album's owner has chosen to disable download" disabled>Download disabled</a>
+          <a class="button is-primary is-outlined" disabled>
+            <span class="icon">
+              <i class="icon-cancel"></i>
+            </span>
+            <span>Download disabled</span>
+          </a>
           {%- endif %}
         </p>
       </div>
diff --git a/views/player.njk b/views/player.njk
index 30f9ba0..e3ea8b5 100644
--- a/views/player.njk
+++ b/views/player.njk
@@ -54,7 +54,12 @@
 
       <div class="level-right">
         <p class="level-item">
-          <a id="downloadBtn" class="button is-primary is-outlined">Download video</a>
+          <a id="downloadBtn" class="button is-primary is-outlined">
+            <span class="icon">
+              <i class="icon-download"></i>
+            </span>
+            <span>Download media</span>
+          </a>
         </p>
       </div>
     </nav>
@@ -63,14 +68,13 @@
     <form id="inputForm">
       <div class="field has-addons">
         <div class="control is-expanded">
-          <input id="identifier" name="identifier" class="input" type="text" placeholder="Upload's name" minlength="1">
+          <input id="identifier" name="identifier" class="input" type="text" placeholder="Upload's file name" minlength="1">
         </div>
         <div class="control">
           <button id="reloadBtn" class="button is-info is-outlined">
             <span class="icon">
               <i class="icon-arrows-cw"></i>
             </span>
-            <span>Reload</span>
           </button>
         </div>
       </div>
@@ -80,9 +84,8 @@
 
     <article class="message">
       <div class="message-body">
-        <p>This is an experimental embedded video player using <a href="https://github.com/videojs/video.js" target="_blank" rel="noopener">Video.js</a>.</p>
-        <p>This only allows you to play video uploads that you can play directly on your browser in the first place.</p>
-        <p>Thus there is no additional support for other formats such as MKV.</p>
+        <p>This is an experimental embedded media player using <a href="https://github.com/videojs/video.js" target="_blank" rel="noopener">Video.js</a>.</p>
+        <p>This only allows you to play media uploads that you can play directly on your browser in the first place, and thus there is no additional support for other formats such as MKV.</p>
       </div>
     </article>
   </div>