diff --git a/inc/Init.class.php b/inc/Init.class.php
index 2683beba..18340364 100644
--- a/inc/Init.class.php
+++ b/inc/Init.class.php
@@ -676,11 +676,7 @@ class Init
      */
     private static function selectTheme()
     {
-        if (!empty(Session::getTheme())){
-            self::$_THEME = Session::getTheme();
-        } else {
-            self::$_THEME = Config::getValue('sitetheme', 'default');
-            Session::setTheme(self::$_THEME);
-        }
+        self::$_THEME = Config::getValue('sitetheme', 'default');
+        Session::setTheme(self::$_THEME);
     }
 }
\ No newline at end of file
diff --git a/inc/themes/default/js/js.php b/inc/themes/default/js/js.php
index 8306494b..b8375446 100644
--- a/inc/themes/default/js/js.php
+++ b/inc/themes/default/js/js.php
@@ -24,5 +24,5 @@
  */
 
 $jsFilesTheme = array(
-    array("href" => "js/functions.js", "min" => true)
+    array('href' => $themeUri . '/js/functions.js', 'min' => true)
 );
\ No newline at end of file
diff --git a/inc/themes/material-blue/css/MaterialIcons-Regular.eot b/inc/themes/material-blue/css/MaterialIcons-Regular.eot
new file mode 100644
index 00000000..b9029226
Binary files /dev/null and b/inc/themes/material-blue/css/MaterialIcons-Regular.eot differ
diff --git a/inc/themes/material-blue/css/MaterialIcons-Regular.ttf b/inc/themes/material-blue/css/MaterialIcons-Regular.ttf
new file mode 100644
index 00000000..0768c78c
Binary files /dev/null and b/inc/themes/material-blue/css/MaterialIcons-Regular.ttf differ
diff --git a/inc/themes/material-blue/css/MaterialIcons-Regular.woff b/inc/themes/material-blue/css/MaterialIcons-Regular.woff
new file mode 100644
index 00000000..3a08d45e
Binary files /dev/null and b/inc/themes/material-blue/css/MaterialIcons-Regular.woff differ
diff --git a/inc/themes/material-blue/css/MaterialIcons-Regular.woff2 b/inc/themes/material-blue/css/MaterialIcons-Regular.woff2
new file mode 100644
index 00000000..b1ffe8cf
Binary files /dev/null and b/inc/themes/material-blue/css/MaterialIcons-Regular.woff2 differ
diff --git a/inc/themes/material-blue/css/css.php b/inc/themes/material-blue/css/css.php
index af62dadf..d47325a0 100644
--- a/inc/themes/material-blue/css/css.php
+++ b/inc/themes/material-blue/css/css.php
@@ -24,12 +24,13 @@
  */
 
 $cssFilesTheme = array(
-    array('href' => 'https://fonts.googleapis.com/icon?family=Material+Icons', 'min' => false),
+//    array('href' => 'https://fonts.googleapis.com/icon?family=Material+Icons', 'min' => false),
     array('href' => 'http://fonts.googleapis.com/css?family=Roboto:300,400,500,700', 'min' => false),
+    array('href' => $themeUri . '/css/fonts.css', 'min' => true),
     array('href' => $themeUri . '/css/material.min.css', 'min' => false),
     array('href' => $themeUri . '/css/material-blue.min.css', 'min' => false),
     array('href' => $themeUri . '/css/material-custom.css', 'min' => true),
-    array('href' => $themeUri . '/css/styles.css', 'min' => false),
+    array('href' => $themeUri . '/css/styles.css', 'min' => true),
     array('href' => $themeUri . '/css/search-grid.css', 'min' => true)
 
 );
\ No newline at end of file
diff --git a/inc/themes/material-blue/css/fonts.css b/inc/themes/material-blue/css/fonts.css
new file mode 100644
index 00000000..5fb6ff10
--- /dev/null
+++ b/inc/themes/material-blue/css/fonts.css
@@ -0,0 +1,11 @@
+@font-face {
+    font-family: 'Material Icons';
+    font-style: normal;
+    font-weight: 400;
+    src: url("../inc/themes/material-blue/css/MaterialIcons-Regular.eot"); /* For IE6-8 */
+    src: local('Material Icons'),
+    local('MaterialIcons-Regular'),
+    url("../inc/themes/material-blue/css/MaterialIcons-Regular.woff2") format('woff2'),
+    url("../inc/themes/material-blue/css/MaterialIcons-Regular.woff") format('woff'),
+    url("../inc/themes/material-blue/css/MaterialIcons-Regular.ttf") format('truetype');
+}
\ No newline at end of file
diff --git a/inc/themes/material-blue/css/material-custom.css b/inc/themes/material-blue/css/material-custom.css
index 9ceef274..ae6bbe9c 100644
--- a/inc/themes/material-blue/css/material-custom.css
+++ b/inc/themes/material-blue/css/material-custom.css
@@ -1,8 +1,35 @@
+.material-icons {
+    font-family: 'Material Icons';
+    font-weight: normal;
+    font-style: normal;
+    font-size: 24px;  /* Preferred icon size */
+    display: inline-block;
+    width: 1em;
+    height: 1em;
+    line-height: 1;
+    text-transform: none;
+    letter-spacing: normal;
+    word-wrap: normal;
+
+    /* Support for all WebKit browsers. */
+    -webkit-font-smoothing: antialiased;
+    /* Support for Safari and Chrome. */
+    text-rendering: optimizeLegibility;
+
+    /* Support for Firefox. */
+    -moz-osx-font-smoothing: grayscale;
+
+    /* Support for IE. */
+    font-feature-settings: 'liga';
+}
+
 .material-icons.md-18 { font-size: 18px; }
 .material-icons.md-24 { font-size: 24px; }
 .material-icons.md-36 { font-size: 36px; }
 .material-icons.md-48 { font-size: 48px; }
 
