diff --git a/components/indexhtml/index-en.html.in b/components/indexhtml/index-en.html.in
index 7c550e0..0b779f2 100644
--- a/components/indexhtml/index-en.html.in
+++ b/components/indexhtml/index-en.html.in
@@ -2,9 +2,10 @@
 <html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 
 <!-- Disto name in title -->
-<title>@PRODUCT_NAME@</title>
+<title>@product_name@</title>
 
 <link href="index.css" rel="stylesheet" type="text/css">
+<link href="images/product.png" rel="shortcut icon" type="image/png" />
 </head>
 <body>
 
@@ -16,30 +17,43 @@
 </div>
 
 <!-- Disto name -->
-<div id="title">@PRODUCT_NAME@</div>
+<table border="0" width="100%" id="header">
+<tr>
+<td><img src="images/product-logo.png" alt="@product_name@" id="product-logo"></td>
+<td id="search">
+<!-- Search pane -->
+<form action="http://www.google.com/search" method="get">
+<input type="hidden" name="cx" value="009267546552065786736:rwjixpf6cv8">
+
+<input id="search_string" type="text" name="q" placeholder="Search in Internet">
+
+</form>
+</td>
+</tr></table>
+
 
 <div id="main">
 <!-- Links columns -->
-<table border="0" width="100%">
+<table border="0" width="100%" cellspacing="0">
 <tr>
 <th width="33%"><img src="images/documentation.png" alt="Documentation"></th>
-<th width="33%"><img src="images/altlinux-logo.png" alt="Company" class="icon_big"></th>
-<th width="34%"><img src="images/community.png" alt="Community" class="icon"></th>
+<th width="33%"><img src="images/altlinux-logo.png" alt="Company"></th>
+<th width="34%"><img src="images/community.png" alt="Community"></th>
 </tr>
 
 <tr>
-<td width="33%" class="column"> <!-- First column: documentation -->
+<td width="33%" class="column" id="left-pane"> <!-- First column: documentation -->
 <ul>
-<li><a href="file:///usr/share/doc/documentation/index.html">User Manual</a></li>
+<li><a href="documentation/index.html">User Manual</a></li>
 <li><a href="http://docs.altlinux.org">Online Documentation</a></li>
 <li><a href="http://shop.altlinux.ru/index.php?categoryID=559">Books</a></li>
 <li><a href="http://altlinux.org/">Wiki</a></li>
 <li><a href="http://altlinux.org/FAQ">FAQ</a></li>
-<li><a href="http://altlinux.org/Features">Features</a></li>
+<li><a href="http://altlinux.org/Features">ALT Linux Features</a></li>
 </ul>
 </td>
 
-<td width="33%" id="central_pane"> <!-- Second column: Company -->
+<td width="33%" class="column" id="central-pane"> <!-- Second column: Company -->
 <ul>
 <li><a href="http://www.altlinux.com">ALT Linux Website</a></li>
 <li><a href="http://shop.altlinux.ru">Internet Shop</a></li>
@@ -50,7 +64,7 @@
 </ul>
 </td>
 
-<td width="34%" class="column"> <!-- Third column: community -->
+<td width="34%" class="column" id="right-pane"> <!-- Third column: community -->
 <ul>
 <li><a href="http://lists.altlinux.org">Mailing Lists</a></li>
 <li><a href="http://forum.altlinux.org">User Forum</a></li>
@@ -63,23 +77,14 @@
 
 </tr>
 
-<tr><td colspan="3" id="search">
-<!-- Search pane -->
-<form action="http://www.google.com/search" method="get">
-<img src="images/magnifier.png" alt="Search on online resources">
-<input type="hidden" name="cx" value="009267546552065786736:rwjixpf6cv8">
-<input id="search_string" type="text" name="q" size="35">
-<input id="search_button" type="submit" name="sa" value="Search in Internet">
-</form>
-</td></tr>
-
 <!-- Social networks -->
-<tr><td colspan="3" id="social">We will be glade to meet you on the following social networks:</td></tr>
-<tr>
-<th><a href="http://twitter.com/#!/altlinuxru" class="image"><img src="images/twitter.png" alt="Twitter" class="banner"></a></th>
-<th><a href="http://www.facebook.com/groups/simplylinux/" class="image"><img src="images/facebook.png" alt="Facebook" class="banner"></a></th>
-<th><a href="http://vkontakte.ru/club16711511" class="image"><img src="images/vkontakte.png" alt="VKontakte" class="banner"></a></th>
-</tr>
+<tr><td colspan="3" id="social-pane">
+<div id="social">We will be glade to meet you on the following social networks:</div>
+<div id="social-icons">
+<a href="http://twitter.com/#!/altlinuxru" class="image"><img src="images/twitter.png" alt="Twitter" class="banner"></a>
+<a href="https://www.facebook.com/group.php?gid=136328550579" class="image"><img src="images/facebook.png" alt="Facebook" class="banner"></a>
+<a href="http://vkontakte.ru/club667081" class="image"><img src="images/vkontakte.png" alt="VKontakte" class="banner"></a>
+</div></td></tr>
 
 </table>
 
