diff --git a/app/assets/javascripts/user/app/templates/global/_side_menu.emblem b/app/assets/javascripts/user/app/templates/global/_side_menu.emblem
index e5e738fa..474efd2c 100644
--- a/app/assets/javascripts/user/app/templates/global/_side_menu.emblem
+++ b/app/assets/javascripts/user/app/templates/global/_side_menu.emblem
@@ -24,14 +24,15 @@
           =link-to 'join_requests'
             span= t 'models.plural.join_request'
     li
-      =link-to 'lists' class="side-menu-lists"
-        span= t 'models.plural.list'
+      = link-to 'lists' class="side-menu-lists"
+        span.icon.lists
+        = t 'models.plural.list'
     li
-      =link-to 'settings'
+      = link-to 'settings'
         span.icon.settings
-        span= t 'settings.title'
+        = t 'settings.title'
     li
-      =link-to 'about' class="side-menu-about"
+      = link-to 'about' class="side-menu-about"
         span.about-mozo-icon
         span=t 'about.title'
     li.hide
diff --git a/app/assets/stylesheets/user/foundation/_qproduct_orders.sass b/app/assets/stylesheets/user/foundation/_qproduct_orders.sass
index bb5e9abb..a41d284f 100644
--- a/app/assets/stylesheets/user/foundation/_qproduct_orders.sass
+++ b/app/assets/stylesheets/user/foundation/_qproduct_orders.sass
@@ -13,7 +13,6 @@ ul.product-orders
       //+button-size($padding:$button-tny)
       margin-left: 5px
       .icon
-        @extend .fa
         @extend .fa-times
 .order-selected-products-button
   float: right
diff --git a/app/assets/stylesheets/user/foundation/_structure.sass b/app/assets/stylesheets/user/foundation/_structure.sass
index bedcfdde..ea3901f0 100644
--- a/app/assets/stylesheets/user/foundation/_structure.sass
+++ b/app/assets/stylesheets/user/foundation/_structure.sass
@@ -30,15 +30,6 @@ body
   //-webkit-transform: translateZ(0px)
   .main-section-content
     //nothing
-span.icon
-  @extend .fa
-  @extend .fa-lg
-  &.needs-help
-    @extend .fa-bell
-  &.needs-payment
-    @extend .fa-money
-  &.scan-qr
-    @extend .fa-qrcode
 #notice
   a
     color: white
diff --git a/app/assets/stylesheets/user/foundation/components/_icons.sass b/app/assets/stylesheets/user/foundation/components/_icons.sass
new file mode 100644
index 00000000..b2143280
--- /dev/null
+++ b/app/assets/stylesheets/user/foundation/components/_icons.sass
@@ -0,0 +1,16 @@
+span.icon
+  @extend .fa
+  &.settings
+    @extend .fa-gears
+  &.needs-help
+    @extend .fa-bell
+  &.needs-payment
+    @extend .fa-money
+  &.scan-qr
+    @extend .fa-qrcode
+  &.lists
+    @extend .fa-sticky-note-o
+
+ul.product-orders
+  span.icon
+    @extend .fa-lg
diff --git a/app/assets/stylesheets/user/foundation/components/_nav_side.sass b/app/assets/stylesheets/user/foundation/components/_nav_side.sass
index 8f4739f2..0f35817d 100644
--- a/app/assets/stylesheets/user/foundation/components/_nav_side.sass
+++ b/app/assets/stylesheets/user/foundation/components/_nav_side.sass
@@ -40,10 +40,10 @@ $side-menu-width: 222px
     margin-right: 18px
     @extend .fa
     @extend .fa-list
-  .settings-icon
+  .icon.settings
+    margin-right: 18px
+  .icon.lists
     margin-right: 18px
-    @extend .fa
-    @extend .fa-gears
   .about-mozo-icon
     margin-right: 18px
     @extend .fa
diff --git a/app/assets/stylesheets/user/foundation/foundation_and_overrides.sass b/app/assets/stylesheets/user/foundation/foundation_and_overrides.sass
index c2546ede..7274d26e 100644
--- a/app/assets/stylesheets/user/foundation/foundation_and_overrides.sass
+++ b/app/assets/stylesheets/user/foundation/foundation_and_overrides.sass
@@ -1,5 +1,5 @@
 @mixin button-icon-only
-  padding: 2px 5px
+  padding: 5px
   margin: 0
 // Foundation by ZURB
 // foundation.zurb.com