diff --git a/index.html b/index.html
index 21c6ca93957..a954658a629 100644
--- a/index.html
+++ b/index.html
@@ -3002,7 +3002,7 @@ <h2 id='mj-navbar'>mj-navbar</h2>
   </a>
 </p>
 <h3 id='mj-navbar-2'>mj-navbar</h3>
-<p>Individual links of the menu should we wrapped inside mj-navbar.</p>
+<p>Individual links of the menu should be wrapped inside mj-navbar.</p>
 
 <p>Standard Desktop:</p>
 
@@ -3505,6 +3505,12 @@ <h2 id='mj-social'>mj-social</h2>
   <img src="https://cloud.githubusercontent.com/assets/6558790/12751360/0c78ce48-c9bd-11e5-98ca-4a2ac9e6341b.png" alt="desktop" style="width: 250px;"/>
 </p>
 
+<aside class="warning">
+  `mj-social-element`'s `name` attribute is a shortcut for some common social elements. <br />
+  You should avoid rely too much on this as those icons are hosted by Mailjet for their Email Builder.<br />
+  Use <a href="#custom-social-element">custom element syntax instead.</a>
+</aside>
+
 <p>Displays calls-to-action for various social networks with their associated logo. You can add social networks with the <code>mj-social-element</code> tag.</p>
 <pre class="highlight xml tab-xml"><code><span class="nt">&lt;mjml&gt;</span>
   <span class="nt">&lt;mj-body&gt;</span>
@@ -3517,9 +3523,12 @@ <h2 id='mj-social'>mj-social</h2>
           <span class="nt">&lt;mj-social-element</span> <span class="na">name=</span><span class="s">"google"</span> <span class="na">href=</span><span class="s">"https://mjml.io/"</span><span class="nt">&gt;</span>
             Google
           <span class="nt">&lt;/mj-social-element&gt;</span>
-          <span class="nt">&lt;mj-social-element</span>  <span class="na">name=</span><span class="s">"twitter"</span> <span class="na">href=</span><span class="s">"https://mjml.io/"</span><span class="nt">&gt;</span>
+          <span class="nt">&lt;mj-social-element</span> <span class="na">name=</span><span class="s">"twitter"</span> <span class="na">href=</span><span class="s">"https://mjml.io/"</span><span class="nt">&gt;</span>
             Twitter
           <span class="nt">&lt;/mj-social-element&gt;</span>
+          <span class="nt">&lt;mj-social-element</span> <span class="na">name=</span><span class="s">"x"</span> <span class="na">href=</span><span class="s">"https://mjml.io/"</span><span class="nt">&gt;</span>
+            X
+          <span class="nt">&lt;/mj-social-element&gt;</span>
         <span class="nt">&lt;/mj-social&gt;</span>
       <span class="nt">&lt;/mj-column&gt;</span>
     <span class="nt">&lt;/mj-section&gt;</span>
@@ -3874,6 +3883,7 @@ <h3 id='mj-social-element'>mj-social-element</h3>
 <p>Supported networks with a share url:
 - facebook
 - twitter
+- x
 - google
 - pinterest
 - linkedin