diff --git a/components/indexhtml/index-ru.html.in b/components/indexhtml/index-ru.html.in
index 0f0d0af..8fea9e6 100644
--- a/components/indexhtml/index-ru.html.in
+++ b/components/indexhtml/index-ru.html.in
@@ -2,9 +2,10 @@
 <html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 
 <!-- Disto name in title -->
-<title>@PRODUCT_NAME_RU@</title>
+<title>@product_name_ru</title>
 
 <link href="index.css" rel="stylesheet" type="text/css">
+<link href="images/product.png" rel="shortcut icon" type="image/png" />
 </head>
 <body>
 
@@ -16,21 +17,34 @@
 </div>
 
 <!-- Disto name -->
-<div id="title">@PRODUCT_NAME_RU@</div>
+
+<table border="0" width="100%" id="header">
+<tr>
+<td><img src="images/product-logo.png" alt="@product_name_ru@" id="product-logo"></td>
+<td id="search">
+<!-- Search pane -->
+<form action="http://www.google.com/search" method="get">
+<input type="hidden" name="cx" value="009267546552065786736:rwjixpf6cv8">
+
+<input id="search_string" type="text" name="q" placeholder="Поиск в Интернете">
+
+</form>
+</td>
+</tr></table>
 
 <div id="main">
 <!-- Links columns -->
-<table border="0" width="100%">
+<table border="0" width="100%" cellspacing="0">
 <tr>
 <th width="33%"><img src="images/documentation.png" alt="Документация"></th>
-<th width="33%"><img src="images/altlinux-logo.png" alt="Компания" class="icon_big"></th>
-<th width="34%"><img src="images/community.png" alt="Сообщество" class="icon"></th>
+<th width="33%"><img src="images/altlinux-logo.png" alt="Компания"></th>
+<th width="34%"><img src="images/community.png" alt="Сообщество"></th>
 </tr>
 
 <tr>
-<td width="33%" class="column"> <!-- First column: documentation -->
+<td width="33%" class="column" id="left-pane"> <!-- First column: documentation -->
 <ul>
-<li><a href="file:///usr/share/doc/documentation/index.html">Руководство пользователя</a></li>
+<li><a href="documentation/index.html">Руководство пользователя</a></li>
 <li><a href="http://docs.altlinux.org">Онлайновая документация</a></li>
 <li><a href="http://shop.altlinux.ru/index.php?categoryID=559">Книги</a></li>
 <li><a href="http://altlinux.org/">Wiki</a></li>
@@ -39,7 +53,7 @@
 </ul>
 </td>
 
-<td width="33%" id="central_pane"> <!-- Second column: Company -->
+<td width="33%" class="column" id="central-pane"> <!-- Second column: Company -->
 <ul>
 <li><a href="http://www.altlinux.ru">Сайт компании</a></li>
 <li><a href="http://shop.altlinux.ru">Интернет-магазин</a></li>
@@ -50,7 +64,7 @@
 </ul>
 </td>
 
-<td width="34%" class="column"> <!-- Third column: community -->
+<td width="34%" class="column" id="right-pane"> <!-- Third column: community -->
 <ul>
 <li><a href="http://lists.altlinux.org">Списки рассылки</a></li>
 <li><a href="http://forum.altlinux.org">Форум пользователей</a></li>
@@ -63,23 +77,14 @@
 
 </tr>
 
-<tr><td colspan="3" id="search">
-<!-- Search pane -->
-<form action="http://www.google.com/search" method="get">
-<img src="images/magnifier.png" alt="Поиск по ресурсам ALT Linux">
-<input type="hidden" name="cx" value="009267546552065786736:rwjixpf6cv8">
-<input id="search_string" type="text" name="q" size="35">
-<input id="search_button" type="submit" name="sa" value="Поиск в Интернете">
-</form>
-</td></tr>
-
 <!-- Social networks -->
-<tr><td colspan="3" id="social">Мы рады встретиться с вами в социальных сетях:</td></tr>
-<tr>
-<th><a href="http://twitter.com/#!/altlinuxru" class="image"><img src="images/twitter.png" alt="Twitter" class="banner"></a></th>
-<th><a href="http://www.facebook.com/groups/simplylinux/" class="image"><img src="images/facebook.png" alt="Facebook" class="banner"></a></th>
-<th><a href="http://vkontakte.ru/club16711511" class="image"><img src="images/vkontakte.png" alt="ВКонтакте" class="banner"></a></th>
-</tr>
+<tr><td colspan="3" id="social-pane">
+<div id="social">Мы рады встретиться с вами в социальных сетях:</div>
+<div id="social-icons">
+<a href="http://twitter.com/#!/altlinuxru" class="image"><img src="images/twitter.png" alt="Twitter" class="banner"></a>
+<a href="https://www.facebook.com/group.php?gid=136328550579" class="image"><img src="images/facebook.png" alt="Facebook" class="banner"></a>
+<a href="http://vkontakte.ru/club667081" class="image"><img src="images/vkontakte.png" alt="ВКонтакте" class="banner"></a>
+</div></td></tr>
 
 </table>