diff --git a/README.md b/README.md
index d4978f077..d20c97984 100644
--- a/README.md
+++ b/README.md
@@ -22,6 +22,7 @@ TorrentPier II - движок торрент-трекера, написанны
 
 Исходя из настроек вашего сервера, устанавливаем рекомендуемые права доступа (chmod) на указанные папки **777**, а на файлы внутри этих папок (кроме файлов **.htaccess** и **.keep**) **666**:
 - ajax/html
+- atom
 - cache
 - cache/filecache
 - files
diff --git a/upload/includes/cron/jobs/update_forums_atom.php b/upload/includes/cron/jobs/update_forums_atom.php
index 3c8384acc..eaf6bc73e 100644
--- a/upload/includes/cron/jobs/update_forums_atom.php
+++ b/upload/includes/cron/jobs/update_forums_atom.php
@@ -9,21 +9,15 @@ require_once(INC_DIR .'functions_atom.php');
 $timecheck = TIMENOW - 600;
 $forums_data = DB()->fetch_rowset("SELECT forum_id, allow_reg_tracker, forum_name FROM ". BB_FORUMS);
 
-if (file_exists($bb_cfg['atom']['path'] .'/f/0.atom') && filemtime($bb_cfg['atom']['path'] .'/f/0.atom') > $timecheck)
-{
-}
-else
+if (!file_exists($bb_cfg['atom']['path'] .'/f/0.atom') && filemtime($bb_cfg['atom']['path'] .'/f/0.atom') <= $timecheck)
 {
 	update_forum_feed(0, $forums_data);
 }
 
 foreach ($forums_data as $forum_data)
 {
-	if (file_exists($bb_cfg['atom']['path'] .'/f/'. $forum_data['forum_id'] .'.atom') && filemtime($bb_cfg['atom']['path'] .'/f/'. $forum_data['forum_id'] .'.atom') > $timecheck)
-	{
-	}
-	else
+	if (!file_exists($bb_cfg['atom']['path'] .'/f/'. $forum_data['forum_id'] .'.atom') && filemtime($bb_cfg['atom']['path'] .'/f/'. $forum_data['forum_id'] .'.atom') <= $timecheck)
 	{
 		update_forum_feed($forum_data['forum_id'], $forum_data);
 	}
-}
+}
\ No newline at end of file
diff --git a/upload/templates/default/images/feed.png b/upload/templates/default/images/feed.png
new file mode 100644
index 000000000..917dd18c9
Binary files /dev/null and b/upload/templates/default/images/feed.png differ
diff --git a/upload/templates/default/index.tpl b/upload/templates/default/index.tpl
index 8449842fe..de6de384c 100644
--- a/upload/templates/default/index.tpl
+++ b/upload/templates/default/index.tpl
@@ -13,9 +13,9 @@
 <div id="forums_top_links">
 	<div class="floatL">
 		<a href="{U_SEARCH_NEW}" class="med">{L_SEARCH_NEW}</a> &#0183;
-		<a href="{U_SEARCH_SELF_BY_LAST}" class="med">{L_SEARCH_SELF}</a> <a href="#search-my-posts" class="menu-root menu-alt1">{OPEN_MENU_IMG_ALT1}</a> &#0183;
+		<a href="{U_SEARCH_SELF_BY_LAST}" class="med">{L_SEARCH_SELF}</a> <a href="#search-my-posts" class="menu-root menu-alt1">{OPEN_MENU_IMG_ALT}</a> &#0183;
 		<a href="{U_SEARCH_LATEST}" class="med">{L_SEARCH_LATEST}</a> &#0183;
-		<a href="{U_INDEX}?map=1" class="med bold">{L_FORUM_MAP}</a>
+		<a href="{U_INDEX}?map=1" class="med bold">{FEED_IMG_ALT} {L_FORUM_MAP}</a>
 	</div>
 	<div class="floatR med bold">
 		<a class="menu-root" href="#only-new-options">{L_DISPLAYING_OPTIONS}</a>
diff --git a/upload/templates/default/tpl_config.php b/upload/templates/default/tpl_config.php
index 660d62698..4788f60a8 100644
--- a/upload/templates/default/tpl_config.php
+++ b/upload/templates/default/tpl_config.php
@@ -61,7 +61,7 @@ $images['folder_dl_hot_new']   = $_main .'folder_dl_hot_new.gif';
 // attach_icons
 $images['icon_clip']           = $_img .'icon_clip.gif';
 $images['icon_dn']             = $_img .'icon_dn.gif';
-$images['icon_magnet']        = $_img .'magnet.png';
+$images['icon_magnet']         = $_img .'magnet.png';
 
 // posting_icons
 $images['post_new']            = $_lang .'post.gif';
