From 2341e9542821840d634e207555efafebcc146aff Mon Sep 17 00:00:00 2001
From: Stephen Cameron <stephen@cubedesigners.com>
Date: Wed, 12 Jul 2017 18:20:11 +0200
Subject: [PATCH] Update icons, replace sharing icons and refactor share view.
 WIP #1501 @1.5

---
 images/interface.svg                | 72 ++++++++++++++++++++---------
 js/libs/fluidbook/fluidbook.menu.js | 41 +++++++++++-----
 js/libs/fluidbook/fluidbook.nav.js  |  4 +-
 style/fluidbook.less                | 15 +++---
 style/mmenu/mmenu.less              | 13 ++++--
 style/nav-horizontal.less           |  4 +-
 6 files changed, 98 insertions(+), 51 deletions(-)

diff --git a/images/interface.svg b/images/interface.svg
index 245cc32a..b7ab5936 100644
--- a/images/interface.svg
+++ b/images/interface.svg
@@ -1,61 +1,87 @@
 <svg xmlns="http://www.w3.org/2000/svg" style="display: none;">
 
-    <symbol id="interface-menu" viewBox="0 0 512 512">
-        <path d="m0 26l512 0 0 51-512 0z m0 204l512 0 0 52-512 0z m0 205l512 0 0 51-512 0z"/>
+    <symbol id="interface-chevron" viewBox="0 0 512 512">
+        <path d="m342 179l-175-174-62 62 178 177-178 198 62 65 240-266z"/>
     </symbol>
 
     <symbol id="interface-close" viewBox="0 0 512 512">
         <path d="m512 63l-66-63-190 193-193-193-63 63 193 193-193 190 63 66 193-193 190 193 66-66-193-190z"/>
     </symbol>
 
-
-    <symbol id="interface-chevron" viewBox="0 0 512 512">
-        <path d="m342 179l-175-174-62 62 178 177-178 198 62 65 240-266z"/>
+    <symbol id="interface-menu" viewBox="0 0 512 512">
+        <path d="m0 26l512 0 0 51-512 0z m0 204l512 0 0 52-512 0z m0 205l512 0 0 51-512 0z"/>
     </symbol>
 
+    <symbol id="interface-share" viewBox="0 0 512 512">
+        <path d="m143 440c-2 0-4 0-4 0-6-2-10-8-10-14l0-78-27 0c-30 0-55-24-55-55l0-164c0-31 25-55 55-55l308 0c30 0 55 24 55 55l0 164c0 31-25 55-55 55l-179 0-77 88c-2 2-7 4-11 4z m-41-338c-14 0-26 11-26 25l0 164c0 14 12 26 26 26l41 0c4 0 9 2 11 5 2 2 4 6 4 10l0 55 57-63c2-2 6-5 10-5l185 0c14 0 26-12 26-26l0-164c0-16-12-27-26-27z"/>
+    </symbol>
 
-    <symbol id="interface-search" viewBox="0 0 512 512">
-        <path d="m194 388c-52 0-101-20-137-57-76-75-76-199 0-274 36-37 85-57 137-57 52 0 101 20 137 57 76 76 76 199 0 274-36 37-85 57-137 57z m0-337c-38 0-74 15-101 42-55 56-55 146 0 202 27 27 63 42 101 42 38 0 74-15 101-42 56-56 56-146 0-202-27-27-63-42-101-42z m119 262l0 0z m173 199c-6 0-13-3-18-8l-170-169c-10-10-10-27 0-37 10-10 27-10 37 0l169 170c10 10 10 26 0 36-5 5-11 8-18 8z"/>
+    <symbol id="interface-bookmarks" viewBox="0 0 512 512">
+        <path d="m465 92l-51 0 0-16c0-8-6-15-15-15l-73 0c-9 0-15 7-15 15l0 16c-24 2-43 10-55 27-12-17-33-27-59-27l-150 0c-8 0-14 6-14 14l0 300c0 8 6 14 14 14l141 0c23 0 39 8 48 22 2 4 8 9 12 9 2 0 4 0 6-2 2 2 4 2 6 2 4 0 10-2 12-9 9-14 27-22 47-22l142 0c8 0 14-6 14-14l0-300c4-8-2-14-10-14z m-125-2l45 0 0 115-12-12c-2-3-6-5-11-5-4 0-8 2-10 5l-12 12z m-152 301l-127 0 0-270 136 0c28 0 45 16 45 45l0 240c-15-9-33-15-54-15z m263 0l-127 0c-21 0-39 6-54 17l0-242c0-29 15-43 41-45l0 119c0 6 4 10 8 12 7 2 13 0 17-4l26-27 27 27c2 2 6 4 10 4 2 0 4 0 7-2 6-2 8-8 8-12l0-117 37 0z"/>
     </symbol>
 
