diff --git a/src/components/media_modal/media_modal.vue b/src/components/media_modal/media_modal.vue
index 8cd183ec..427bf12b 100644
--- a/src/components/media_modal/media_modal.vue
+++ b/src/components/media_modal/media_modal.vue
@@ -8,8 +8,22 @@
       :controls="true"
       @click.stop.native="">
     </VideoAttachment>
-    <button :title="$t('media_modal.previous')" class="modal-view-button-arrow modal-view-button-arrow--prev" v-if="canNavigate" @click.stop.prevent="goPrev"></button>
-    <button :title="$t('media_modal.next')" class="modal-view-button-arrow modal-view-button-arrow--next" v-if="canNavigate" @click.stop.prevent="goNext"></button>
+    <button
+      :title="$t('media_modal.previous')"
+      class="modal-view-button-arrow modal-view-button-arrow--prev"
+      v-if="canNavigate"
+      @click.stop.prevent="goPrev"
+    >
+      <i class="icon-left-open arrow-icon" />
+    </button>
+    <button
+      :title="$t('media_modal.next')"
+      class="modal-view-button-arrow modal-view-button-arrow--next"
+      v-if="canNavigate"
+      @click.stop.prevent="goNext"
+    >
+      <i class="icon-right-open arrow-icon" />
+    </button>
   </div>
 </template>
 
@@ -30,71 +44,19 @@
   align-items: center;
   background-color: rgba(0, 0, 0, 0.5);
 
-  &-button-arrow {
-    position: absolute;
-    display: block;
-    top: 50%;
-    margin-top: -50px;
-    width: 70px;
-    height: 100px;
-    border: 0;
-    padding: 0;
-    opacity: 0;
-    box-shadow: none;
-    background: none;
-    appearance: none;
-    overflow: visible;
-    cursor: pointer;
-    transition: opacity 333ms cubic-bezier(.4,0,.22,1);
+  &:hover {
+    .modal-view-button-arrow {
+      opacity: 0.75;
 
-    &::before {
-      position: absolute;
-      top: 35px;
-      height: 30px;
-      width: 32px;
-      font-family: "fontello";
-      font-size: 14px;
-      line-height: 30px;
-      color: #FFF;
-      text-align: center;
-      background-color: rgba(0,0,0,.3);
-    }
-
-    &:hover,
-    &:focus {
-      outline: none;
-      box-shadow: none;
-    }
-
-    &#{&}#{&} {
+      &:focus,
+      &:hover {
+        outline: none;
+        box-shadow: none;
+      }
       &:hover {
         opacity: 1;
       }
     }
-    
-    &--prev {
-      left: 0;
-
-      &::before {
-        left: 6px;
-        content: '\e80e';
-      }
-    }
-      
-    &--next {
-      right: 0;
-
-      &::before {
-        right: 6px;
-        content: '\e80d';
-      }
-    }
-  }
-
-  &:hover {
-    .modal-view-button-arrow {
-      opacity: .75;
-    }
   }
 }
 
@@ -103,4 +65,49 @@
   max-height: 90%;
   box-shadow: 0px 5px 15px 0 rgba(0, 0, 0, 0.5);
 }
+
+.modal-view-button-arrow {
+  position: absolute;
+  display: block;
+  top: 50%;
+  margin-top: -50px;
+  width: 70px;
+  height: 100px;
+  border: 0;
+  padding: 0;
+  opacity: 0;
+  box-shadow: none;
+  background: none;
+  appearance: none;
+  overflow: visible;
+  cursor: pointer;
+  transition: opacity 333ms cubic-bezier(.4,0,.22,1);
+
+  .arrow-icon {
+    position: absolute;
+    top: 35px;
+    height: 30px;
+    width: 32px;
+    font-size: 14px;
+    line-height: 30px;
+    color: #FFF;
+    text-align: center;
+    background-color: rgba(0,0,0,.3);
+  }
+
+  &--prev {
+    left: 0;
+    .arrow-icon {
+      left: 6px;
+    }
+  }
+
+  &--next {
+    right: 0;
+    .arrow-icon {
+      right: 6px;
+    }
+  }
+}
+
 </style>