diff --git a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo b/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo
index 657102e06..2fcb356a6 100644
Binary files a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo and b/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo differ
diff --git a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po b/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po
index 897813040..2fe4b3521 100644
--- a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po
+++ b/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po
@@ -106,8 +106,11 @@ msgstr "Read the documentation"
 msgid "download the extension"
 msgstr "Download the extension"
 
-msgid "Firefox Add-On"
-msgstr "Firefox Add-On"
+msgid "Standard Firefox Add-On"
+msgstr "Standard Firefox Add-On"
+
+msgid "Mozilla Services (Social API) Extension"
+msgstr "Mozilla Services (Social API) Extension"
 
 msgid "Chrome Extension"
 msgstr "Chrome Extension"
diff --git a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo
index f393dffec..f46ef600d 100644
Binary files a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo and b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo differ
diff --git a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po
index 393c200b7..f4b87163c 100644
--- a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po
+++ b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po
@@ -200,8 +200,11 @@ msgstr "lisez la documentation"
 msgid "download the extension"
 msgstr "téléchargez l'extension"
 
-msgid "Firefox Add-On"
-msgstr "Add-On Firefox"
+msgid "Standard Firefox Add-On"
+msgstr "Add-On Firefox classique"
+
+msgid "Mozilla Services (Social API) Extension"
+msgstr "Extension Mozilla Services (Social API)"
 
 msgid "Chrome Extension"
 msgstr "Extension Chrome"
diff --git a/themes/baggy/_head.twig b/themes/baggy/_head.twig
index 1546a7b91..9ca51cd2d 100755
--- a/themes/baggy/_head.twig
+++ b/themes/baggy/_head.twig
@@ -39,6 +39,7 @@
         <script src="{{ poche_url }}themes/_global/js/popupForm.js"></script>
         <script src="{{ poche_url }}themes/_global/js/keyboard.js"></script>
         <script src="{{ poche_url }}themes/{{theme}}/js/closeMessage.js"></script>
+        
         <!-- Enable Firefox Social Services
         script put there because of the call to poche_url -->
 
@@ -56,9 +57,9 @@
 
                 "description": "wallabag Extension for Firefox - The (soon to become) best way to save articles, videos and more",
                 "author": "Thomas Citharel",
-                "homepageURL": "https://wallabag.org",
+                "homepageURL": "http://doc.wallabag.org/en/User/save_your_first_article.html#firefox-social-api-service",
                 "origin": "https://wallabag.org",
-                "postActivationURL": "https://wallabag.org",
+                "postActivationURL": "http://doc.wallabag.org/en/User/save_your_first_article.html#firefox-social-api-service",
 
                 "version": "0.1"
         };
diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig
index 8562f1337..2e40178e9 100755
--- a/themes/baggy/config.twig
+++ b/themes/baggy/config.twig
@@ -17,7 +17,7 @@
             <h3>{% trans "Browser Addons" %}</h3>
             <ul>
                 <li><a href="https://addons.mozilla.org/firefox/addon/wallabag/" target="_blank">{% trans "Standard Firefox Add-On" %}</a></li>
-                <li><button onclick="activateSocialFeature(this)">Mozilla Services Social API Extension</button>
+                <li><button onclick="activateSocialFeature(this)">{% trans "Mozilla Services (Social API) Extension" %}</button></li>
                 <li><a href="https://chrome.google.com/webstore/detail/wallabag/bepdcjnnkglfjehplaogpoonpffbdcdj" target="_blank">{% trans "Chrome Extension" %}</a></li>
             </ul>
             <h3>{% trans "Mobile Apps" %}</h3>
diff --git a/themes/default/_head.twig b/themes/default/_head.twig
index ce1bbdcc5..e3841c779 100755
--- a/themes/default/_head.twig
+++ b/themes/default/_head.twig
@@ -36,3 +36,33 @@
         <script src="{{ poche_url }}themes/_global/js/saveLink.js"></script>
         <script src="{{ poche_url }}themes/_global/js/keyboard.js"></script>
         <script src="{{ poche_url }}themes/_global/js/popupForm.js"></script>
+
+        <!-- Enable Firefox Social Services
+        script put there because of the call to poche_url -->
+
+        <script>
+        var baseurl = "{{ poche_url }}";
+        console.log(baseurl);
+        var data = {
+
+                "name": "wallabag",
+                "iconURL": baseurl + "/themes/_global/img/appicon/firefox-service-icon-16.png",
+                "icon32URL": baseurl + "/themes/_global/img/appicon/firefox-service-icon-32.png",
+                "icon64URL": baseurl + "/themes/_global/img/appicon/firefox-service-icon-64.png",
+
+                "shareURL": baseurl + "/index.php?action=add&plainurl=%{url}",
+
+                "description": "wallabag Extension for Firefox - The (soon to become) best way to save articles, videos and more",
+                "author": "Thomas Citharel",
+                "homepageURL": "http://doc.wallabag.org/en/User/save_your_first_article.html#firefox-social-api-service",
+                "origin": "https://wallabag.org",
+                "postActivationURL": "http://doc.wallabag.org/en/User/save_your_first_article.html#firefox-social-api-service",
+
+                "version": "0.1"
+        };
+        function activateSocialFeature(node) {
+                var event = new CustomEvent("ActivateSocialFeature");
+                node.setAttribute("data-service", JSON.stringify(data));
+                node.dispatchEvent(event);
+        }
+        </script>
\ No newline at end of file
diff --git a/themes/default/config.twig b/themes/default/config.twig
index 09e40e75b..e39826c31 100755
--- a/themes/default/config.twig
+++ b/themes/default/config.twig
@@ -16,7 +16,8 @@
             </p>
             <h3>Browser Plugins</h3>
             <ul>
-                <li><a href="https://addons.mozilla.org/firefox/addon/wallabag/" target="_blank">{% trans "Firefox Add-On" %}</a></li>
+                <li><a href="https://addons.mozilla.org/firefox/addon/wallabag/" target="_blank">{% trans "Standard Firefox Add-On" %}</a></li>
+                <li><button onclick="activateSocialFeature(this)">{% trans "Mozilla Services (Social API) Extension" %}</button></li>
                 <li><a href="https://chrome.google.com/webstore/detail/wallabag/bepdcjnnkglfjehplaogpoonpffbdcdj" target="_blank">{% trans "Chrome Extension" %}</a></li>
             </ul>
             <h3>Mobile Apps</h3>