+    <symbol id="interface-chapters" viewBox="0 0 512 512">
+        <path d="m201 154l245 0c13 0 21-9 21-21 0-12-8-20-21-20l-245 0c-13 0-21 8-21 20 0 12 8 21 21 21z m245 82l-245 0c-13 0-21 8-21 20 0 12 8 20 21 20l245 0c13 0 21-8 21-20 0-12-10-20-21-20z m0 122l-245 0c-13 0-21 9-21 21 0 12 8 20 21 20l245 0c13 0 21-8 21-20 0-12-10-21-21-21z m-350-276c-26 0-51 22-51 51 0 29 25 51 51 51 27 0 51-22 51-51 0-29-22-51-51-51z m0 82c-16 0-30-14-30-31 0-16 14-31 30-31 17 0 31 15 31 31 0 17-12 31-31 31z m0 41c-28 0-51 22-51 51 0 29 25 51 51 51 27 0 51-22 51-51 0-29-22-51-51-51z m0 82c-16 0-30-15-30-31 0-16 14-31 30-31 17 0 31 15 31 31 0 16-12 31-31 31z m0 41c-28 0-51 22-51 51 0 29 25 51 51 51 27 0 51-22 51-51 0-29-22-51-51-51z m0 82c-16 0-30-15-30-31 0-17 14-31 30-31 17 0 31 14 31 31 0 16-12 31-31 31z"/>
+    </symbol>
 
-    <symbol id="interface-index" viewBox="0 0 512 512">
-        <path d="m315 243l-118 0c-9 0-17-7-17-16l0-148c0-9 8-16 17-16l118 0c9 0 17 7 17 16l0 148c0 9-8 16-17 16z m-102-33l86 0 0-114-86 0z m102 239l-118 0c-9 0-17-7-17-16l0-148c0-9 8-16 17-16l118 0c9 0 17 7 17 16l0 148c0 9-8 16-17 16z m-102-33l86 0 0-114-86 0z m283-173l-119 0c-9 0-16-7-16-16l0-148c0-9 7-16 16-16l119 0c9 0 16 7 16 16l0 148c0 9-7 16-16 16z m-102-33l85 0 0-114-85 0z m-259 33l-119 0c-9 0-16-7-16-16l0-148c0-9 7-16 16-16l119 0c9 0 16 7 16 16l0 148c0 9-7 16-16 16z m-102-33l85 0 0-114-85 0z m102 239l-119 0c-9 0-16-7-16-16l0-148c0-9 7-16 16-16l119 0c9 0 16 7 16 16l0 148c0 9-7 16-16 16z m-102-33l85 0 0-114-85 0z"/>
+    <symbol id="interface-download" viewBox="0 0 512 512">
+        <path d="m434 344c-8 0-14 6-14 14l0 31c0 19-12 31-31 31l-264 0c-19 0-31-12-31-31l0-31c0-8-6-14-14-14-8 0-14 6-14 14l0 31c0 35 26 60 59 60l262 0c35 0 59-27 59-60l0-31c3-8-6-14-12-14z m-188 23c2 2 2 2 4 2 2 0 4 2 6 2 2 0 4 0 6-2 2 0 2-2 4-2l111-119c6-6 6-15 0-21-6-6-15-6-21 0l-86 92 0-245c0-8-6-15-14-15-8 0-14 7-14 15l0 245-86-92c-6-6-15-6-21 0-6 6-6 15 0 21z"/>
     </symbol>
 
+    <symbol id="interface-email" viewBox="0 0 512 512">
+        <path d="m436 104l-360 0c-23 0-43 21-43 43l0 218c0 22 20 43 43 43l362 0c23 0 43-21 43-43l0-218c0-22-20-43-45-43z m15 261c0 6-9 14-15 14l-360 0c-8 0-15-8-15-14l0-218c0-8 9-14 15-14l362 0c8 0 15 8 15 14l0 218z m-52-187l-143 96-143-96c-7-4-17-2-21 4-4 6-2 17 4 21l152 100c2 2 6 2 8 2 2 0 6 0 8-2l152-100c6-4 8-13 4-21-4-6-12-8-21-4z m-237 94l-66 43c-6 4-8 13-4 21 2 4 8 6 12 6 2 0 7 0 9-2l65-43c6-4 8-12 4-21-6-6-14-8-20-4z m188 0c-6-4-16-2-20 4-4 7-2 17 4 21l65 43c2 2 7 2 9 2 4 0 8-2 12-6 4-6 2-17-4-21z"/>
+    </symbol>
 
