diff --git a/css/hesk_newStyle.php b/css/hesk_newStyle.php
index f1f1f4e1..98c6e4f0 100644
--- a/css/hesk_newStyle.php
+++ b/css/hesk_newStyle.php
@@ -401,4 +401,26 @@ button.dropdown-submit {
 
 .indent-15 {
     margin-left: 15px;
+}
+
+.button-link {
+    color: #4a5571;
+}
+
+.button-link:hover {
+    text-decoration: none;
+    color: #000;
+}
+
+.button-link .col-xs-1 {
+    margin: 0 auto;
+    padding: 0;
+}
+
+.button-link .panel-body:hover {
+    background-color: #EEE;
+}
+
+.default-row-margins {
+    margin: 0 -15px;
 }
\ No newline at end of file
diff --git a/css/hesk_newStyleRTL.php b/css/hesk_newStyleRTL.php
index aab80934..39d18ff9 100644
--- a/css/hesk_newStyleRTL.php
+++ b/css/hesk_newStyleRTL.php
@@ -371,28 +371,50 @@ button.dropdown-submit {
 }
 
 .attachment-table > tbody > tr > td > i {
-color: #ddd;
-text-shadow: 2px 2px #ccc;
+    color: #ddd;
+    text-shadow: 2px 2px #ccc;
 }
 
 .attachment-table > tbody > tr > td {
-vertical-align: middle;
+    vertical-align: middle;
 }
 
 .attachment-table > tbody > tr > td > span > img {
-max-height: 80px;
-max-width: 80px;
-cursor: pointer;
+    max-height: 80px;
+    max-width: 80px;
+    cursor: pointer;
 }
 
 .plaintext-editor {
-font-family: monospace;
+    font-family: monospace;
 }
 
 .table-fixed {
-table-layout: fixed;
+    table-layout: fixed;
 }
 
 .indent-15 {
-margin-right: 15px;
+    margin-right: 15px;
+}
+
+.button-link {
+    color: #4a5571;
+}
+
+.button-link:hover {
+    text-decoration: none;
+    color: #000;
+}
+
+.button-link .col-xs-1 {
+    margin: 0 auto;
+    padding: 0;
+}
+
+.button-link .panel-body:hover {
+    background-color: #EEE;
+}
+
+.default-row-margins {
+    margin: 0 -15px;
 }
\ No newline at end of file
diff --git a/inc/knowledgebase_functions.inc.php b/inc/knowledgebase_functions.inc.php
index 727207b9..53814835 100644
--- a/inc/knowledgebase_functions.inc.php
+++ b/inc/knowledgebase_functions.inc.php
@@ -287,10 +287,7 @@ function hesk_kbSearchLarge($admin = '')
 					<button class="btn btn-default" type="submit" value="<?php echo $hesklang['search']; ?>" title="<?php echo $hesklang['search']; ?>"><?php echo $hesklang['search']; ?></button>
 				</span>
 			</div>
-			<!--<span class="largebold"><?php echo $hesklang['ask']; ?></span>
-			<input type="text" name="search" class="searchfield" />
-			<input type="submit" value="<?php echo $hesklang['search']; ?>" title="<?php echo $hesklang['search']; ?>" class="searchbutton" /><br />
-		--></form>
+        </form>
 	</div>
 
 	<br />
@@ -325,10 +322,14 @@ function hesk_kbSearchSmall()
 	<td class="text-right" valign="top" width="300">
 		<div style="display:inline;margin-left:auto;margin-right:auto">
 			<form action="knowledgebase.php" method="get" class="form-inline" style="display: inline; margin: 0;">
-			     <input type="text" name="search" class="form-control" />
-			     <button class="btn btn-default" type="submit" value="<?php echo $hesklang['search_the_knowledgebase']; ?>" title="<?php echo $hesklang['search_the_knowledgebase']; ?>">
-                     <?php echo $hesklang['search_the_knowledgebase']; ?>
-                 </button>
+                <div class="input-group" style="margin: 0 15px">
+                    <input type="text" name="search" class="form-control">
+                    <span class="input-group-btn">
+                        <button class="btn btn-default" type="submit" value="<?php echo $hesklang['search_the_knowledgebase']; ?>" title="<?php echo $hesklang['search_the_knowledgebase']; ?>">
+                            <?php echo $hesklang['search_the_knowledgebase']; ?>
+                        </button>
+                    </span>
+                </div>
 			</form>
             <br><br>
 		</div>
diff --git a/index.php b/index.php
index 7e91e765..408facee 100644
--- a/index.php
+++ b/index.php
@@ -1126,46 +1126,69 @@ function print_start()
 					echo '&nbsp;';
 				}
 				?>
