diff --git a/plugins/language_switch/flags.tpl b/plugins/language_switch/flags.tpl
index 421815a8e..54063fd03 100644
--- a/plugins/language_switch/flags.tpl
+++ b/plugins/language_switch/flags.tpl
@@ -5,7 +5,7 @@
   <div class="switchBoxTitle">{'Language'|@translate}</div> 
   {foreach from=$lang_switch.flags item=flag name=f}
   <a rel="nofollow" href="{$flag.url}">
-    <span class="pwg-icon flags langflag-{$flag.code}">{$flag.alt}</span>{$flag.title}
+    {if $lang_info.direction=="ltr"}<span class="pwg-icon flags langflag-{$flag.code}">{$flag.alt}</span>{$flag.title}{else}{$flag.title}<span class="pwg-icon flags langflag-{$flag.code}">{$flag.alt}</span>{/if}
   </a>
   {if ($smarty.foreach.f.index+1)%3 == 0}<br>{/if}
   {/foreach}
diff --git a/plugins/language_switch/language_switch.css b/plugins/language_switch/language_switch.css
index de25a34af..06c867d09 100644
--- a/plugins/language_switch/language_switch.css
+++ b/plugins/language_switch/language_switch.css
@@ -15,6 +15,7 @@
     margin-right: 3px;
     width: 24px;
     height: 16px;
+    direction: ltr;
 }
 
 /** Change the langflag-XX label to match a new language. All flags are represented there**/