-    <symbol id="interface-chapters" viewBox="0 0 512 512">
-        <path d="m494 126l-312 0c-10 0-18-8-18-18 0-10 8-18 18-18l312 0c10 0 18 8 18 18 0 10-8 18-18 18z m0 148l-312 0c-10 0-18-8-18-18 0-10 8-18 18-18l312 0c10 0 18 8 18 18 0 10-8 18-18 18z m0 148l-312 0c-10 0-18-8-18-18 0-10 8-18 18-18l312 0c10 0 18 8 18 18 0 10-8 18-18 18z m-427-246c-37 0-67-31-67-68 0-37 30-67 67-67 37 0 68 30 68 67 0 37-31 68-68 68z m0-99c-17 0-31 14-31 31 0 17 14 31 31 31 17 0 31-14 31-31 0-17-14-31-31-31z m0 246c-37 0-67-30-67-67 0-37 30-67 67-67 37 0 68 30 68 67 0 37-31 67-68 67z m0-98c-17 0-31 14-31 31 0 17 14 31 31 31 17 0 31-14 31-31 0-17-14-31-31-31z m0 246c-37 0-67-30-67-67 0-37 30-68 67-68 37 0 68 31 68 68 0 37-31 67-68 67z m0-99c-17 0-31 14-31 32 0 17 14 31 31 31 17 0 31-14 31-31 0-18-14-32-31-32z"/>
+    <symbol id="interface-fullscreen" viewBox="0 0 512 512">
+        <path d="m446 74c-2-4-4-6-8-8-2 0-4-3-6-3l-141 0c-8 0-15 7-15 15 0 8 7 14 15 14l106 0-116 117c-7 6-7 14 0 20 2 2 6 4 10 4 4 0 8-2 10-4l117-116 0 106c0 8 6 14 14 14 8 0 14-6 14-14l0-141c3 0 0-2 0-4z m-215 207c-6-7-14-7-20 0l-117 116 0-106c0-8-6-15-14-15-8 0-14 7-14 15l0 141c0 2 0 4 2 6 2 4 4 6 8 8 2 0 4 3 6 3l141 0c8 0 15-7 15-15 0-8-7-14-15-14l-110 0 116-117c7-8 7-16 2-22z"/>
     </symbol>
 
+    <symbol id="interface-fullscreen-exit" viewBox="0 0 512 512">
+        <path d="m223 281c-2 0-4-2-6-2l-141 0c-8 2-15 8-15 16 0 8 7 14 15 14l106 0-116 117c-7 6-7 14 0 20 4 3 6 5 10 5 4 0 8-2 10-5l117-116 0 106c0 8 6 15 14 15 8 0 14-7 14-15l0-141c0-2 0-4-2-6 0-4-2-6-6-8z m213-78l-106 0 116-117c7-6 7-14 0-20-6-7-14-7-20 0l-117 116 0-106c0-8-6-15-14-15-8 0-14 7-14 15l0 141c0 2 0 4 2 6 2 4 4 6 8 8 2 0 4 2 6 2l141 0c8 0 15-6 15-14 0-8-9-16-17-16z"/>
+    </symbol>
 
-    <symbol id="interface-print" viewBox="0 0 512 512">
-        <path d="m460 422l-66 0c-11 0-19-9-19-20 0-11 8-20 19-20l66 0c6 0 12-6 12-13l0-146c0-7-6-13-12-13l-408 0c-7 0-12 6-12 13l0 146c0 7 5 13 12 13l66 0c10 0 19 9 19 20 0 11-9 20-19 20l-66 0c-29 0-52-24-52-53l0-146c0-29 23-53 52-53l408 0c28 0 52 24 52 53l0 146c0 29-24 53-52 53z m-66-245c-10 0-19-9-19-20l0-103-238 0 0 103c0 11-9 20-19 20-11 0-20-9-20-20l0-123c0-11 9-19 20-19l276 0c11 0 20 8 20 19l0 123c0 11-9 20-20 20z m0 320l-276 0c-11 0-20-8-20-19l0-141c0-11 9-20 20-20l276 0c11 0 20 9 20 20l0 141c0 11-9 19-20 19z m-257-39l238 0 0-102-238 0z m1-166l-41 0c-11 0-20-9-20-20 0-11 9-20 20-20l41 0c11 0 20 9 20 20 0 11-9 20-20 20z m197 132l-158 0c-11 0-20-9-20-20 0-11 9-20 20-20l158 0c11 0 20 9 20 20 0 11-9 20-20 20z"/>
+    <symbol id="interface-help" viewBox="0 0 512 512">
+        <path d="m256 59c-109 0-197 88-197 197 0 109 88 197 197 197 109 0 197-88 197-197 0-109-88-197-197-197z m0 367c-94 0-170-76-170-170 0-94 76-170 170-170 94 0 170 76 170 170 0 94-76 170-170 170z m16-84c0 9-7 16-16 16-9 0-16-7-16-16 0-9 7-16 16-16 9 0 16 7 16 16z m-16-201c-33 0-61 27-61 62 0 8 6 12 12 12 6 0 12-6 12-12 0-19 17-35 35-35 18 0 35 16 35 35 0 18-17 35-35 35-8 0-12 6-12 12l0 41c0 8 6 12 12 12 6 0 12-6 12-12l0-29c27-6 47-31 47-59 4-35-24-62-57-62z"/>
     </symbol>
 
