diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index ac65604f35..725957a0c1 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -576,7 +576,7 @@ class user extends session
 
 		$template->set_template();
 
-		$this->img_lang = (file_exists($phpbb_root_path . 'styles/' . $this->theme['default']['imageset_path'] . '/imageset/' . $this->lang_name)) ? $this->lang_name : $config['default_lang'];
+		$this->img_lang = (file_exists($phpbb_root_path . 'styles/' . $this->theme['primary']['imageset_path'] . '/imageset/' . $this->lang_name)) ? $this->lang_name : $config['default_lang'];
 
 		return;
 	}
@@ -602,12 +602,23 @@ class user extends session
 
 		if (empty($imgs[$img]) || $no_cache)
 		{
-			$alt = (!empty($this->lang[$alt])) ? $this->lang[$alt] : '';
+			if (!$width)
+			{
+				list($imgsrc, $height, $width) = explode('*', $this->theme['primary'][$img]);
+			}
+			else
+			{
+				list($imgsrc, $height) = explode('*', $this->theme['primary'][$img]);
+			}
 
-			$width = ($width) ? 'width="' . $width . '" ' : '';
+			$imgsrc = '"' . $phpbb_root_path . 'styles/' . $this->theme['primary']['imageset_path'] . '/imageset/' . str_replace('{LANG}', $this->img_lang, $imgsrc) . '"';
+			$width = ($width) ? ' width="' . $width . '"' : '';
+			$height = ($height) ? ' height="' . $height . '"' : '';
+			$alt = (!empty($this->lang[$alt])) ? $this->lang[$alt] : $alt;
 
-			$imgs[$img] = '<img src=' . str_replace('{LANG}', $this->img_lang, $this->theme['primary'][$img]) . ' ' . $width . 'alt="' . $alt . '" title="' . $alt . '" name="' . $img . '"/>';
+			$imgs[$img] = '<img src=' . $imgsrc . $width . $height . ' alt="' . $alt . '" title="' . $alt . '" name="' . $img . '"/>';
 		}