+.material-icons.blue80 {color: rgba(83, 109, 254, .8)}
+
 .material-icons.md-dark { color: rgba(0, 0, 0, 0.54); }
 .material-icons.md-dark.md-inactive { color: rgba(0, 0, 0, 0.26); }
 
diff --git a/inc/themes/material-blue/menu.inc b/inc/themes/material-blue/menu.inc
index 18804990..95329775 100644
--- a/inc/themes/material-blue/menu.inc
+++ b/inc/themes/material-blue/menu.inc
@@ -9,7 +9,7 @@
                 <?php continue; ?>
             <?php endif; ?>
 
-            <button class="mdl-button mdl-js-button mdl-button--fab mdl-js-ripple-effect" title="<?php echo _($action['title']); ?>" OnClick="doAction(<?php echo $action['name']; ?>)">
+            <button class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-js-ripple-effect" title="<?php echo _($action['title']); ?>" OnClick="doAction(<?php echo $action['name']; ?>)">
                 <i class="material-icons"><?php echo $action['icon']; ?></i>
             </button>
         <?php endforeach; ?>
diff --git a/inc/themes/material-blue/search.inc b/inc/themes/material-blue/search.inc
index b703e202..c928ecb8 100644
--- a/inc/themes/material-blue/search.inc
+++ b/inc/themes/material-blue/search.inc
@@ -102,14 +102,14 @@
                         <div class="account-actions round">
 
                             <?php if ($account['showView']): ?>
-                                <i class="material-icons" title="<?php echo _('Detalles de Cuenta'); ?>"
+                                <i class="material-icons blue80" title="<?php echo _('Detalles de Cuenta'); ?>"
                                    OnClick="doAction(<?php echo \SP\Controller\ActionsInterface::ACTION_ACC_VIEW; ?>,<?php echo \SP\Controller\ActionsInterface::ACTION_ACC_SEARCH; ?>,<?php echo $account['id']; ?>)">visibility</i>
                             <?php endif ?>
 
                             <?php if ($account['showViewPass']): ?>
-                                <i id="viewpass" class="material-icons" title="<?php echo _('Ver Clave'); ?>"
+                                <i id="viewpass" class="material-icons blue80" title="<?php echo _('Ver Clave'); ?>"
                                    onClick="viewPass(<?php echo $account['id']; ?>, 1)">lock_open</i>
-                                <i id="clipboard" class="material-icons actions-optional clip-pass-button"
+                                <i id="clipboard" class="material-icons blue80 actions-optional clip-pass-button"
                                    data-clipboard-target="clip-pass-text"
                                    title="<?php echo _('Copiar Clave en Portapapeles'); ?>"
                                    onmousedown="viewPass(<?php echo $account['id']; ?>, false)">content_paste</i>
@@ -121,19 +121,19 @@
                             <?php endif ?>
 
                             <?php if ($account['showEdit']): ?>
-                                <i class="material-icons actions-optional"
+                                <i class="material-icons blue80 actions-optional"
                                    title="<?php echo _('Modificar Cuenta'); ?>"
                                    OnClick="doAction(<?php echo \SP\Controller\ActionsInterface::ACTION_ACC_EDIT; ?>,<?php echo \SP\Controller\ActionsInterface::ACTION_ACC_SEARCH; ?>,<?php echo $account['id']; ?>)">mode_edit</i>
                             <?php endif; ?>
 
                             <?php if ($account['showCopy']): ?>
-                                <i class="material-icons actions-optional"
+                                <i class="material-icons blue80 actions-optional"
                                    title="<?php echo _('Copiar Cuenta'); ?>"
                                    OnClick="doAction(<?php echo \SP\Controller\ActionsInterface::ACTION_ACC_COPY; ?>,<?php echo \SP\Controller\ActionsInterface::ACTION_ACC_SEARCH; ?>,<?php echo $account['id']; ?>)">content_copy</i>
                             <?php endif; ?>
 
                             <?php if ($account['showDel']): ?>
-                                <i class="material-icons actions-optional"
+                                <i class="material-icons blue80 actions-optional"
                                    title="<?php echo _('Eliminar Cuenta'); ?>"
                                    OnClick="doAction(<?php echo \SP\Controller\ActionsInterface::ACTION_ACC_DELETE; ?>,<?php echo \SP\Controller\ActionsInterface::ACTION_ACC_SEARCH; ?>,<?php echo $account['id']; ?>)">delete</i>
                             <?php endif; ?>