diff --git a/src/QUI/Bricks/Controls/LanguageSwitches/DropDown.html b/src/QUI/Bricks/Controls/LanguageSwitches/DropDown.html
index 028b7910e2a48d222c64ffc7a29072e51c98c076..c265b465edad93de62b62b6a1696891c10023109 100644
--- a/src/QUI/Bricks/Controls/LanguageSwitches/DropDown.html
+++ b/src/QUI/Bricks/Controls/LanguageSwitches/DropDown.html
@@ -1,5 +1,6 @@
 {assign var=Site value=$this->getAttribute('Site')}
 {assign var=siteLang value=$Project->getLang()}
+{assign var=path value=$this->getAttribute('flagFolderPath')}
 
 {if count($langs) > 1}
 <div class="quiqqer-control-languageswitch-dropdown quiqqer-control-languageswitch-dropdown__withArrow">
@@ -25,7 +26,7 @@
         <a class="quiqqer-control-languageswitch-dropdown-dd-entry" href="{url id=$Site->getId( $lang ) lang=$lang}">
             {if $this->getAttribute('showFlags')}
                 <span class="quiqqer-control-languageswitch-dropdown-dd-icon">
-                    <img src="{$smarty.const.URL_BIN_DIR}16x16/flags/{$lang}.png"/>
+                    <img src="{$path}{$lang}.png"/>
                 </span>
             {/if}
 
diff --git a/src/QUI/Bricks/Controls/LanguageSwitches/DropDown.php b/src/QUI/Bricks/Controls/LanguageSwitches/DropDown.php
index e488f4a601211dbac33f11217b81289de8149832..13d9e065a2c0bd9cfe74da1670e343d98cbfaf02 100644
--- a/src/QUI/Bricks/Controls/LanguageSwitches/DropDown.php
+++ b/src/QUI/Bricks/Controls/LanguageSwitches/DropDown.php
@@ -29,7 +29,8 @@ public function __construct($attributes = array())
             'Site' => false,
             'showFlags' => true,
             'showText' => true,
-            'data-qui' => 'package/quiqqer/bricks/bin/Controls/LanguageSwitches/DropDown'
+            'data-qui' => 'package/quiqqer/bricks/bin/Controls/LanguageSwitches/DropDown',
+            'flagFolderPath' => URL_BIN_DIR . '16x16/flags/'
         ));
 
         parent::__construct($attributes);
diff --git a/src/QUI/Bricks/Controls/LanguageSwitches/Flags.html b/src/QUI/Bricks/Controls/LanguageSwitches/Flags.html
index a29aefa55b9478ba87867be88bc7684165e57806..77ee3c4b4bd83ac78c3be7c88cbb9b6928215d3b 100644
--- a/src/QUI/Bricks/Controls/LanguageSwitches/Flags.html
+++ b/src/QUI/Bricks/Controls/LanguageSwitches/Flags.html
@@ -1,23 +1,31 @@
 {assign var=Site value=$this->getAttribute('Site')}
 {assign var=siteLang value=$Project->getLang()}
+{assign var=siteLang value=$Project->getLang()}
 {assign var=all value=$this->getAttribute('all')}
+{assign var=path value=$this->getAttribute('flagFolderPath')}
 
 {if count($langs) > 1}
 {strip}
 <div class="quiqqer-bricks-languageswitch-flag">
     {foreach from=$langs item=lang}
-    {if $all || $siteLang != $lang && $Site->existLang( $lang )}
-    <a class="quiqqer-bricks-languageswitch-flag-entry" href="{url id=$Site->getId( $lang ) lang=$lang}">
+    {if $all || $siteLang != $lang}
+
+    {if $Site->getId($lang)}
+    <a class="quiqqer-bricks-languageswitch-flag-entry" href="{url id=$Site->getId($lang) lang=$lang}">
+    {else}
+    <a class="quiqqer-bricks-languageswitch-flag-entry" href="{url id=1 lang=$lang}">
+    {/if}
+
         {if $this->getAttribute('showFlags')}
-            <span class="quiqqer-bricks-languageswitch-flag-entry-icon">
-                <img src="{$smarty.const.URL_BIN_DIR}16x16/flags/{$lang}.png"/>
-            </span>
+        <span class="quiqqer-bricks-languageswitch-flag-entry-icon">
+            <img src="{$path}{$lang}.png"/>
+        </span>
         {/if}
 
         {if $this->getAttribute('showText')}
-            <span class="quiqqer-bricks-languageswitch-flag-entry-text">
-                {$lang}
-            </span>
+        <span class="quiqqer-bricks-languageswitch-flag-entry-text">
+            {$lang}
+        </span>
         {/if}
     </a>
     {/if}
diff --git a/src/QUI/Bricks/Controls/LanguageSwitches/Flags.php b/src/QUI/Bricks/Controls/LanguageSwitches/Flags.php
index 637e8d94ab7160795c3a916bd746453bcc4cf60a..0a15820b61440f3c784528eb99c99d36f34c4d0a 100644
--- a/src/QUI/Bricks/Controls/LanguageSwitches/Flags.php
+++ b/src/QUI/Bricks/Controls/LanguageSwitches/Flags.php
@@ -30,7 +30,8 @@ public function __construct($attributes = array())
             'showFlags' => true,
             'showText' => true,
             'all' => true,
-            'data-qui' => 'package/quiqqer/bricks/bin/Controls/LanguageSwitches/Flags'
+            'data-qui' => 'package/quiqqer/bricks/bin/Controls/LanguageSwitches/Flags',
+            'flagFolderPath' => URL_BIN_DIR . '16x16/flags/'
         ));
 
         parent::__construct($attributes);