+
 		return $imgs[$img];
 	}
 
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 83c930a22a..40cf14ded0 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -285,7 +285,7 @@ INSERT INTO phpbb_styles (style_id, style_name, style_copyright, template_id, th
 # MSSQL IDENTITY phpbb_styles_imageset ON #
 
 # -- phpbb_styles_imageset
-INSERT INTO phpbb_styles_imageset (imageset_id, imageset_name, imageset_copyright, imageset_path, site_logo, btn_post, btn_post_pm, btn_reply, btn_reply_pm, btn_locked, btn_profile, btn_pm, btn_delete, btn_ip, btn_quote, btn_search, btn_edit, btn_report, btn_email, btn_www, btn_icq, btn_aim, btn_yim, btn_msnm, btn_jabber, btn_online, btn_offline, btn_topic_watch, btn_topic_unwatch, icon_unapproved, icon_reported, icon_attach, icon_post, icon_post_new, icon_post_latest, icon_post_newest, forum, forum_new, forum_locked, forum_link, sub_forum, sub_forum_new, folder, folder_posted, folder_new, folder_new_posted, folder_hot, folder_hot_posted, folder_hot_new, folder_hot_new_posted, folder_locked, folder_locked_posted, folder_locked_new, folder_locked_new_posted, folder_sticky, folder_sticky_posted, folder_sticky_new, folder_sticky_new_posted, folder_announce, folder_announce_posted, folder_announce_new, folder_announce_new_posted, poll_left, poll_center, poll_right) VALUES (1, 'subSilver', '© phpBB Group', 'subSilver', '', '"styles/subSilver/imageset/{LANG}/btn_post_pm.gif" width="97" height="27" border="0"', '"styles/subSilver/imageset/{LANG}/btn_post_pm.gif" width="97" height="27" border="0"', '"styles/subSilver/imageset/{LANG}/btn_reply.gif" width="97" height="27" border="0"', '"styles/subSilver/imageset/{LANG}/reply.gif" width="95" height="25" border="0"', '"styles/subSilver/imageset/{LANG}/btn_locked.gif" width="97" height="27" border="0"', '"styles/subSilver/imageset/{LANG}/btn_profile.gif" width="72" height="20" border="0"', '"styles/subSilver/imageset/{LANG}/btn_pm.gif" width="72" height="20" border="0"', '"styles/subSilver/imageset/{LANG}/btn_delete.gif" width="20" height="20" border="0"', '"styles/subSilver/imageset/{LANG}/btn_ip.gif" width="20" height="20" border="0"', '"styles/subSilver/imageset/{LANG}/btn_quote.gif" width="90" height="20" border="0"', '"styles/subSilver/imageset/{LANG}/btn_search.gif" width="72" height="20" border="0"', '"styles/subSilver/imageset/{LANG}/btn_edit.gif" width="90" height="20" border="0"', '"styles/subSilver/imageset/{LANG}/btn_report.gif" width="20" height="20" border="0"', '"styles/subSilver/imageset/{LANG}/btn_email.gif" width="72" height="20" border="0"', '"styles/subSilver/imageset/{LANG}/btn_www.gif" width="72" height="20" border="0"', '"styles/subSilver/imageset/{LANG}/btn_icq.gif" width="72" height="20" border="0"', '"styles/subSilver/imageset/{LANG}/btn_aim.gif" width="72" height="20" border="0"', '"styles/subSilver/imageset/{LANG}/btn_yim.gif" width="72" height="20" border="0"', '"styles/subSilver/imageset/{LANG}/btn_msnm.gif" width="72" height="20" border="0"', '"styles/subSilver/imageset/{LANG}/btn_jabber.gif" width="72" height="20" border="0"', '"styles/subSilver/imageset/{LANG}/btn_online.gif" width="72" height="20" border="0"', '"styles/subSilver/imageset/{LANG}/btn_offline.gif" width="72" height="20" border="0"', '', '', '"styles/subSilver/imageset/icon_unapproved.gif" width="19" height="18" border="0"', '"styles/subSilver/imageset/icon_reported.gif" width="19" height="18" border="0"', '"styles/subSilver/imageset/icon_attach.gif" width="14" height="18" border="0"', '"styles/subSilver/imageset/icon_minipost.gif" width="12" height="9" border="0"', '"styles/subSilver/imageset/icon_minipost_new.gif" width="12" height="9" border="0"', '"styles/subSilver/imageset/icon_latest_reply.gif" width="18" height="9" border="0"', '"styles/subSilver/imageset/icon_newest_reply.gif" width="18" height="9" border="0"', '"styles/subSilver/imageset/folder_big.gif" width="46" height="25" border="0"', '"styles/subSilver/imageset/folder_new_big.gif" width="46" height="25" border="0"', '"styles/subSilver/imageset/folder_locked_big.gif" width="46" height="25" border="0"', '"styles/subSilver/imageset/folder_link_big.gif" width="46" height="25" border="0"', '"styles/subSilver/imageset/subfolder_big.gif" width="46" height="25" border="0"', '"styles/subSilver/imageset/subfolder_new_big.gif" width="46" height="25" border="0"', '"styles/subSilver/imageset/folder.gif" width="19" height="18" border="0"', '"styles/subSilver/imageset/folder_posted.gif" width="19" height="18" border="0"', '"styles/subSilver/imageset/folder_new.gif" width="19" height="18" border="0"', '"styles/subSilver/imageset/folder_new_posted.gif" width="19" height="18" border="0"', '"styles/subSilver/imageset/folder_hot.gif" width="19" height="18" border="0"', '"styles/subSilver/imageset/folder_hot_posted.gif" width="19" height="18" border="0"', '"styles/subSilver/imageset/folder_new_hot.gif" width="19" height="18" border="0"', '"styles/subSilver/imageset/folder_new_hot_posted.gif" width="19" height="18" border="0"', '"styles/subSilver/imageset/folder_lock.gif" width="19" height="18" border="0"', '"styles/subSilver/imageset/folder_lock_posted.gif" width="19" height="18" border="0"', '"styles/subSilver/imageset/folder_lock_new.gif" width="19" height="18" border="0"', '"styles/subSilver/imageset/folder_lock_new_posted.gif" width="19" height="18" border="0"', '"styles/subSilver/imageset/folder_sticky.gif" width="19" height="18" border="0"', '"styles/subSilver/imageset/folder_sticky_posted.gif" width="19" height="18" border="0"', '"styles/subSilver/imageset/folder_sticky_new.gif" width="19" height="18" border="0"', '"styles/subSilver/imageset/folder_sticky_new_posted.gif" width="19" height="18" border="0"', '"styles/subSilver/imageset/folder_announce.gif" width="19" height="18" border="0"', '"styles/subSilver/imageset/folder_announce_posted.gif" width="19" height="18" border="0"', '"styles/subSilver/imageset/folder_announce_new.gif" width="19" height="18" border="0"', '"styles/subSilver/imageset/folder_announce_new_posted.gif" width="19" height="18" border="0"', '"styles/subSilver/imageset/vote_lcap.gif" width="4" height="12" border="0"', '"styles/subSilver/imageset/voting_bar.gif" height="12" border="0"', '"styles/subSilver/imageset/vote_rcap.gif" width="4" height="12" border="0"');
+INSERT INTO phpbb_styles_imageset (imageset_id, imageset_name, imageset_copyright, imageset_path, site_logo, btn_post, btn_post_pm, btn_reply, btn_reply_pm, btn_locked, btn_profile, btn_pm, btn_delete, btn_ip, btn_quote, btn_search, btn_edit, btn_report, btn_email, btn_www, btn_icq, btn_aim, btn_yim, btn_msnm, btn_jabber, btn_online, btn_offline, btn_topic_watch, btn_topic_unwatch, icon_unapproved, icon_reported, icon_attach, icon_post, icon_post_new, icon_post_latest, icon_post_newest, forum, forum_new, forum_locked, forum_link, sub_forum, sub_forum_new, folder, folder_posted, folder_new, folder_new_posted, folder_hot, folder_hot_posted, folder_hot_new, folder_hot_new_posted, folder_locked, folder_locked_posted, folder_locked_new, folder_locked_new_posted, folder_sticky, folder_sticky_posted, folder_sticky_new, folder_sticky_new_posted, folder_announce, folder_announce_posted, folder_announce_new, folder_announce_new_posted, poll_left, poll_center, poll_right) VALUES (1, 'subSilver', '© phpBB Group', 'subSilver', '', '{LANG}/btn_post_pm.gif*27*97', '{LANG}/btn_post_pm.gif*27*97', '{LANG}/btn_reply.gif*27*97', '{LANG}/reply.gif*25*95', '{LANG}/btn_locked.gif*27*97', '{LANG}/btn_profile.gif*20*72', '{LANG}/btn_pm.gif*20*72', '{LANG}/btn_delete.gif*20*20', '{LANG}/btn_ip.gif*20*20', '{LANG}/btn_quote.gif*20*90', '{LANG}/btn_search.gif*20*72', '{LANG}/btn_edit.gif*20*90', '{LANG}/btn_report.gif*20*20', '{LANG}/btn_email.gif*20*72', '{LANG}/btn_www.gif*20*72', '{LANG}/btn_icq.gif*20*72', '{LANG}/btn_aim.gif*20*72', '{LANG}/btn_yim.gif*20*72', '{LANG}/btn_msnm.gif*20*72', '{LANG}/btn_jabber.gif*20*72', '{LANG}/btn_online.gif*20*72', '{LANG}/btn_offline.gif*20*72', '', '', 'icon_unapproved.gif*18*19', 'icon_reported.gif*18*19', 'icon_attach.gif*18*14', 'icon_minipost.gif*9*12', 'icon_minipost_new.gif*9*12', 'icon_latest_reply.gif*9*18', 'icon_newest_reply.gif*9*18', 'folder_big.gif*25*46', 'folder_new_big.gif*25*46', 'folder_locked_big.gif*25*46', 'folder_link_big.gif*25*46', 'subfolder_big.gif*25*46', 'subfolder_new_big.gif*25*46', 'folder.gif*18*19', 'folder_posted.gif*18*19', 'folder_new.gif*18*19', 'folder_new_posted.gif*18*19', 'folder_hot.gif*18*19', 'folder_hot_posted.gif*18*19', 'folder_new_hot.gif*18*19', 'folder_new_hot_posted.gif*18*19', 'folder_lock.gif*18*19', 'folder_lock_posted.gif*18*19', 'folder_lock_new.gif*18*19', 'folder_lock_new_posted.gif*18*19', 'folder_sticky.gif*18*19', 'folder_sticky_posted.gif*18*19', 'folder_sticky_new.gif*18*19', 'folder_sticky_new_posted.gif*18*19', 'folder_announce.gif*18*19', 'folder_announce_posted.gif*18*19', 'folder_announce_new.gif*18*19', 'folder_announce_new_posted.gif*18*19', 'vote_lcap.gif*12*4', 'voting_bar.gif*12', 'vote_rcap.gif*12*4');
 
 # MSSQL IDENTITY phpbb_styles_imageset OFF #