+    <symbol id="interface-index" viewBox="0 0 512 512">
+        <path d="m315 66l-118 0c-9 0-15 6-15 14l0 147c0 9 6 15 15 15l118 0c9 0 15-6 15-15l0-147c0-8-6-14-15-14z m-14 147l-90 0 0-119 90 0z m14 57l-118 0c-9 0-15 6-15 15l0 147c0 8 6 14 15 14l118 0c9 0 15-6 15-14l0-147c0-9-6-15-15-15z m-14 148l-90 0 0-119 90 0z m195-352l-119 0c-8 0-15 6-15 14l0 147c0 9 7 15 15 15l119 0c8 0 14-6 14-15l0-147c0-8-6-14-14-14z m-15 147l-90 0 0-119 90 0z m-346-147l-119 0c-8 0-14 6-14 14l0 147c0 9 6 15 14 15l119 0c8 0 15-6 15-15l0-147c0-8-7-14-15-14z m-14 147l-90 0 0-119 90 0z m14 57l-119 0c-8 0-14 6-14 15l0 147c0 8 6 14 14 14l119 0c8 0 15-6 15-14l0-147c0-9-7-15-15-15z m-14 148l-90 0 0-119 90 0z"/>
+    </symbol>
 
-    <symbol id="interface-bookmarks" viewBox="0 0 512 512">
-        <path d="m264 478c-3 0-6-1-9-2-9-5-12-17-7-26 16-27 47-44 84-44l143 0 0-301-51 0c-11 0-19-8-19-19 0-10 8-18 19-18l69 0c10 0 19 8 19 18l0 339c0 10-9 19-19 19l-161 0c-24 0-43 9-52 25-3 6-9 9-16 9z m-16 0c-7 0-13-3-16-9-9-16-28-25-52-25l-161 0c-10 0-19-9-19-19l0-339c0-10 9-18 19-18l169 0c26 0 48 8 63 23 2 2 3 3 5 5 1-2 3-3 5-5 15-15 37-23 63-23 10 0 18 8 18 18 0 11-8 19-18 19-33 0-49 16-49 49 0 10-9 19-19 19-10 0-19-9-19-19 0-33-16-49-49-49l-151 0 0 301 143 0c37 0 69 17 84 44 5 9 2 21-7 26-3 1-6 2-9 2z m8-2c-10 0-19-9-19-19l0-311c0-11 9-19 19-19 10 0 19 8 19 19l0 311c0 10-9 19-19 19z m78-219c-2 0-4 0-7-1-7-3-11-10-11-17l0-187c0-10 8-18 18-18l85 0c10 0 19 8 19 18l0 187c0 7-5 14-12 17-7 3-15 1-20-4l-29-29-29 29c-4 3-9 5-14 5z m43-79c5 0 9 2 13 5l11 11 0-123-48 0 0 123 11-11c3-3 8-5 13-5z"/>
+    <symbol id="interface-print" viewBox="0 0 512 512">
+        <path d="m424 186l-39 0 0-114c0-9-6-15-14-15l-230 0c-8 0-14 6-14 15l0 114-39 0c-22 0-41 19-41 41l0 121c0 23 19 41 41 41l39 0 0 49c0 8 6 15 14 15l230 0c8 0 14-7 14-15l0-49 39 0c22 0 41-18 41-41l0-121c0-22-19-41-41-41z m-268-100l200 0 0 100-200 0z m200 340l-200 0 0-88 200 0z m80-76c0 6-6 12-12 12l-39 0 0-38c0-9-6-15-14-15l-230 0c-8 0-14 6-14 15l0 38-39 0c-6 0-12-6-12-12l0-121c0-6 6-12 12-12l336 0c6 0 12 6 12 12z m-278-96l-33 0c-8 0-14 6-14 14 0 8 6 15 14 15l35 0c8 0 14-7 14-15 0-8-8-14-16-14z m32 139l132 0c8 0 14-6 14-14 0-8-6-14-14-14l-132 0c-8 0-14 6-14 14 0 8 6 14 14 14z"/>
     </symbol>
 
+    <symbol id="interface-search" viewBox="0 0 512 512">
+        <path d="m451 430l-129-129c22-27 34-59 34-94 0-39-16-78-43-105-59-59-153-59-211 0-57 58-57 152 0 211 29 29 66 43 105 43 35 0 67-12 94-34l129 129c2 2 6 4 10 4 4 0 9-2 11-4 4-7 4-17 0-21z m-330-139c-47-47-47-123 0-170 22-23 53-35 84-35 31 0 61 12 84 35 22 22 35 53 35 84 0 33-13 61-35 84-23 22-53 35-84 35-31 2-60-11-84-33z"/>
+    </symbol>
 
