diff --git a/src/admin/class-tainacan-admin.php b/src/admin/class-tainacan-admin.php
index e4ac9fda4..16836257e 100644
--- a/src/admin/class-tainacan-admin.php
+++ b/src/admin/class-tainacan-admin.php
@@ -67,7 +67,8 @@ class Admin {
 	function add_theme_files() {
 		global $TAINACAN_BASE_URL;
 		
-		wp_enqueue_style( 'style', $TAINACAN_BASE_URL . '/assets/css/fonts/materialdesignicons.css' );
+		// wp_enqueue_style( 'style', $TAINACAN_BASE_URL . '/assets/css/fonts/materialdesignicons.css' );
+		wp_enqueue_style( 'style', $TAINACAN_BASE_URL . '/assets/css/fonts/tainacanicons.css' );
 		wp_enqueue_script('underscore', includes_url('js') . '/underscore.min.js' );
 	}
 	
diff --git a/src/admin/pages/lists/items-page.vue b/src/admin/pages/lists/items-page.vue
index bad7320ec..b4a9d3416 100644
--- a/src/admin/pages/lists/items-page.vue
+++ b/src/admin/pages/lists/items-page.vue
@@ -1446,7 +1446,7 @@
         top: 120px;
         left: 0;
         max-width: 23px;
-        height: 24px;
+        height: 26px;
         width: 23px;
         border: none;
         background-color: $turquoise1;
@@ -1469,7 +1469,7 @@
             max-width: 100%;
             width: auto;
             padding: 3px 6px 3px 0px;
-            height: 24px;
+            height: 26px;
 
             .icon {
                 position: relative;
@@ -1514,7 +1514,8 @@
         }
 
         .button {
-            align-items: inherit;
+            display: flex;
+            align-items: center;
         }
         
         .field {
@@ -1547,10 +1548,10 @@
                     overflow: auto;
                 }
                 .dropdown-item {
-                    padding: 0.25rem 1.0rem 0.25rem 0.75rem;
+                    padding: 0.25rem 1.0rem 0.25rem 0.75rem; 
                 }
                 .dropdown-item span{
-                    vertical-align: sub;
+                    vertical-align: middle;
                 }      
                 .dropdown-item-apply {
                     width: 100%;
diff --git a/src/admin/pages/lists/term-items-page.vue b/src/admin/pages/lists/term-items-page.vue
index 9bfda464b..c8c446663 100644
--- a/src/admin/pages/lists/term-items-page.vue
+++ b/src/admin/pages/lists/term-items-page.vue
@@ -1404,7 +1404,7 @@
         top: 120px;
         left: 0;
         max-width: 23px;
-        height: 21px;
+        height: 26px;
         width: 23px;
         border: none;
         background-color: $turquoise1;
@@ -1427,7 +1427,7 @@
             max-width: 100%;
             width: auto;
             padding: 3px 6px 3px 0px;
-            height: 24px;
+            height: 26px;
 
             .icon {
                 position: relative;
@@ -1472,7 +1472,8 @@
         }
 
         .button {
-            align-items: inherit;
+            display: flex;
+            align-items: center;
         }
         
         .field {
@@ -1509,7 +1510,7 @@
                     padding: 0.25rem 1.0rem 0.25rem 0.75rem;
                 }
                 .dropdown-item span{
-                    vertical-align: sub;
+                    vertical-align: middle;
                 }      
                 .dropdown-item-apply {
                     width: 100%;
diff --git a/src/admin/scss/_dropdown-and-autocomplete.scss b/src/admin/scss/_dropdown-and-autocomplete.scss
index b0a2e3aa6..6b7853866 100644
--- a/src/admin/scss/_dropdown-and-autocomplete.scss
+++ b/src/admin/scss/_dropdown-and-autocomplete.scss
@@ -2,9 +2,10 @@
     .dropdown-trigger{
         .button {
             border: none;
+            align-items: center;
             .icon {
                 color: $secondary;
-                align-items: start;
+                align-items: center;
             }
         }
         .button.is-primary, .button.is-secondary, .button.is-success {
diff --git a/src/admin/scss/_view-mode-slideshow.scss b/src/admin/scss/_view-mode-slideshow.scss
index 2a46b88b8..099c8d2f9 100644
--- a/src/admin/scss/_view-mode-slideshow.scss
+++ b/src/admin/scss/_view-mode-slideshow.scss
@@ -293,6 +293,9 @@
             border-radius: 100px;
             background: white;
             border: 3px solid $turquoise5;
+            i, i:before {
+                font-size: 36px;
+            }
         }
         &:focus, &:active {
             outline: 0;
@@ -300,8 +303,8 @@
         }
         .circular-counter {
             position: absolute;
-            right: calc(4.16667% + 1px);
-            top: -3px;
+            right: calc(4.16667% + -2px);
+            top: -6px;
         }
     }
 }
diff --git a/src/admin/theme-items-list.vue b/src/admin/theme-items-list.vue
index 260c52cf5..c534bd194 100644
--- a/src/admin/theme-items-list.vue
+++ b/src/admin/theme-items-list.vue
@@ -81,6 +81,10 @@ export default {
         .dropdown-menu {
             display: block;
         }
+        .dropdown .dropdown-trigger .button .icon, 
+        .autocomplete .dropdown-trigger .button .icon {
+            align-items: center;
+        }
         .b-radio.radio {
 
             input[type="radio"] + .check {
diff --git a/src/assets/504a4585a1e5feb8d4204edb766620a1.ttf b/src/assets/504a4585a1e5feb8d4204edb766620a1.ttf
deleted file mode 100644
index 609d309b6..000000000
Binary files a/src/assets/504a4585a1e5feb8d4204edb766620a1.ttf and /dev/null differ
diff --git a/src/theme-helper/class-tainacan-theme-helper.php b/src/theme-helper/class-tainacan-theme-helper.php
index 59b008e0c..5ae562855 100644
--- a/src/theme-helper/class-tainacan-theme-helper.php
+++ b/src/theme-helper/class-tainacan-theme-helper.php
@@ -60,35 +60,35 @@ class Theme_Helper {
 		$this->register_view_mode('table', [
 			'label' => __('Table', 'tainacan'),
 			'dynamic_metadata' => true,
-			'icon' => '<span class="icon"><i class="mdi mdi-view-list mdi-24px"></i></span>',
+			'icon' => '<span class="icon"><i class="tainacan-icon tainacan-icon-viewtable tainacan-icon-20px"></i></span>',
 			'type' => 'component',
 		]);
 		$this->register_view_mode('cards', [
 			'label' => __('Cards', 'tainacan'),
 			'dynamic_metadata' => false,
 			'description' => 'A cards view, displaying title, description, author name and creation date.',
-			'icon' => '<span class="icon"><i class="mdi mdi-view-module mdi-24px"></i></span>',
+			'icon' => '<span class="icon"><i class="tainacan-icon tainacan-icon-viewcards tainacan-icon-20px"></i></span>',
 			'type' => 'component'
 		]);
 		$this->register_view_mode('records', [
 			'label' => __('Records', 'tainacan'),
 			'dynamic_metadata' => true,
 			'description' => 'A records view, similiar to cards, but flexible for metadata',
-			'icon' => '<span class="icon"><i class="mdi mdi-view-column mdi-24px"></i></span>',
+			'icon' => '<span class="icon"><i class="tainacan-icon tainacan-icon-viewrecords tainacan-icon-20px"></i></span>',
 			'type' => 'component'
 		]);
 		$this->register_view_mode('masonry', [
 			'label' => __('Masonry', 'tainacan'),
 			'dynamic_metadata' => false,
 			'description' => 'A masonry view, similar to pinterest, which will display images without cropping.',
-			'icon' => '<span class="icon"><i class="mdi mdi-view-dashboard mdi-24px"></i></span>',
+			'icon' => '<span class="icon"><i class="tainacan-icon tainacan-icon-viewmasonry tainacan-icon-20px"></i></span>',
 			'type' => 'component'
 		]);
 		$this->register_view_mode('slideshow', [
 			'label' => __('Slideshow', 'tainacan'),
 			'dynamic_metadata' => false,
 			'description' => 'A fullscreen slideshow view.',
-			'icon' => '<span class="icon"><i class="mdi mdi-fullscreen mdi-24px"></i></span>',
+			'icon' => '<span class="icon"><i class="tainacan-icon tainacan-icon-gallery tainacan-icon-20px"></i></span>',
 			'type' => 'component',
 			'show_pagination' => false,
 			'full_screen' => true
diff --git a/src/theme-helper/view-mode-slideshow.vue b/src/theme-helper/view-mode-slideshow.vue
index 1a2e2fcbe..1203f3b5c 100644
--- a/src/theme-helper/view-mode-slideshow.vue
+++ b/src/theme-helper/view-mode-slideshow.vue
@@ -12,7 +12,7 @@
                 :class="{ 'is-hidden-mobile': !isMetadataCompressed }"
                 @click="closeSlideViewMode()">
             <span class="icon">
-                <i class="tainacan-icon tainacan-icon-close"/>
+                <i class="tainacan-icon tainacan-icon-20px tainacan-icon-close"/>
             </span>
         </button>
 
@@ -28,7 +28,7 @@
             <span class="icon">
                 <i 
                         :class="{ 'tainacan-icon-arrowright' : isMetadataCompressed, 'tainacan-icon-arrowleft' : !isMetadataCompressed }"
-                        class="has-text-secondary tainacan-icon tainacan-icon-20px"/>
+                        class="tainacan-icon tainacan-icon-20px"/>
             </span>
         </button>
 
@@ -42,7 +42,7 @@
                         id="close-metadata-button"
                         @click="isMetadataCompressed = true">
                     <span class="icon">
-                        <i class="tainacan-icon tainacan-icon-close"/>
+                        <i class="tainacan-icon tainacan-icon-20px tainacan-icon-close"/>
                     </span>
                 </button>
                 <hr>
@@ -58,7 +58,7 @@
                 <span class="icon">
                     <i 
                             :class="{ 'tainacan-icon-arrowdown' : collapseAll, 'tainacan-icon-arrowright' : !collapseAll}"
-                            class="has-text-secondary tainacan-icon tainacan-icon-20px"/>
+                            class="tainacan-icon tainacan-icon-20px"/>
                 </span>
             </a>
 
@@ -180,7 +180,7 @@
                             <span class="icon">
                                 <i 
                                         :class="{ 'tainacan-icon-pause' : isPlaying, 'tainacan-icon-playfill' : !isPlaying }"
-                                        class="has-text-secondary tainacan-icon"/>
+                                        class="has-text-secondary tainacan-icon tainacan-icon-30px"/>
                             </span>
                             <circular-counter 
                                     v-if="isPlaying"
diff --git a/webpack.config.js b/webpack.config.js
index 280149753..0c84f8ac9 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -34,7 +34,7 @@ module.exports = {
                 exclude: /node_modules/,
             },
             {
-                test: /\.(png|jpg|jpeg|gif|eot|ttf|woff|woff2|svg|svgz)(\?.+)?$/,
+                test: /\.(png|jpg|jpeg|gif|eot|ttf|otf|woff|woff2|svg|svgz)(\?.+)?$/,
                 loader: 'file-loader'
             },
             {