diff --git a/koha-tmpl/intranet-tmpl/prog/css/mainpage.css b/koha-tmpl/intranet-tmpl/prog/css/mainpage.css
index 4496ceb860..a2e6cdc9c1 100644
--- a/koha-tmpl/intranet-tmpl/prog/css/mainpage.css
+++ b/koha-tmpl/intranet-tmpl/prog/css/mainpage.css
@@ -75,11 +75,9 @@ ul.biglinks-list li a.icon_general {
     display: block;
     box-sizing: content-box;
     max-width : 320px;
-    height: 46px;
+    min-height: 2em;
     margin: 0 1em 14px 0;
-    padding-left:57px;
-    padding-top:5px;
-
+    padding: 5px;
     border: solid 2px #b9d8d9;
     border-radius: 6px;
 
@@ -90,8 +88,6 @@ ul.biglinks-list li a.icon_general {
     color: #000000;
 
     background-color:#f4f8f9;
-    background-position: 5px 3px;
-    background-repeat:no-repeat;
 }
 
 ul.biglinks-list li a:hover.icon_general {
@@ -100,17 +96,29 @@ ul.biglinks-list li a:hover.icon_general {
     border-color: #538200;
 }
 
-/* CSS Font Awesome */
-ul.biglinks-list .fa, ul.biglinks-list img {
-    position: absolute;
-    left: 1em;
+ul.biglinks-list li a.icon_general .fa-fw {
     font-size: 1.5em;
+    margin-right:.2em;
+}
+
+ul.biglinks-list li a.icon_general .fa-stack-2x {
+    font-size: 1.3em;
+}
+
+ul.biglinks-list li a.icon_general .fa-stack-1x {
+    color: #999;
+    font-size: .9em;
+    left: -5px;
+    top: -1px;
+}
+
+/* CSS Font Awesome */
+ul.biglinks-list img {
     width: 35px;
 }
 
 /* ==== MODULE LINKS - End ==== */
 
-
 /* ==== PENDING - Start ==== */
 #area-pending {
     /* Block containing links to pending tags, comments and suggestions */
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
index a5ffbce7a7..47d8891a00 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
@@ -57,41 +57,53 @@
                         <ul class="biglinks-list">
                             [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
                             <li>
-                                <a class="icon_general icon_circulation" href="/cgi-bin/koha/circ/circulation-home.pl"><i class="fa fa-exchange"></i>Circulation</a>
+                                <a class="icon_general icon_circulation" href="/cgi-bin/koha/circ/circulation-home.pl"><i class="fa fa-fw fa-exchange"></i>Circulation</a>
                             </li>
                             [% END %]
 
                             [% IF CAN_user_borrowers_edit_borrowers %]
                             <li>
-                                <a class="icon_general icon_patrons" href="/cgi-bin/koha/members/members-home.pl"><i class="fa fa-id-card-o"></i>Patrons</a>
+                                <a class="icon_general icon_patrons" href="/cgi-bin/koha/members/members-home.pl"><i class="fa fa-fw fa-id-card-o"></i>Patrons</a>
                             </li>
                             [% END %]
 
                             [% IF ( CAN_user_catalogue ) %]
                             <li>
-                                <a class="icon_general icon_search" href="/cgi-bin/koha/catalogue/search.pl"><i class="fa fa-search"></i>Advanced search</a>
+                                <a class="icon_general icon_search" href="/cgi-bin/koha/catalogue/itemsearch.pl">
+                                    <span class="fa-stack">
+                                        <i class="fa fa-fw fa-book fa-stack-1x"></i>
+                                        <i class="fa fa-fw fa-search fa-stack-2x"></i>
+                                    </span>
+                                    Advanced search
+                                </a>
                             </li>
                             <li>
-                                <a class="icon_general icon_search" href="/cgi-bin/koha/catalogue/itemsearch.pl"><i class="fa fa-search"></i>Item search</a>
+                                <a class="icon_general icon_search" href="/cgi-bin/koha/catalogue/itemsearch.pl">
+                                    <span class="fa-stack">
+                                        <i class="fa fa-fw fa-list fa-stack-1x"></i>
+                                        <i class="fa fa-fw fa-search fa-stack-2x"></i>
+                                    </span>
+                                    Item search
+                                </a>
                             </li>
                             [% END %]
 
                             <li>
-                                <a class="icon_general icon_lists" href="/cgi-bin/koha/virtualshelves/shelves.pl"><i class="fa fa-list-alt"></i>Lists</a>
+                                <a class="icon_general icon_lists" href="/cgi-bin/koha/virtualshelves/shelves.pl"><i class="fa fa-fw fa-list-alt"></i>Lists</a>
                             </li>
 
                             [% IF ( UseCourseReserves ) %]
                                 <li>
-                                    <a class="icon_general icon_course_reserves" href="/cgi-bin/koha/course_reserves/course-reserves.pl"><i class="fa fa-book"></i>Course reserves</a>
+                                    <a class="icon_general icon_course_reserves" href="/cgi-bin/koha/course_reserves/course-reserves.pl"><i class="fa fa-fw fa-book"></i>Course reserves</a>
                                 </li>
                             [% END %]
 
                             <li>
-                                <a class="icon_general icon_authorities" href="/cgi-bin/koha/authorities/authorities-home.pl"><i class="fa fa-link"></i>Authorities</a>
+                                <a class="icon_general icon_authorities" href="/cgi-bin/koha/authorities/authorities-home.pl"><i class="fa fa-fw fa-link"></i>Authorities</a>
                             </li>
                             [% IF Koha.Preference('ILLModule') && CAN_user_ill %]
                             <li>
-                                <a class="icon_general icon_ill" href="/cgi-bin/koha/ill/ill-requests.pl"><i class="fa fa-retweet"></i>ILL requests</a>
+                                <a class="icon_general icon_ill" href="/cgi-bin/koha/ill/ill-requests.pl"><i class="fa fa-fw fa-retweet"></i>ILL requests</a>
                             </li>
                             [% END %]
                         </ul>
@@ -101,50 +113,50 @@
 
                             [% IF ( Koha.Preference('EnablePointOfSale') && Koha.Preference('UseCashRegisters') && CAN_user_cash_management_takepayment ) %]
                             <li>
-                                <a class="icon_general icon_pos" href="/cgi-bin/koha/pos/pay.pl"><i class="fa fa-shopping-cart"></i>Point of sale</a>
+                                <a class="icon_general icon_pos" href="/cgi-bin/koha/pos/pay.pl"><i class="fa fa-fw fa-shopping-cart"></i>Point of sale</a>
                             </li>
                             [% END %]
 
                             [% IF ( CAN_user_editcatalogue_edit_catalogue || CAN_user_editcatalogue_edit_items ) %]
                             <li>
-                                <a class="icon_general icon_cataloging" href="/cgi-bin/koha/cataloguing/addbooks.pl"><i class="fa fa-tag"></i>Cataloging</a>
+                                <a class="icon_general icon_cataloging" href="/cgi-bin/koha/cataloguing/addbooks.pl"><i class="fa fa-fw fa-tag"></i>Cataloging</a>
                             </li>
                             [% END %]
 
                             [% IF ( CAN_user_serials ) %]
                             <li>
-                                <a class="icon_general icon_serials" href="/cgi-bin/koha/serials/serials-home.pl"><i class="fa fa-newspaper-o"></i>Serials</a>
+                                <a class="icon_general icon_serials" href="/cgi-bin/koha/serials/serials-home.pl"><i class="fa fa-fw fa-newspaper-o"></i>Serials</a>
                                 <span class="biglink"></span>
                             </li>
                             [% END %]
 
                             [% IF ( CAN_user_acquisition ) %]
                             <li>
-                                <a class="icon_general icon_acquisitions" href="/cgi-bin/koha/acqui/acqui-home.pl"><i class="fa fa-gift"></i>Acquisitions</a>
+                                <a class="icon_general icon_acquisitions" href="/cgi-bin/koha/acqui/acqui-home.pl"><i class="fa fa-fw fa-gift"></i>Acquisitions</a>
                                 <span class="biglink"></span>
                             </li>
                             [% END %]
 
                             [% IF ( CAN_user_reports ) %]
                             <li>
-                                <a class="icon_general icon_reports" href="/cgi-bin/koha/reports/reports-home.pl"><i class="fa fa-pie-chart"></i>Reports</a>
+                                <a class="icon_general icon_reports" href="/cgi-bin/koha/reports/reports-home.pl"><i class="fa fa-fw fa-pie-chart"></i>Reports</a>
                             </li>
                             [% END %]
 
 
                             [% IF ( CAN_user_tools ) %]
                             <li>
-                                <a class="icon_general icon_tools" href="/cgi-bin/koha/tools/tools-home.pl"><i class="fa fa-wrench"></i>Tools</a>
+                                <a class="icon_general icon_tools" href="/cgi-bin/koha/tools/tools-home.pl"><i class="fa fa-fw fa-wrench"></i>Tools</a>
                             </li>
                             [% END %]
 
                             [% IF ( CAN_user_parameters ) %]
                             <li>
-                                <a class="icon_general icon_administration" href="/cgi-bin/koha/admin/admin-home.pl"><i class="fa fa-cogs"></i>Koha administration</a>
+                                <a class="icon_general icon_administration" href="/cgi-bin/koha/admin/admin-home.pl"><i class="fa fa-fw fa-cogs"></i>Koha administration</a>
                             </li>
                             [% END %]
                             <li>
-                                <a class="icon_general icon_koha" href="/cgi-bin/koha/about.pl">About Koha<img src="[% interface | html %]/[% theme | html %]/img/koha-egg.svg" alt="Koha Logo SVG"/></a>
+                                <a class="icon_general icon_koha" href="/cgi-bin/koha/about.pl"><img src="[% interface | html %]/[% theme | html %]/img/koha-egg.svg" alt="Koha Logo SVG"/> About Koha</a>
                             </li>
                         </ul>
                     </div> <!-- /.col-sm-6 -->