-    <symbol id="interface-help" viewBox="0 0 512 512">
-        <path d="m256 512c-68 0-133-27-181-75-48-48-75-113-75-181 0-68 27-133 75-181 48-48 113-75 181-75 68 0 133 27 181 75 48 48 75 113 75 181 0 68-27 133-75 181-48 48-113 75-181 75z m0-470c-57 0-111 22-151 63-41 40-63 94-63 151 0 57 22 111 63 151 40 41 94 63 151 63 57 0 111-22 151-63 41-40 63-94 63-151 0-57-22-111-63-151-40-41-94-63-151-63z m0 304c-11 0-20 9-20 21 0 11 9 20 20 20 11 0 20-9 20-20 0-12-9-21-20-21z m0-24c-12 0-21-10-21-21l0-53c0-12 9-21 21-21 22 0 40-19 40-41 0-22-18-40-40-40-22 0-40 18-40 40 0 12-10 21-21 21-12 0-21-9-21-21 0-45 37-82 82-82 45 0 82 37 82 82 0 38-26 71-61 80l0 35c0 11-9 21-21 21z"/>
+    <symbol id="interface-sound-off" viewBox="0 0 512 512">
+        <path d="m408 262l51-51c6-6 6-14 0-21-6-6-15-6-21 0l-49 52-51-52c-6-6-14-6-21 0-6 7-6 15 0 21l52 51-52 51c-6 6-6 15 0 21 2 2 7 4 11 4 4 0 8-2 10-4l51-51 51 51c2 2 6 4 11 4 4 0 8-2 10-4 6-6 6-15 0-21z m-162-184c-4-2-10-2-15 2l-102 82-68 0c-8 0-14 6-14 14l0 160c0 8 6 14 14 14l66 0 102 82c2 2 7 4 9 4 2 0 4 0 6-2 4-2 8-8 8-12l0-332c2-4-2-10-6-12z m-21 313l-82-67c-2-2-6-5-8-5l-57 0 0-129 57 0c4 0 6-2 8-4l82-67z"/>
     </symbol>
 
+    <symbol id="interface-sound-on" viewBox="0 0 512 512">
+        <path d="m389 96c-6-4-14-4-20 2-4 6-4 15 2 21 41 35 69 88 69 137 0 49-26 102-69 137-6 4-6 15-2 21 2 4 6 6 10 6 4 0 6-2 8-4 49-39 80-103 80-160 0-57-31-119-78-160z m-51 62c-6-4-16-4-21 4-4 6-4 16 5 20 20 15 43 39 43 76 0 35-25 59-43 76-7 4-9 14-5 20 2 4 9 6 13 6 2 0 6 0 8-2 35-26 55-61 55-98 0-41-18-76-55-102z m-96-80c-4-2-11-2-15 2l-102 82-66 0c-8 0-14 6-14 14l0 160c0 8 6 14 14 14l66 0 102 82c2 2 6 4 9 4 2 0 4 0 6-2 4-2 8-8 8-12l0-332c0-4-4-10-8-12z m-21 313l-82-67c-2-2-6-5-8-5l-57 0 0-129 57 0c4 0 6-2 8-4l82-67z"/>
+    </symbol>
 
-    <symbol id="interface-fullscreen" viewBox="0 0 512 512">
-        <path d="m303 231c-6 0-11-2-16-6-8-9-8-23 0-31l188-188c8-8 22-8 31 0 8 9 8 22 0 31l-188 188c-4 4-10 6-15 6z m187 0c-12 0-21-10-21-22l0-166-166 0c-12 0-22-9-22-21 0-12 10-22 22-22l187 0c12 0 22 10 22 22l0 187c0 12-10 22-22 22z m-468 281c-6 0-11-2-16-6-8-9-8-22 0-31l188-188c8-8 22-8 31 0 8 9 8 23 0 31l-188 188c-4 4-10 6-15 6z m187 0l-187 0c-12 0-22-10-22-22l0-187c0-12 10-22 22-22 12 0 21 10 21 22l0 166 166 0c12 0 22 9 22 21 0 12-10 22-22 22z"/>
+    <symbol id="interface-facebook" viewBox="0 0 512 512">
+        <path d="m291 442l-78 0c-8 0-14-6-14-14l0-164-33 0c-8 0-14-6-14-14l0-62c0-8 6-14 14-14l33 0 0-12c0-19 8-47 24-64 15-16 37-24 64-26 20-2 55 0 57 0 8 0 14 6 14 14l0 57c0 9-6 15-14 15l-31 0c0 0-2 0-2 0 0 0-2 0-4 4-2 4-4 8-4 12l41 0c8 0 14 6 14 14l0 62c0 8-6 14-14 14l-41 0 0 164c2 6-4 14-12 14z m-64-28l49 0 0-164c0-8 7-14 15-14l41 0 0-33-41 0c-8 0-15-6-15-15l0-10c0-2 0-18 11-33 10-14 24-14 28-14l15 0 0-31c-13 0-29 0-41 0-21 0-35 6-45 17-11 10-19 33-19 45l0 26c0 9-6 15-14 15l-31 0 0 33 33 0c8 0 14 6 14 14z"/>
     </symbol>
 