-            <div class="blockRow">
-                <a href="index.php?a=add">
-                    <div class="block">
-                        <div class="upper">
-                            <img src="img/newTicket.png" alt="<?php echo $hesklang['sub_ticket']; ?>" />
-                        </div>
-                        <div class="lower">
-                            <p><?php echo $hesklang['sub_ticket']; ?></p>
-                        </div>
-                    </div>
-                </a>
-                <a href="ticket.php">
-                    <div class="block">
-                        <div class="upper">
-                            <img src="img/viewTicket.png" alt="<?php echo $hesklang['view_existing']; ?>" />
+            <div class="row default-row-margins">
+                <div class="col-sm-6 col-xs-12">
+                    <a href="index.php?a=add" class="button-link">
+                        <div class="panel panel-default">
+                            <div class="panel-body">
+                                <div class="row">
+                                    <div class="col-xs-1">
+                                        <img src="img/newTicket.png" alt="<?php echo $hesklang['sub_support']; ?>">
+                                    </div>
+                                    <div class="col-xs-11">
+                                        <b><?php echo $hesklang['sub_support']; ?></b><br>
+                                        <?php echo $hesklang['open_ticket']; ?>
+                                    </div>
+                                </div>
+                            </div>
                         </div>
-                        <div class="lower">
-                            <p><?php echo $hesklang['view_existing']; ?></p>
+                    </a>
+                </div>
+                <div class="col-sm-6 col-xs-12">
+                    <a href="ticket.php" class="button-link">
+                        <div class="panel panel-default">
+                            <div class="panel-body">
+                                <div class="row">
+                                    <div class="col-xs-1">
+                                        <img src="img/viewTicket.png" alt="<?php echo $hesklang['view_existing']; ?>">
+                                    </div>
+                                    <div class="col-xs-11">
+                                        <b><?php echo $hesklang['view_existing']; ?></b><br>
+                                        <?php echo $hesklang['vet']; ?>
+                                    </div>
+                                </div>
+                            </div>
                         </div>
-                    </div>
-                </a>
-                <?php
-                if ($hesk_settings['kb_enable'])
-                {
+                    </a>
+                </div>
+            </div>
+            <?php
+            if ($hesk_settings['kb_enable'])
+            {
                 ?>
-                <a href="knowledgebase.php">
-                    <div class="block">
-                        <div class="upper">
-                            <img src="img/knowledgebase.png" alt="<?php echo $hesklang['kb_text']; ?>" />
-                        </div>
-                        <div class="lower">
-                            <p><?php echo $hesklang['kb_text']; ?></p>
-                        </div>
+                <div class="row default-row-margins">
+                    <div class="col-sm-6 col-xs-12">
+                        <a href="knowledgebase.php" class="button-link">
+                            <div class="panel panel-default">
+                                <div class="panel-body">
+                                    <div class="row">
+                                        <div class="col-xs-1">
+                                            <img src="img/knowledgebase.png" alt="<?php echo $hesklang['kb_text']; ?>">
+                                        </div>
+                                        <div class="col-xs-11">
+                                            <b><?php echo $hesklang['kb_text']; ?></b><br>
+                                            <?php echo $hesklang['viewkb']; ?>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </a>
                     </div>
-                </a>
-                <?php
-                }
-                include('custom/custom-blocks.php');
-                ?>
-            </div>
+                </div>
+            <?php
+                hesk_kbTopArticles($hesk_settings['kb_index_popart']);
+                hesk_kbLatestArticles($hesk_settings['kb_index_latest']);
+            }?>
 		</div>
 	</div>
 	<div class="blankSpace"></div>
diff --git a/language/en/text.php b/language/en/text.php
index 5e82c7cb..460a94f5 100644
--- a/language/en/text.php
+++ b/language/en/text.php
@@ -40,7 +40,10 @@ $hesklang['x_merged'] = '(+%s merged)'; // %s number of tickets merged
 $hesklang['merged_tickets'] = 'Merged tickets: ';
 $hesklang['show_number_merged'] = 'Show number of tickets merged';
 $hesklang['show_number_merged_descr'] = 'Show number of tickets merged next to Tracking ID';
-$hesklang['show_number_merged_help'] = 'If enabled, the user will be able to see which tickets were merged into the other on the ticket serarch screen.';
+$hesklang['show_number_merged_help'] = 'If enabled, the user will be able to see which tickets were merged into the other on the ticket search screen.';
+$hesklang['latest_top_on_home'] = 'Latest/Top articles on home page';
+$hesklang['latest_top_on_home_help'] = 'Select YES to display the top and latest knowledgebase articles on the home page.
+    Otherwise, a link to the knowledgebase will appear on the home page.';
 
 // ADDED OR MODIFIED IN Mods for HESK 2.2.1
 $hesklang['popart_no_colon']='Top Knowledgebase Articles'; // same as $hesklang['popart'] but without a colon (:)