diff --git a/doc/Icinga-Design/documentation.html b/doc/Icinga-Design/documentation.html
index c91ff303f..3970273ea 100644
--- a/doc/Icinga-Design/documentation.html
+++ b/doc/Icinga-Design/documentation.html
@@ -395,7 +395,7 @@ code...
             </div>    
 
             <div class="panel-row">
-              <a href="#" class="button btn-common btn-wide">Recheck</a>
+              <a href="#" class="button btn-cta btn-wide">Recheck</a>
             </div>
 
 
@@ -448,44 +448,104 @@ code...
 
 
 
-
+<!--  ########## Box mit Tabelle #############  -->
 
           <div class="panel-heading">
           <div class="panel-hostname">
-            Lorem Ipsum</div>
+            Box mit Tabelle</div>
           </div> 
           <hr class="separator" /> 
 
           <div class="panel-body">
+            <table class="table table-condensed table-detail">
+              <tbody>
+                <tr>
+                  <th>Lorem</th>
+                  <th>Ipsum xyz</th>
+                  <th>blablubb</th>
+                </tr>
+                <tr>
+                  <td>08.10. 15:51</td>
+                  <td><a href="#">Lorem ipusm_002</a></td>
+                  <td><a href="#" class="button btn-common btn-small pull-right"><span class="icon-downtime icon-btn-small"></span></a></td>
+                </tr>
 
-            <div class="panel-row">
-              <div class="panel-label">
-                Lorem ipsum
-              </div>
-              <div class="panel-content">
-                Lorem ipsum dolor sit amet, consetetur sadipscing elitr
-              </div>
-              <div class="panel-button">
-                <a href="#" class="button btn-common btn-small"><span class="icon-remove icon-btn-small"></span></a>
-              </div>
-            </div> 
+                <tr>
+                  <td>08.10. 15:51</td>
+                  <td>Ich bin ein toller Text</td>
+                  <td><a href="#" class="button btn-common btn-small pull-right"><span class="icon-edit icon-btn-small"></span></a></td>
+                </tr>
 
-            <div class="panel-row">
-              <div class="panel-label">
-                Lorem ipsum
-              </div>
-              <div class="panel-content ">
-                Lorem ipsum dolor sit amet bla blubb.
-              </div>
-              <div class="panel-button">
-                <a href="#" class="button btn-common btn-small"><span class="icon-remove icon-btn-small"></span></a>
-                <a href="#" class="button btn-common btn-small"><span class="icon-comment icon-btn-small"></span></a>
-              </div>
+                <tr>
+                  <td>Hallo hallo</td>
+                  <td>Server 123 blabla</td>
+                  <td>Noch ein Text</td>
+                </tr>
+
+                <tr>
+                  <td>Lorem ipsum</td>
+                  <td>Juhuhallo_host01</td>
+                  <td>128747404</td>
+                </tr>
+              </tbody>
+            </table>
            </div>
 
 
 
-          </div>  
+<!--  ########## Heading #############  -->
+
+          <div class="panel-heading">
+          <div class="panel-hostname">
+            Heading</div>
+          </div> 
+          <hr class="separator" /> 
+
+          <div class="panel-body">
+            <table class="table table-condensed table-detail">
+              <tbody>
+
+                <tr>
+                  <td class="enabled">Passive Checks</td>
+                  <td><div class="icon-table-hint icon-edit pull-left"></div></td>
+                  <td><input type="checkbox" id="#" name="#" class="pull-right" checked /></td>
+                </tr>
+
+                <tr>
+                  <td class="disabled">Active Checks</td>
+                  <td></td>
+                  <td><input type="checkbox" id="#" name="#" class="pull-right" /></td>
+                </tr>
+                <tr>
+                  <td class="enabled">Obsessing</td>
+                  <td><div class="icon-table-hint icon-edit pull-left"></div></td>
+                  <td><input type="checkbox" id="#" name="#" class="pull-right" checked /></td>
+                </tr>
+                <tr>
+                  <td class="enabled">Notifications</td>
+                  <td></td>
+                  <td><input type="checkbox" id="#" name="#" class="pull-right" checked /></td>
+                </tr>
+                <tr>
+                  <td class="disabled">Event Handler</td>
+                  <td><div class="icon-table-hint icon-edit pull-left"></div></td>
+                  <td><input type="checkbox" id="#" name="#" class="pull-right" /></td>
+                </tr>
+                <tr>
+                  <td class="disabled">Flap Detection</td>
+                  <td></td>
+                  <td><input type="checkbox" id="#" name="#" class="pull-right" /></td>
+                </tr>
+
+              </tbody>
+            </table>
+           </div>
+
+
+
+
+
+
 
 
 
diff --git a/doc/Icinga-Design/icinga-design.css b/doc/Icinga-Design/icinga-design.css
index dc641dfd8..919c265ef 100644
--- a/doc/Icinga-Design/icinga-design.css
+++ b/doc/Icinga-Design/icinga-design.css
@@ -100,6 +100,26 @@ th {
   border-bottom: 2px solid #ddd;
 }
 
+.table-detail th {
+  font-size: 16px;
+  border-top: 0;
+}
+
+
+.table-detail thead > tr > th, .table tbody > tr > th,
+.table-detail tbody > tr > td, .table tfoot > tr > td  {
+  border-top: 0 !important;
+}
+
+
+
+
+.table-detail > thead {
+  border-top: 0 !important;
+}
+
+
+
 td {
   padding: 8px 10px 8px 8px !important;
   border-bottom: 1px dotted #ddd !important;
@@ -171,6 +191,15 @@ td {
 
 
 
+.disabled {
+  border-left: 8px solid #FF3300;
+}
+
+.enabled {
+  border-left: 8px solid #00CC33;
+}
+
+
 /* ==========================================================================
    Forms
    ========================================================================== */
@@ -221,6 +250,26 @@ select.input-sm {
 }
 
 
+/*input[type="checkbox"] {
+    display:none;
+}
+input[type="checkbox"] + label span {
+    display:inline-block;
+    width:19px;
+    height:19px;
+    margin:-1px 4px 0 0;
+    vertical-align:middle;
+    background:url(images/flapping.png) left top no-repeat;
+    cursor:pointer;
+}
+input[type="checkbox"]:checked + label span {
+    background:url(check_radio_sheet.png) -19px top no-repeat;
+}*/
+
+            
+
+
+
 /* ==========================================================================
    Pagination
    ========================================================================== */
@@ -365,6 +414,17 @@ select.input-sm {
   display: block;
 }
 
+.icon-table-hint {
+  width: 16px;
+  height: 20px;
+  display: block;
+  background-position: 50% 50%;
+}
+.icon-table-hint:after {
+  content: "edited";
+  padding-left: 22px;
+}
+
 
 .icon-flapping {
   background-image: url('images/flapping.png');
diff --git a/doc/Icinga-Design/images/logo_icinga.png b/doc/Icinga-Design/images/logo_icinga.png
new file mode 100644
index 000000000..162bfdd69
Binary files /dev/null and b/doc/Icinga-Design/images/logo_icinga.png differ