+    <symbol id="interface-linkedin" viewBox="0 0 512 512">
+        <path d="m166 221l-62 0c-14 0-26 12-26 27l0 160c0 14 12 26 26 26l62 0c14 0 27-12 27-26l0-160c0-15-13-27-27-27z m0 187l-62 0 0-160 62 0z m-31-330c-35 0-61 24-61 57 0 33 24 58 59 58 35 0 60-25 60-58 0-33-25-57-58-57z m-2 88c-20 0-33-14-33-31 0-16 13-31 33-31 21 0 33 13 33 31 2 17-12 31-33 31z m217 51c-12 0-24 2-35 6-4-2-8-4-12-4l-57 0c-8 0-15 2-19 8-4 6-8 13-8 21 0 10 0 100 0 160 0 6 2 14 8 18 4 4 13 8 19 8l61 0c8 0 17-4 21-10 4 6 12 10 20 10l62 0c14 0 26-12 26-26l0-93c2-59-33-98-86-98z m62 191l-62 0 0-86c0-23-2-37-20-37-15 0-15 10-19 18-2 4-2 8-2 12l0 91-61 0c0 0 0-146 0-160l55 0 0 22c6-10 21-26 47-26 35 0 62 22 62 71z"/>
+    </symbol>
 
-    <symbol id="interface-download" viewBox="0 0 512 512">
-        <path d="m427 512l-342 0c-22 0-43-8-58-23-15-15-23-36-23-58l0-41c0-12 10-22 21-22 12 0 22 10 22 22l0 41c0 22 16 38 38 38l342 0c22 0 38-16 38-38l0-41c0-12 10-22 22-22 12 0 21 10 21 22l0 41c0 22-8 43-23 58-15 15-36 23-58 23z m-171-102c-12 0-21-10-21-22l0-367c0-11 9-21 21-21 12 0 21 10 21 21l0 367c0 12-9 22-21 22z m0 0c-6 0-11-3-16-7l-145-154c-8-8-7-22 1-30 9-8 22-8 30 1l130 137 130-137c8-8 21-9 30-1 8 8 9 22 1 30l-145 154c-5 4-10 7-16 7z"/>
+    <symbol id="interface-twitter" viewBox="0 0 512 512">
+        <path d="m188 420c-43 0-86-12-122-37-7-4-9-10-7-16 2-7 9-11 15-11 24 2 51 0 73-10-22-10-38-29-47-53-2-4 0-10 2-12-18-17-28-41-28-66 0-4 2-10 6-12 0 0 2 0 2-2-6-13-10-27-10-41 0-17 4-31 12-45 2-4 6-6 10-6 4 0 10 2 12 6 35 37 80 61 132 69 0 0 0 0 0-2 0-49 41-90 90-90 22 0 43 8 59 23 12-4 25-9 37-15 6-2 12-2 16 2 4 4 6 11 4 17-2 4-2 8-4 10 4 0 9 2 13 4 4 4 4 12 0 17-11 14-21 26-35 38 0 0 0 2 0 2-2 113-86 230-230 230z m-59-37c18 6 39 8 59 8 125 0 201-102 201-201 0-2 0-6 0-8 0-4 2-10 6-12 0 0 2 0 2-2-6 0-10-4-12-10-2-4 0-11 2-15 0 0 0 0-2 0-4 0-10 0-12-4-13-12-29-18-45-18-33 0-62 26-62 61 0 4 0 11 2 15 2 4 0 8-2 12-2 4-8 6-12 6-57-4-111-29-152-68 0 5 0 9 0 11 0 20 11 39 27 51 6 4 8 10 6 16-2 6-8 11-14 11-6 0-10 0-17-3 9 21 25 35 46 39 6 2 12 7 12 15 0 6-4 12-10 14-5 2-9 2-15 2 10 14 29 23 47 23 6 0 13 4 15 10 2 6 0 12-4 16-21 15-43 25-66 31z"/>
     </symbol>
 
+    <symbol id="interface-googleplus" viewBox="0 0 512 512">
+        <path d="m305 211l-141 0c-8 0-14 6-14 14l0 60c0 8 6 14 14 14l55 0c-14 16-33 27-55 27-39 0-70-31-70-70 0-39 31-70 70-70 16 0 33 7 45 17 6 4 14 4 18 0l43-43c2-2 4-6 4-10 0-5-2-9-4-11-28-26-67-41-106-41-88 0-158 72-158 158 0 88 72 158 158 158 88 0 158-72 158-160l-3-31c-2-6-8-12-14-12z m-141 174c-72 0-129-57-129-129-2-72 57-129 129-129 26 0 53 8 74 25l-23 22c-14-10-33-16-51-16-53 0-98 45-98 98 0 53 45 98 98 98 41 0 78-26 92-65 2-4 0-10-2-13-2-4-6-6-12-6l-64 0 0-30 115 0 2 16c-2 72-59 129-131 129z m330-149l-54 0 0-62c0-8-6-14-14-14-8 0-16 6-16 14l0 59-60 0c-8 0-14 7-14 15 0 8 6 14 14 14l60 0 0 60c0 8 6 14 14 14 8 0 14-6 14-14l0-60 54 0c8 0 14-6 14-14 0-8-6-12-12-12z"/>
+    </symbol>
 
