diff --git a/website/source/assets/stylesheets/_docs.scss b/website/source/assets/stylesheets/_docs.scss
index 0728fcda3..ce73017e1 100755
--- a/website/source/assets/stylesheets/_docs.scss
+++ b/website/source/assets/stylesheets/_docs.scss
@@ -31,6 +31,7 @@ body.layout-grafana,
 body.layout-fastly,
 body.layout-google,
 body.layout-heroku,
+body.layout-icinga2,
 body.layout-influxdb,
 body.layout-librato,
 body.layout-logentries,
diff --git a/website/source/docs/providers/icinga2/index.html.markdown b/website/source/docs/providers/icinga2/index.html.markdown
index 0e9e4b686..fd9ffbe7c 100644
--- a/website/source/docs/providers/icinga2/index.html.markdown
+++ b/website/source/docs/providers/icinga2/index.html.markdown
@@ -3,12 +3,7 @@ layout: "icinga2"
 page_title: "Provider: Icinga2"
 sidebar_current: "docs-icinga2-index"
 description: |-
-  The Icinga2 provider is used to configure hosts to be monitored by
-Icinga2 servers. The provider needs to be configured with the API
-URL of the Icinga2 server and credentials for an API user with the
-appropriate permissions.
----
-
+  The Icinga2 provider is used to configure hosts to be monitored by Icinga2 servers. The provider needs to be configured with the API URL of the Icinga2 server and credentials for an API user with the appropriate permissions.
 ---
 
 
diff --git a/website/source/layouts/docs.erb b/website/source/layouts/docs.erb
index 061b865f8..d7ce8c629 100644
--- a/website/source/layouts/docs.erb
+++ b/website/source/layouts/docs.erb
@@ -262,9 +262,13 @@
 					<a href="/docs/providers/heroku/index.html">Heroku</a>
 					</li>
 
+          <li<%= sidebar_current("docs-providers-icinga2") %>>
+            <a href="/docs/providers/icinga2/index.html">Icinga2</a>
+          </li>
+
 					<li<%= sidebar_current("docs-providers-influxdb") %>>
 					<a href="/docs/providers/influxdb/index.html">InfluxDB</a>
-                    </li>
+          </li>
 
 					<li<%= sidebar_current("docs-providers-librato") %>>
 					<a href="/docs/providers/librato/index.html">Librato</a>
diff --git a/website/source/layouts/icinga2.erb b/website/source/layouts/icinga2.erb
new file mode 100644
index 000000000..9c9c8559e
--- /dev/null
+++ b/website/source/layouts/icinga2.erb
@@ -0,0 +1,35 @@
+<% wrap_layout :inner do %>
+	<% content_for :sidebar do %>
+		<div class="docs-sidebar hidden-print affix-top" role="complementary">
+			<ul class="nav docs-sidenav">
+				<li<%= sidebar_current("docs-home") %>>
+					<a href="/docs/providers/index.html">&laquo; Documentation Home</a>
+				</li>
+
+				<li<%= sidebar_current("docs-icinga2-index") %>>
+					<a href="/docs/providers/influxdb/index.html">Icinga2 Provider</a>
+				</li>
+
+				<li<%= sidebar_current(/^docs-icinga2-resource/) %>>
+					<a href="#">Resources</a>
+					<ul class="nav nav-visible">
+						<li<%= sidebar_current("docs-icinga2-resource-checkcommand") %>>
+              <a href="/docs/providers/icinga2/r/checkcommands.html">icinga2_checkcommand</a>
+            </li>
+            <li<%= sidebar_current("docs-icinga2-resource-host") %>>
+              <a href="/docs/providers/icinga2/r/host.html">icinga2_host</a>
+            </li>
+            <li<%= sidebar_current("docs-icinga2-resource-hostgroup") %>>
+              <a href="/docs/providers/icinga2/r/hostgroup.html">icinga2_hostgroup</a>
+            </li>
+            <li<%= sidebar_current("docs-icinga2-resource-continuous_query") %>>
+							<a href="/docs/providers/icinga2/r/service.html">icinga2_service</a>
+						</li>
+					</ul>
+				</li>
+			</ul>
+		</div>
+	<% end %>
+
+	<%= yield %>
+<% end %>