diff --git a/src/app/docs/alert.component.ts b/src/app/docs/alert.component.ts
index 31a2edef..077d44ce 100644
--- a/src/app/docs/alert.component.ts
+++ b/src/app/docs/alert.component.ts
@@ -7,11 +7,14 @@ import { Analytics } from './shared/analytics';
     <docs-wrapper component="Alert">
         <h3>Demo</h3>
         <demo-alert></demo-alert>
+        <h3 class="mt-3">Usage</h3>
+        <div [innerHtml]=docContent></div>
         <code-box [snippets]="demoSnippets"></code-box>
     </docs-wrapper>
   `
 })
 export class DocAlert implements OnInit {
+  public docContent = require('html-loader!markdown-loader!./close.component.md');
   public demoSnippets = {
     markup: require('!!prismjs-loader?lang=html!../demos/alert.component.html'),
     typescript: require('!!prismjs-loader?lang=typescript!../demos/alert.component.ts')
@@ -22,4 +25,4 @@ export class DocAlert implements OnInit {
   public ngOnInit(): void {
     this._analytics.trackPageViews();
   }
-}
\ No newline at end of file
+}
diff --git a/src/app/docs/close.component.md b/src/app/docs/close.component.md
new file mode 100644
index 00000000..62d6a7c1
--- /dev/null
+++ b/src/app/docs/close.component.md
@@ -0,0 +1,3 @@
+To prevent ng-bootstrap's cross to appear twice, please add this (temporary) style:
+
+`.close > [aria-hidden="true"]  { display: none; }`
diff --git a/src/app/docs/modal.component.ts b/src/app/docs/modal.component.ts
index 4fe5605c..f7b55233 100644
--- a/src/app/docs/modal.component.ts
+++ b/src/app/docs/modal.component.ts
@@ -8,11 +8,14 @@ import { Analytics } from './shared/analytics';
       <h3>Demo</h3>
       <demo-modal></demo-modal>
       <ng-template ngbModalContainer></ng-template>
+      <h3 class="mt-3">Usage</h3>
+       <div [innerHtml]=docContent></div>
       <code-box [snippets]="demoSnippets"></code-box>
     </docs-wrapper>
   `
 })
 export class DocModal implements OnInit {
+  public docContent = require('html-loader!markdown-loader!./close.component.md');
   public demoSnippets = {
     markup: require('!!prismjs-loader?lang=html!../demos/modal.component.html'),
     typescript: require('!!prismjs-loader?lang=typescript!../demos/modal.component.ts')
@@ -23,4 +26,4 @@ export class DocModal implements OnInit {
   public ngOnInit(): void {
     // this._analytics.trackPageViews();
   }
-}
\ No newline at end of file
+}
diff --git a/src/styles.scss b/src/styles.scss
index 1f75c228..cde6b36b 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -65,8 +65,19 @@ pre {
   }
 }
 
-/* @todo Remove this when Boosted handles this */
+/*
+  @todo Remove this when Boosted handles this
+  @link https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/issues/317
+*/
 .pagination {
   flex-wrap: wrap;
 }
 
+/*
+  @todo Find a way to remove this from markup
+  @link https://github.com/Orange-OpenSource/Orange-Boosted-Angular/issues/167
+*/
+.close > [aria-hidden="true"]  {
+  display: none;
+}
+