-    <symbol id="interface-share" viewBox="0 0 512 512">
-        <path d="m121 479c-2 0-5 0-7-1-8-3-13-11-13-19l0-103-28 0c-40 0-73-33-73-73l0-178c0-40 33-72 73-72l366 0c40 0 73 32 73 72l0 178c0 40-33 73-73 73l-186 0-118 117c-3 4-9 6-14 6z m-48-406c-18 0-33 15-33 33l0 177c0 18 15 33 33 33l48 0c11 0 20 9 20 20l0 75 90-89c4-4 9-6 14-6l194 0c18 0 33-15 33-33l0-178c0-18-15-32-33-32l-366 0z"/>
+    <symbol id="interface-viadeo" viewBox="0 0 512 512">
+        <path d="m160 428c-4 0-8-2-10-4-7-6-7-14 0-21 0 0 94-96 94-186 0-90-45-137-45-137-6-6-6-14 0-21 6-6 14-6 20 0 2 2 53 56 53 158 0 102-98 203-102 207-2 2-6 4-10 4z m49 29c-78 0-143-64-143-144 0-80 63-143 143-143 8 0 14 6 14 14 0 9-6 15-14 15-64 0-115 51-115 114 0 64 51 115 115 115 63 0 115-51 115-115 0-16-5-30-11-45-4-8 0-16 9-18 8-4 16 0 18 8 8 18 12 37 12 57 0 78-63 142-143 142z m158-207c0 0-2 0-2 0-19 0-33-10-43-25-15-22-13-39-7-51 11-22 39-37 62-39 31-4 41-22 41-22 4-7 10-9 16-9 6 2 10 9 10 15 0 8-4 78-28 106-10 17-31 25-49 25z m-23-41c6 8 12 12 21 12 10 0 22-4 28-14 8-10 15-33 19-53-9 4-21 8-33 10-17 0-33 10-39 20 0 4-4 11 4 25z"/>
     </symbol>
 
 </svg>
