diff --git a/public/css/flags/flags.css b/public/css/flags/flags.css
index 724c5255..74a7edda 100644
--- a/public/css/flags/flags.css
+++ b/public/css/flags/flags.css
@@ -7,9 +7,6 @@
     width: 16px;
     height: 11px;
     background: url('flags.png') no-repeat;
-	position: relative;
-	left: -22px;
-	bottom: -22px;
 }
 
 
diff --git a/public/css/flags/flags.min.css b/public/css/flags/flags.min.css
index 76fec47c..13ea9f0b 100644
--- a/public/css/flags/flags.min.css
+++ b/public/css/flags/flags.min.css
@@ -1,3 +1,3 @@
 /*!
  * Generated with CSS Flag Sprite generator (https://www.flag-sprites.com/)
- */.flag{display:inline-block;width:16px;height:11px;background:url('flags.png') no-repeat}.flag.flag-cn{background-position:-16px 0}.flag.flag-se{background-position:-16px -33px}.flag.flag-th{background-position:-32px -33px}.flag.flag-mx{background-position:0 -22px}.flag.flag-pt{background-position:-48px -22px}.flag.flag-ro{background-position:-64px -22px}.flag.flag-no{background-position:-32px -22px}.flag.flag-es{background-position:-48px 0}.flag.flag-tw{background-position:-48px -33px}.flag.flag-ru{background-position:0 -33px}.flag.flag-kr{background-position:-64px -11px}.flag.flag-br{background-position:0 0}.flag.flag-it{background-position:-32px -11px}.flag.flag-nl{background-position:-16px -22px}.flag.flag-fr{background-position:-64px 0}.flag.flag-de{background-position:-32px 0}.flag.flag-jp{background-position:-48px -11px}.flag.flag-hu{background-position:0 -11px}.flag.flag-us{background-position:-64px -33px}.flag.flag-is{background-position:-16px -11px}
\ No newline at end of file
+ */.flag{display:inline-block;width:16px;height:11px;background:url(flags.png) no-repeat}.flag.flag-zh{background-position:-16px 0}.flag.flag-sv{background-position:-16px -33px}.flag.flag-th{background-position:-32px -33px}.flag.flag-mx{background-position:0 -22px}.flag.flag-pt{background-position:-48px -22px}.flag.flag-ro{background-position:-64px -22px}.flag.flag-nb{background-position:-32px -22px}.flag.flag-es{background-position:-48px 0}.flag.flag-zh-Hant{background-position:-48px -33px}.flag.flag-ru{background-position:0 -33px}.flag.flag-ko{background-position:-64px -11px}.flag.flag-br{background-position:0 0}.flag.flag-it{background-position:-32px -11px}.flag.flag-nl{background-position:-16px -22px}.flag.flag-fr{background-position:-64px 0}.flag.flag-de{background-position:-32px 0}.flag.flag-ja{background-position:-48px -11px}.flag.flag-hu{background-position:0 -11px}.flag.flag-en{background-position:-64px -33px}.flag.flag-is{background-position:-16px -11px}.flag.flag-ca{background:url(flag_catalan.png) no-repeat}
\ No newline at end of file
diff --git a/templates/layouts/partials/helpers/search.jet.html b/templates/layouts/partials/helpers/search.jet.html
index fbf759f2..17637025 100644
--- a/templates/layouts/partials/helpers/search.jet.html
+++ b/templates/layouts/partials/helpers/search.jet.html
@@ -57,8 +57,8 @@
         <div name="language" class="form-refine form-input language">
         {{ range _, language := GetTorrentLanguages() }}
             <span class="input-group">
-                <input type="checkbox" name="lang" id="lang-{{ language.Code }}" value="{{language.Code}}"{{ range _, v := Search.Languages}}{{ if v.Code == language.Code }} checked{{end}}{{end}}>
-                <label for="lang-{{ language.Code }}" class="flag flag-{{ language.Flag(false) }}" title="{{LanguageName(language, T)}}"></label>
+                <input type="checkbox" name="lang" id="lang{{ language.Code }}" value="{{language.Code}}"{{ range _, v := Search.Languages}}{{ if v.Code == language.Code }} checked{{end}}{{end}}>
+                <label for="lang{{ language.Code }}" class="flag flag-{{ language.Flag(false) }}" title="{{LanguageName(language, T)}}"></label>
             </span>
         {{ end }}
         </div>
diff --git a/templates/site/user/torrents.jet.html b/templates/site/user/torrents.jet.html
index 755ab90e..1a6bf42a 100644
--- a/templates/site/user/torrents.jet.html
+++ b/templates/site/user/torrents.jet.html
@@ -26,7 +26,7 @@
                    		<a href="{{URL.Parse ("/search?c="+ torrent.Category + "_" +torrent.SubCategory) }}" title="{{T(CategoryName(torrent.Category, torrent.SubCategory))}}" class="category">
                       		{{ if torrent.Languages[0] != "" }}
 					<a href="{{ URL.Parse("/search?c="+torrent.Category+"_"+ torrent.SubCategory +"&lang=") }}{{ range key, language := torrent.Languages }}{{ language }}{{ if len(torrent.Languages) > 1 && (key+1) < len(torrent.Languages) }},{{ end }}{{ end }}">
-						<img src="/img/blank.gif" alt="{{ LanguageName(torrent.Languages[0], T) }}" class="flag flag-{{ (len(torrent.Languages) == 1) ?  torrent.Languages[0].Flag(false) : "multiple" }}" title=" {{ range key, language := torrent.Languages }}{{ LanguageName(language, T) }}{{ if len(torrent.Languages) > 1 && (key+1) < len(torrent.Languages) }},{{ end }}{{ end }}">
+						<img src="/img/blank.gif" alt="{{ LanguageNameFromCode(torrent.Languages[0], T) }}" class="flag flag-{{ (len(torrent.Languages) == 1) ?  FlagCode(torrent.Languages[0]) : "multiple" }}" title=" {{ range key, language := torrent.Languages }}{{ LanguageNameFromCode(language, T) }}{{ if len(torrent.Languages) > 1 && (key+1) < len(torrent.Languages) }},{{ end }}{{ end }}">
                                          </a>
                                {{end}}
                                </a>