diff --git a/install/sql/mysql.sql b/install/sql/mysql.sql
index 65c31c7a3..3aff20e8d 100644
--- a/install/sql/mysql.sql
+++ b/install/sql/mysql.sql
@@ -102,8 +102,8 @@ CREATE TABLE IF NOT EXISTS `bb_attachments_config` (
 --
 
 INSERT INTO `bb_attachments_config` VALUES ('upload_dir', 'data/old_files');
-INSERT INTO `bb_attachments_config` VALUES ('upload_img', 'images/icon_clip.gif');
-INSERT INTO `bb_attachments_config` VALUES ('topic_icon', 'images/icon_clip.gif');
+INSERT INTO `bb_attachments_config` VALUES ('upload_img', 'styles/images/icon_clip.gif');
+INSERT INTO `bb_attachments_config` VALUES ('topic_icon', 'styles/images/icon_clip.gif');
 INSERT INTO `bb_attachments_config` VALUES ('display_order', '0');
 INSERT INTO `bb_attachments_config` VALUES ('max_filesize', '262144');
 INSERT INTO `bb_attachments_config` VALUES ('attachment_quota', '52428800');
@@ -546,7 +546,7 @@ INSERT INTO `bb_config` VALUES ('seed_bonus_user_regdate', '0');
 INSERT INTO `bb_config` VALUES ('site_desc', 'A little text to describe your forum');
 INSERT INTO `bb_config` VALUES ('sitemap_time', '');
 INSERT INTO `bb_config` VALUES ('sitename', 'TorrentPier II - Torrent Tracker');
-INSERT INTO `bb_config` VALUES ('smilies_path', 'images/smiles');
+INSERT INTO `bb_config` VALUES ('smilies_path', 'styles/images/smiles');
 INSERT INTO `bb_config` VALUES ('static_sitemap', '');
 INSERT INTO `bb_config` VALUES ('topics_per_page', '50');
 INSERT INTO `bb_config` VALUES ('xs_use_cache', '1');
@@ -988,7 +988,7 @@ CREATE TABLE IF NOT EXISTS `bb_ranks` (
 -- Дамп данных таблицы `bb_ranks`
 --
 
-INSERT INTO `bb_ranks` VALUES (1, 'Администратор', -1, 1, 'images/ranks/admin.png', 'colorAdmin');
+INSERT INTO `bb_ranks` VALUES (1, 'Администратор', -1, 1, 'styles/images/ranks/admin.png', 'colorAdmin');
 
 -- --------------------------------------------------------
 
diff --git a/upload/library/ajax/user_register.php b/upload/library/ajax/user_register.php
index 3639d128a..aa0a3d009 100644
--- a/upload/library/ajax/user_register.php
+++ b/upload/library/ajax/user_register.php
@@ -6,7 +6,7 @@ global $bb_cfg, $lang, $userdata;
 
 $mode = (string) $this->request['mode'];
 
-$html = '<img src="./images/good.gif">';
+$html = '<img src="./styles/images/good.gif">';
 switch($mode)
 {
 	case 'check_name':
@@ -14,11 +14,11 @@ switch($mode)
 
 		if (empty($username))
 		{
-			$html = '<img src="./images/bad.gif"> <span class="leechmed bold">'. $lang['CHOOSE_A_NAME'] .'</span>';
+			$html = '<img src="./styles/images/bad.gif"> <span class="leechmed bold">'. $lang['CHOOSE_A_NAME'] .'</span>';
 		}
 		elseif($err = validate_username($username))
 		{
-			$html = '<img src="./images/bad.gif"> <span class="leechmed bold">'. $err .'</span>';
+			$html = '<img src="./styles/images/bad.gif"> <span class="leechmed bold">'. $err .'</span>';
 		}
 	break;
 
@@ -27,11 +27,11 @@ switch($mode)
 
 		if (empty($email))
 		{
-			$html = '<img src="./images/bad.gif"> <span class="leechmed bold">'. $lang['CHOOSE_E_MAIL'] .'</span>';
+			$html = '<img src="./styles/images/bad.gif"> <span class="leechmed bold">'. $lang['CHOOSE_E_MAIL'] .'</span>';
 		}
 		elseif($err = validate_email($email))
 		{
-			$html = '<img src="./images/bad.gif"> <span class="leechmed bold">'. $err .'</span>';
+			$html = '<img src="./styles/images/bad.gif"> <span class="leechmed bold">'. $err .'</span>';
 		}
 	break;
 
@@ -40,28 +40,28 @@ switch($mode)
 		$pass_confirm = (string) $this->request['pass_confirm'];
 		if (empty($pass) || empty($pass_confirm))
 		{
-			$html = '<img src="./images/bad.gif"> <span class="leechmed bold">'. $lang['CHOOSE_PASS'] .'</span>';
+			$html = '<img src="./styles/images/bad.gif"> <span class="leechmed bold">'. $lang['CHOOSE_PASS'] .'</span>';
 		}
 		else
 		{
 			if ($pass != $pass_confirm)
 			{
-				$html = '<img src="./images/bad.gif"> <span class="leechmed bold">'. $lang['CHOOSE_PASS_ERR'] .'</span>';
+				$html = '<img src="./styles/images/bad.gif"> <span class="leechmed bold">'. $lang['CHOOSE_PASS_ERR'] .'</span>';
 			}
 			else
 			{
 				if (mb_strlen($pass, 'UTF-8') > 20)
 				{
-					$html = '<img src="./images/bad.gif"> <span class="leechmed bold">'. sprintf($lang['CHOOSE_PASS_ERR_MAX'], 20) .'</span>';
+					$html = '<img src="./styles/images/bad.gif"> <span class="leechmed bold">'. sprintf($lang['CHOOSE_PASS_ERR_MAX'], 20) .'</span>';
 				}
 				elseif (mb_strlen($pass, 'UTF-8') < 5)
 				{
-					$html = '<img src="./images/bad.gif"> <span class="leechmed bold">'. sprintf($lang['CHOOSE_PASS_ERR_MIN'], 5) .'</span>';
+					$html = '<img src="./styles/images/bad.gif"> <span class="leechmed bold">'. sprintf($lang['CHOOSE_PASS_ERR_MIN'], 5) .'</span>';
 				}
 				else
 				{
 					$text = (IS_GUEST) ? $lang['CHOOSE_PASS_REG_OK'] : $lang['CHOOSE_PASS_OK'];
-					$html = '<img src="./images/good.gif"> <span class="seedmed bold">'. $text .'</span>';
+					$html = '<img src="./styles/images/good.gif"> <span class="seedmed bold">'. $text .'</span>';
 				}
 			}
 		}
diff --git a/upload/library/includes/page_header.php b/upload/library/includes/page_header.php
index 905522719..17eaf93a3 100644
--- a/upload/library/includes/page_header.php
+++ b/upload/library/includes/page_header.php
@@ -177,7 +177,7 @@ $template->assign_vars(array(
 	'HTML_SIDEBAR_2'     => LANG_DIR . 'html/sidebar2.html',
 
 	// Common urls
-	'AVATARS_URL'        => "images/avatars",
+	'AVATARS_URL'        => 'data/avatars',
 	'CAT_URL'            => BB_ROOT . CAT_URL,
 	'DOWNLOAD_URL'       => BB_ROOT . DOWNLOAD_URL,
 	'FORUM_URL'          => BB_ROOT . FORUM_URL,
diff --git a/upload/library/language/en/html/sidebar1.html b/upload/library/language/en/html/sidebar1.html
index 4bbf9e940..08fa4f64d 100644
--- a/upload/library/language/en/html/sidebar1.html
+++ b/upload/library/language/en/html/sidebar1.html
@@ -20,4 +20,4 @@
 
 <br />
 
-<img width="210" class="spacer" src="./images/spacer.gif" alt="" />
\ No newline at end of file
+<img width="210" class="spacer" src="./styles/images/spacer.gif" alt="" />
\ No newline at end of file
diff --git a/upload/library/language/en/main.php b/upload/library/language/en/main.php
index 0e69c1acf..039ea430a 100644
--- a/upload/library/language/en/main.php
+++ b/upload/library/language/en/main.php
@@ -1794,7 +1794,7 @@ $lang['ENABLE_PRUNE'] = 'Enable Forum Pruning';
 $lang['ALLOW_BBCODE'] = 'Allow BBCode';
 $lang['ALLOW_SMILIES'] = 'Allow Smilies';
 $lang['SMILIES_PATH'] = 'Smilies Storage Path';
-$lang['SMILIES_PATH_EXPLAIN'] = 'Path under your TorrentPier II root dir, e.g. images/smiles';
+$lang['SMILIES_PATH_EXPLAIN'] = 'Path under your TorrentPier II root dir, e.g. styles/images/smiles';
 $lang['ALLOW_SIG'] = 'Allow Signatures';
 $lang['MAX_SIG_LENGTH'] = 'Maximum signature length';
 $lang['MAX_SIG_LENGTH_EXPLAIN'] = 'Maximum number of characters in user signatures';
diff --git a/upload/library/language/ru/html/sidebar1.html b/upload/library/language/ru/html/sidebar1.html
index e876107be..6c999dfc9 100644
--- a/upload/library/language/ru/html/sidebar1.html
+++ b/upload/library/language/ru/html/sidebar1.html
@@ -20,4 +20,4 @@
 
 <br />
 
-<img width="210" class="spacer" src="./images/spacer.gif" alt="" />
\ No newline at end of file
+<img width="210" class="spacer" src="./styles/images/spacer.gif" alt="" />
\ No newline at end of file
diff --git a/upload/library/language/ru/main.php b/upload/library/language/ru/main.php
index 53305a3bb..c7aeda26a 100644
--- a/upload/library/language/ru/main.php
+++ b/upload/library/language/ru/main.php
@@ -1794,7 +1794,7 @@ $lang['ENABLE_PRUNE'] = 'Включить чистку форумов';
 $lang['ALLOW_BBCODE'] = 'Разрешить BBCode';
 $lang['ALLOW_SMILIES'] = 'Разрешить смайлики';
 $lang['SMILIES_PATH'] = 'Путь к смайликам';
-$lang['SMILIES_PATH_EXPLAIN'] = 'Каталог ниже корня TorrentPier II, например images/smilies';
+$lang['SMILIES_PATH_EXPLAIN'] = 'Каталог ниже корня TorrentPier II, например styles/images/smilies';
 $lang['ALLOW_SIG'] = 'Разрешить подписи';
 $lang['MAX_SIG_LENGTH'] = 'Макс. длина подписи';
 $lang['MAX_SIG_LENGTH_EXPLAIN'] = 'Максимальное кол-во символов в подписи пользователя';
diff --git a/upload/library/language/uk/html/sidebar1.html b/upload/library/language/uk/html/sidebar1.html
index 74b9a1053..f0dcac149 100644
--- a/upload/library/language/uk/html/sidebar1.html
+++ b/upload/library/language/uk/html/sidebar1.html
@@ -20,4 +20,4 @@
 
 <br />
 
-<img width="210" class="spacer" src="./images/spacer.gif" alt="" />
\ No newline at end of file
+<img width="210" class="spacer" src="./styles/images/spacer.gif" alt="" />
\ No newline at end of file
diff --git a/upload/styles/js/bbcode.js b/upload/styles/js/bbcode.js
index d437b6f45..4ade8fcb6 100644
--- a/upload/styles/js/bbcode.js
+++ b/upload/styles/js/bbcode.js
@@ -334,7 +334,7 @@ function initQuotes(context)
 		if ( quoted_pid = $q.children('u.q-post:first').text() ) {
 			var on_this_page = $('#post_'+quoted_pid).length;
 			var href = (on_this_page) ? '#'+ quoted_pid : './viewtopic.php?p='+ quoted_pid +'#'+ quoted_pid;
-			q_title += ' <a href="'+ href +'" title="'+bbl['quoted_post']+'"><img src="'+bb_url+'templates/default/images/icon_latest_reply.gif" class="icon2" alt="" /></a>';
+			q_title += ' <a href="'+ href +'" title="'+bbl['quoted_post']+'"><img src="'+bb_url+'styles/templates/default/images/icon_latest_reply.gif" class="icon2" alt="" /></a>';
 		}
 		$q.before('<div class="q-head">'+ q_title +'</div>');
 	});
@@ -353,7 +353,7 @@ function initPostImages(context)
 		$img.bind('click', function(){ return imgFit(this, maxW); });
 		if (user.opt_js.i_aft_l) {
 			$('#preload').append($img);
-			var loading_icon = '<a href="'+ src +'" target="_blank"><img src="'+bb_url+'images/pic_loading.gif" alt="" /></a>';
+			var loading_icon = '<a href="'+ src +'" target="_blank"><img src="'+bb_url+'styles/images/pic_loading.gif" alt="" /></a>';
 			$v.html(loading_icon);
 			if ($.browser.msie) {
 				$v.after('<wbr>');
@@ -416,7 +416,7 @@ function fixPostImage ($img)
 	var banned_image_hosts = /imagebanana|hidebehind/i;
 	var src = $img[0].src;
 	if (src.match(banned_image_hosts)) {
-		$img.wrap('<a href="'+ this.src +'" target="_blank"></a>').attr({ src: ""+bb_url+"images/tr_oops.gif", title: ""+bbl['scr_rules']+"" });
+		$img.wrap('<a href="'+ this.src +'" target="_blank"></a>').attr({ src: ""+bb_url+"styles/images/smiles/tr_oops.gif", title: ""+bbl['scr_rules']+"" });
 	}
 	return $img;
 }
diff --git a/upload/styles/templates/admin/admin_cron.tpl b/upload/styles/templates/admin/admin_cron.tpl
index 1ec6b1f94..befb0e3b9 100644
--- a/upload/styles/templates/admin/admin_cron.tpl
+++ b/upload/styles/templates/admin/admin_cron.tpl
@@ -91,9 +91,9 @@ tr.hl-tr:hover td { background-color: #CFC !important; }
 	<td nowrap="nowrap" align="center">{list.NEXT_RUN}</td>
 	<td nowrap="nowrap" align="center"><span style="color: #505050;" class="leechmed"><b>{list.RUN_COUNT}</b></span></td>
 	<td nowrap="nowrap" align="center">
-		<a href="admin_cron.php?mode=run&id={list.CRON_ID}"><img src="{SITE_URL}images/icon_sync.gif" alt="[Run]" title="{L_CRON_RUN}" /></a>
-		<a href="admin_cron.php?mode=edit&id={list.CRON_ID}"><img src="{SITE_URL}images/icon_edit.gif" alt="[Edit]" title="{L_CRON_EDIT_HEAD_EDIT}" /></a>
-		<a href="admin_cron.php?mode=delete&id={list.CRON_ID}"><img src="{SITE_URL}images/icon_delete.gif" alt="[Del]" title="{L_CRON_DEL}" onclick="return cfm('{L_DELETE_JOB}');" /></a>
+		<a href="admin_cron.php?mode=run&id={list.CRON_ID}"><img src="{SITE_URL}styles/images/icon_sync.gif" alt="[Run]" title="{L_CRON_RUN}" /></a>
+		<a href="admin_cron.php?mode=edit&id={list.CRON_ID}"><img src="{SITE_URL}styles/images/icon_edit.gif" alt="[Edit]" title="{L_CRON_EDIT_HEAD_EDIT}" /></a>
+		<a href="admin_cron.php?mode=delete&id={list.CRON_ID}"><img src="{SITE_URL}styles/images/icon_delete.gif" alt="[Del]" title="{L_CRON_DEL}" onclick="return cfm('{L_DELETE_JOB}');" /></a>
 	</td>
 </tr>
 <!-- END list -->
diff --git a/upload/styles/templates/default/css/main.css b/upload/styles/templates/default/css/main.css
index 9c39a7873..5ca5875eb 100644
--- a/upload/styles/templates/default/css/main.css
+++ b/upload/styles/templates/default/css/main.css
@@ -517,7 +517,7 @@ table.smilies td { padding: 3px; text-align: center; }
  * ---------------------------------- */
 #main-nav {
 	padding: 4px 10px; margin: 0;
-	border: solid #C3CBD1 /*#CFD4D8*/; border-width: 0 0 1px 0; background: #eff0f3 /*url('../images/cellpic.gif')*/;
+	border: solid #C3CBD1; border-width: 0 0 1px 0; background: #eff0f3;
 	}
 	#main-nav b { padding: 0 4px 0 1px; }
 	#main-nav a { color: #444; text-decoration: none; }
diff --git a/upload/styles/templates/default/page_header.tpl b/upload/styles/templates/default/page_header.tpl
index 9ec0bad85..8016cec9d 100644
--- a/upload/styles/templates/default/page_header.tpl
+++ b/upload/styles/templates/default/page_header.tpl
@@ -4,7 +4,7 @@
 <title><!-- IF PAGE_TITLE -->{PAGE_TITLE} :: {SITENAME}<!-- ELSE -->{SITENAME}<!-- ENDIF --></title>
 <meta http-equiv="Content-Type" content="text/html; charset={L_CONTENT_ENCODING}" />
 <meta http-equiv="Content-Style-Type" content="text/css" />
-<meta property="og:image" content="{SITE_URL}images/logo/logo.png" />
+<meta property="og:image" content="{SITE_URL}styles/images/logo/logo.png" />
 {META}
 <link rel="stylesheet" href="{STYLESHEET}?v={$bb_cfg['css_ver']}" type="text/css">
 <link rel="shortcut icon" href="{SITE_URL}favicon.ico" type="image/x-icon">
@@ -271,7 +271,7 @@ if ( (typeof(window.opera) != "undefined" && window.opera.version() < 12) || (wi
 <div id="logo">
 	<!--<h1>{SITENAME}</h1>
 	<h6>{SITE_DESCRIPTION}</h6> -->
-	<a href="{U_INDEX}"><img src="images/logo/logo.png" alt="{SITENAME}" /></a>
+	<a href="{U_INDEX}"><img src="styles/images/logo/logo.png" alt="{SITENAME}" /></a>
 </div>
 <!--/logo-->
 
diff --git a/upload/styles/templates/default/usercp_register.tpl b/upload/styles/templates/default/usercp_register.tpl
index 22815ac04..aac351baa 100644
--- a/upload/styles/templates/default/usercp_register.tpl
+++ b/upload/styles/templates/default/usercp_register.tpl
@@ -93,7 +93,7 @@ document.write('<input type="hidden" name="user_timezone" value="'+tz+'" />');
 <!-- IF CAPTCHA_HTML -->
 <tr>
 	<td class="prof-title">{L_CONFIRM_CODE}: *</td>
-	<td><span id="refresh_captcha">{CAPTCHA_HTML}</span> <img align="middle" src="{SITE_URL}images/pic_loading.gif" title="{L_UPDATE}" onclick="ajax.exec({ action: 'user_register', mode: 'refresh_captcha'}); return false;" /></td>
+	<td><span id="refresh_captcha">{CAPTCHA_HTML}</span> <img align="middle" src="{SITE_URL}styles/images/pic_loading.gif" title="{L_UPDATE}" onclick="ajax.exec({ action: 'user_register', mode: 'refresh_captcha'}); return false;" /></td>
 </tr>
 <!-- ENDIF -->
 <!-- IF EDIT_PROFILE -->
diff --git a/upload/styles/templates/default/usercp_sendpasswd.tpl b/upload/styles/templates/default/usercp_sendpasswd.tpl
index 4bad6b3cd..564b41241 100644
--- a/upload/styles/templates/default/usercp_sendpasswd.tpl
+++ b/upload/styles/templates/default/usercp_sendpasswd.tpl
@@ -27,7 +27,7 @@ ajax.callback.user_register = function(data){
 <!-- IF CAPTCHA_HTML -->
 <tr>
 	<td>{L_CONFIRM_CODE}:</td>
-	<td><span id="refresh_captcha">{CAPTCHA_HTML}</span> <img align="middle" src="./images/pic_loading.gif" title="{L_UPDATE}" onclick="ajax.exec({ action: 'user_register', mode: 'refresh_captcha'}); return false;"></td>
+	<td><span id="refresh_captcha">{CAPTCHA_HTML}</span> <img align="middle" src="./styles/images/pic_loading.gif" title="{L_UPDATE}" onclick="ajax.exec({ action: 'user_register', mode: 'refresh_captcha'}); return false;"></td>
 </tr>
 <!-- ENDIF -->
 <tr>
diff --git a/upload/styles/templates/default/viewtopic_attach.tpl b/upload/styles/templates/default/viewtopic_attach.tpl
index d412a8345..153b63393 100644
--- a/upload/styles/templates/default/viewtopic_attach.tpl
+++ b/upload/styles/templates/default/viewtopic_attach.tpl
@@ -148,11 +148,11 @@
 	</tr>
 	<!-- IF postrow.attach.tor_reged.TOR_SILVER_GOLD == 2 && $tr_cfg['gold_silver_enabled'] -->
 	<tr class="row4">
-		<th colspan="3" class="row7"><img src="images/tor_silver.gif" width="16" height="15" title="{L_SILVER}" />&nbsp;{L_SILVER_STATUS}&nbsp;<img src="images/tor_silver.gif" width="16" height="15" title="{L_SILVER}" /></th>
+		<th colspan="3" class="row7"><img src="styles/images/tor_silver.gif" width="16" height="15" title="{L_SILVER}" />&nbsp;{L_SILVER_STATUS}&nbsp;<img src="styles/images/tor_silver.gif" width="16" height="15" title="{L_SILVER}" /></th>
 	</tr>
 	<!-- ELSEIF postrow.attach.tor_reged.TOR_SILVER_GOLD == 1 && $tr_cfg['gold_silver_enabled'] -->
 	<tr class="row4">
-		<th colspan="3" class="row7"><img src="images/tor_gold.gif" width="16" height="15" title="{L_GOLD}" />&nbsp;{L_GOLD_STATUS}&nbsp;<img src="images/tor_gold.gif" width="16" height="15" title="{L_GOLD}" /></th>
+		<th colspan="3" class="row7"><img src="styles/images/tor_gold.gif" width="16" height="15" title="{L_GOLD}" />&nbsp;{L_GOLD_STATUS}&nbsp;<img src="styles/images/tor_gold.gif" width="16" height="15" title="{L_GOLD}" /></th>
 	</tr>
 	<!-- ENDIF -->
 	<tr class="row1">
@@ -335,8 +335,8 @@ $('#tor-filelist-btn').click(function(){
 #tor-filelist i { color: #7A7A7A; padding-left: 4px; }
 #tor-filelist s { color: #0000FF; text-decoration: none; }
 #tor-filelist .b > s { color: #800000; }
-#tor-filelist .b { font-weight: bold; padding-left: 20px; background: transparent url('images/folder.gif') no-repeat 3px 50%;}
-#tor-filelist ul li span { padding-left: 20px; background: transparent url('images/page.gif') no-repeat 3px 50%;}
+#tor-filelist .b { font-weight: bold; padding-left: 20px; background: transparent url('styles/images/folder.gif') no-repeat 3px 50%;}
+#tor-filelist ul li span { padding-left: 20px; background: transparent url('styles/images/page.gif') no-repeat 3px 50%;}
 #tor-filelist .tor-root-dir { font-size: 13px; font-weight: bold; line-height: 12px; padding-left: 4px; }
 #tor-fl-treecontrol { padding: 2px 0 4px; }
 #tor-fl-treecontrol a { padding: 0 8px; font-size: 11px; text-decoration: none; }