diff --git a/js/libs/fluidbook/fluidbook.menu.js b/js/libs/fluidbook/fluidbook.menu.js
index 564c9a09..052f50eb 100644
--- a/js/libs/fluidbook/fluidbook.menu.js
+++ b/js/libs/fluidbook/fluidbook.menu.js
@@ -315,36 +315,53 @@ FluidbookMenu.prototype = {
     }
     ,
     openShare: function (p1, p2, callback) {
-        var view = '<div class="caption">' + this.closeButton() + '<h2>' + this.fluidbook.l10n.__('share') + '</h2></div>';
-        view += '<div class="content">';
-        view += '<ul class="chapters shareList">';
-        var $this = this;
+
+        var shareLinks = {},
+            shareHTML = '',
+            view;
+
         if (this.fluidbook.datas.friend) {
-            view += '<li data-level="0"><a href="#" data-service="email" class="share level0"><img height="25" src="data/images/share-email.svg" /> E-mail</a></li>';
+            shareLinks['email'] = 'E-mail';
         }
         if (this.fluidbook.datas.facebook) {
-            view += '<li data-level="0"><a href="#" data-service="facebook" class="share level0"><img height="25" src="data/images/share-facebook.svg" /> Facebook</a></li>';
+            shareLinks['facebook'] = 'Facebook';
         }
         if (this.fluidbook.datas.twitter) {
-            view += '<li data-level="0"><a href="#" data-service="twitter" class="share level0"><img height="25" src="data/images/share-twitter.svg" /> Twitter</a></li>';
+            shareLinks['twitter'] = 'Twitter';
         }
         if (this.fluidbook.datas.googleplus) {
-            view += '<li data-level="0"><a href="#" data-service="googleplus" class="share level0"><img height="25" src="data/images/share-googleplus.svg" /> Google+</a></li>';
+            shareLinks['googleplus'] = 'Google Plus';
         }
         if (this.fluidbook.datas.linkedin) {
-            view += '<li data-level="0"><a href="#" data-service="linkedin" class="share level0"><img height="25" src="data/images/share-linkedin.svg" /> LinkedIn</a></li>';
+            shareLinks['linkedin'] = 'LinkedIn';
         }
         if (this.fluidbook.datas.viadeo) {
-            view += '<li data-level="0"><a href="#" data-service="viadeo" class="share level0"><img height="25" src="data/images/share-viadeo.svg" /> Viadeo</a></li>';
+            shareLinks['viadeo'] = 'Viadeo';
+        }
+
+        // Generate links
+        for (var shareType in shareLinks) {
+            if (shareLinks.hasOwnProperty(shareType)) { // Ensure we don't get inherited properties
+                shareHTML += '<li data-level="0"><a href="#" data-service="' + shareType + '" class="share level0">';
+                shareHTML += getSpriteIcon('interface-' + shareType);
+                shareHTML += ' ' + shareLinks[shareType]
+                shareHTML += '</a></li>';
+            }
         }
+
+        view = '<div class="caption">' + this.closeButton() + '<h2>' + this.fluidbook.l10n.__('share') + '</h2></div>';
+        view += '<div class="content">';
+        view += '<ul class="chapters shareList">';
+        view += shareHTML;
         view += '</ul>';
         view += '</div>';
+
         $("#view").append('<div class="mview" data-menu="share">' + view + '</div>');
         if (callback != undefined) {
             callback();
         }
-    }
-    ,
+    },
+
     openBookmark: function (p1, p2, callback) {
         var view = this.fluidbook.bookmarks.getView();
         if (view !== false) {
diff --git a/js/libs/fluidbook/fluidbook.nav.js b/js/libs/fluidbook/fluidbook.nav.js
index 0d2f60aa..91d043a7 100644
--- a/js/libs/fluidbook/fluidbook.nav.js
+++ b/js/libs/fluidbook/fluidbook.nav.js
@@ -288,7 +288,7 @@ FluidbookNav.prototype = {
                         shareLinks['twitter'] = 'Twitter';
                     }
                     if (this.fluidbook.datas.googleplus) {
-                        shareLinks['googleplus'] = 'Google Plus';
+                        shareLinks['google-plus'] = 'Google Plus';
                     }
                     if (this.fluidbook.datas.linkedin) {
                         shareLinks['linkedin'] = 'LinkedIn';
@@ -301,7 +301,7 @@ FluidbookNav.prototype = {
                     for (var shareType in shareLinks) {
                         if (shareLinks.hasOwnProperty(shareType)) { // Ensure we don't get inherited properties
                             shareHTML += '<a href="#" data-service="' + shareType + '" class="share" title="' + shareLinks[shareType] + '">';
-                            shareHTML += '<img src="data/images/share-' + shareType + '.svg" />';
+                            shareHTML += getSpriteIcon('interface-' + shareType);
                             shareHTML += '</a>';
                         }
                     }
diff --git a/style/fluidbook.less b/style/fluidbook.less
index 9e54227e..8f57ddcb 100644
--- a/style/fluidbook.less
+++ b/style/fluidbook.less
@@ -1169,15 +1169,16 @@ form input[type="text"], form input[type="email"] {
 
 /* Share */
 
-ul.chapters.shareList a.level0 img {
+ul.chapters.shareList a.level0 .svg-icon {
 	height: 25px;
-	margin: 2px 10px 0 0;
-	position: relative;
-	top: 3px;
-}
+	width: 25px;
+	display: inline-block;
+	vertical-align: middle;
+	margin: 0 10px 6px 0;
 
-.rtl ul.chapters.shareList a.level0 img {
-	margin: 2px 0 0 10px;
+	.rtl & {
+		margin: 0 0 6px 10px;
+	}
 }
 
 /* Help */
diff --git a/style/mmenu/mmenu.less b/style/mmenu/mmenu.less
index 535e8ba1..c5eb5b7f 100644
--- a/style/mmenu/mmenu.less
+++ b/style/mmenu/mmenu.less
@@ -130,8 +130,8 @@ html.mm-opening .mm-menu.mm-opened[class*=mm-pagedim]~#mm-blocker {
   }
 
   .svg-icon {
-    width: 25px;
-    height: 25px;
+    width: 26px;
+    height: 26px;
     vertical-align: middle;
     margin-right: 10px;
   }
@@ -179,9 +179,8 @@ html.mm-opening .mm-menu.mm-opened[class*=mm-pagedim]~#mm-blocker {
   color: @menu-background;
 
   .svg-icon {
-    width: 20px;
-    height: 20px;
-    margin-top: 1px; // Fixes weird clipping of top of icon
+    width: 25px;
+    height: 25px;
   }
 
   .ltr & {
@@ -291,6 +290,10 @@ html.mm-opening .mm-menu.mm-opened[class*=mm-pagedim]~#mm-blocker {
   line-height: 1;
   padding: 20px 0;
 
+  .svg-icon {
+    margin: 0;
+  }
+
   .share-icons {
     display: flex;
     justify-content: space-around;
diff --git a/style/nav-horizontal.less b/style/nav-horizontal.less
index 8e5bd64d..fa4fa651 100644
--- a/style/nav-horizontal.less
+++ b/style/nav-horizontal.less
@@ -18,8 +18,8 @@
   }
 
   .svg-icon {
-    width: 26px;
-    height: 22px;
+    width: 25px;
+    height: 25px;
     margin: 0 18px;
     color: @icon-color;
   }
-- 
2.39.5