@@ -100,7 +100,7 @@ $images['voting_graphic'][1]   = $_main .'voting_bar.gif';
 $images['voting_graphic'][2]   = $_main .'voting_bar.gif';
 $images['voting_graphic'][3]   = $_main .'voting_bar.gif';
 $images['voting_graphic'][4]   = $_main .'voting_bar.gif';
-$images['progress_bar']	       = $_main .'progress_bar.gif';
+$images['progress_bar']        = $_main .'progress_bar.gif';
 $images['progress_bar_full']   = $_main .'progress_bar_full.gif';
 
 // Report
@@ -120,20 +120,16 @@ $bb_cfg['post_img_width_decr']     = 52;    // decrement for posted images width
 $bb_cfg['attach_img_width_decr']   = 130;   // decrement for attach images width (px)
 
 $template->assign_vars(array(
-	'IMG' => $_main,
-
-	'TEXT_BUTTONS'        => $bb_cfg['text_buttons'],
-	'POST_BTN_SPACER'     => ($bb_cfg['text_buttons']) ? '&nbsp;' : '',
-	'TOPIC_ATTACH_ICON'   => '<img src="images/icon_clip.gif" alt="" />',
-	'ATTACHMENT_ICON'     => '<img src="images/icon_clip.gif" alt="" />',
-	'OPEN_MENU_IMG_ALT1'  => '<img src="'. $_main .'menu_open_1.gif" class="menu-alt1" alt="" />',
-
-	'TOPIC_LEFT_COL_SPACER_WITDH' => $bb_cfg['topic_left_column_witdh'] - 8,  // 8px padding
-// Images auto-resize
+	'IMG'                         => $_main,
+	'TEXT_BUTTONS'                => $bb_cfg['text_buttons'],
+	'POST_BTN_SPACER'             => ($bb_cfg['text_buttons']) ? '&nbsp;' : '',
+	'FEED_IMG_ALT'                => '<img src="'. $_main .'feed.png" class="feed-small" alt="a" />',
+	'TOPIC_ATTACH_ICON'           => '<img src="images/icon_clip.gif" alt="" />',
+	'OPEN_MENU_IMG_ALT'           => '<img src="'. $_main .'menu_open_1.gif" class="menu-alt1" alt="" />',
+	'TOPIC_LEFT_COL_SPACER_WITDH' => $bb_cfg['topic_left_column_witdh'] - 8, // 8px padding
 	'POST_IMG_WIDTH_DECR_JS'      => $bb_cfg['topic_left_column_witdh'] + $bb_cfg['post_img_width_decr'],
 	'ATTACH_IMG_WIDTH_DECR_JS'    => $bb_cfg['topic_left_column_witdh'] + $bb_cfg['attach_img_width_decr'],
-
-	'MAGNET_LINKS'        => $bb_cfg['magnet_links_enabled'],
+	'MAGNET_LINKS'                => $bb_cfg['magnet_links_enabled'],
 ));
 
 // post_buttons
diff --git a/upload/templates/default/viewtopic_attach.tpl b/upload/templates/default/viewtopic_attach.tpl
index 90d5396bd..c6b3d1e95 100644
--- a/upload/templates/default/viewtopic_attach.tpl
+++ b/upload/templates/default/viewtopic_attach.tpl
@@ -4,7 +4,7 @@
 
 <!-- BEGIN denyrow -->
 <fieldset class="attach">
-<legend>{ATTACHMENT_ICON} {L_ATTACHMENT}</legend>
+<legend>{TOPIC_ATTACH_ICON} {L_ATTACHMENT}</legend>
 	<p class="attach_link denied">{postrow.attach.denyrow.L_DENIED}</p>
 </fieldset>
 
@@ -13,7 +13,7 @@
 
 <!-- BEGIN cat_images -->
 <fieldset class="attach">
-<legend>{ATTACHMENT_ICON} {L_ATTACHMENT} ({postrow.attach.cat_images.FILESIZE})</legend>
+<legend>{TOPIC_ATTACH_ICON} {L_ATTACHMENT} ({postrow.attach.cat_images.FILESIZE})</legend>
 	<p class="tCenter pad_6">
 		<img src="{postrow.attach.cat_images.IMG_SRC}" id="attachImg" class="postImg" alt="img" border="0" />
 	</p>
@@ -29,7 +29,7 @@
 
 <!-- BEGIN cat_thumb_images -->
 <fieldset class="attach">
-<legend>{ATTACHMENT_ICON} {L_ATTACHMENT_THUMBNAIL}</legend>
+<legend>{TOPIC_ATTACH_ICON} {L_ATTACHMENT_THUMBNAIL}</legend>
 	<p class="attach_link">
 		<a href="{postrow.attach.cat_thumb_images.IMG_SRC}" target="_blank"><img src="{postrow.attach.cat_thumb_images.IMG_THUMB_SRC}" alt="{postrow.attach.cat_thumb_images.DOWNLOAD_NAME}" border="0" /></a>
 	</p>