diff --git a/application/language/de-CH/config_lang.php b/application/language/de-CH/config_lang.php
index 33fe8f2e0..f7547ffe1 100644
--- a/application/language/de-CH/config_lang.php
+++ b/application/language/de-CH/config_lang.php
@@ -27,7 +27,9 @@ $lang["config_barcode_width"] = "Breite (px)";
 $lang["config_barcode_generate_if_empty"] = "Generiere Barcode wenn leer";
 $lang["config_company"] = "Firmenname";
 $lang["config_company_logo"] = "Logo";
-$lang["config_company_choose_file"] = "";
+$lang["config_company_select_image"] = "";
+$lang["config_company_change_image"] = "";
+$lang["config_company_remove_image"] = "";
 $lang["config_company_required"] = "Firmenname ist erforderlich";
 $lang["config_company_website_url"] = "Webseite ist nicht in korrektem Format";
 $lang["config_currency_side"] = "Pos. rechts";
diff --git a/application/language/en/config_lang.php b/application/language/en/config_lang.php
index 15d4360ad..20dca55ff 100644
--- a/application/language/en/config_lang.php
+++ b/application/language/en/config_lang.php
@@ -27,7 +27,9 @@ $lang["config_barcode_width"] = "Width (px)";
 $lang["config_barcode_generate_if_empty"] = "Generate if empty";
 $lang["config_company"] = "Company Name";
 $lang["config_company_logo"] = "Company Logo";
-$lang["config_company_choose_file"] = "Choose File";
+$lang["config_company_select_image"] = "Select Image";
+$lang["config_company_change_image"] = "Change Image";
+$lang["config_company_remove_image"] = "Remove Image";
 $lang["config_company_required"] = "Company name is a required field";
 $lang["config_company_website_url"] = "Company website is not a valid URL (http://...)";
 $lang["config_currency_side"] = "Right side";
diff --git a/application/language/es/config_lang.php b/application/language/es/config_lang.php
index 48e0c9fcb..2d96866d8 100644
--- a/application/language/es/config_lang.php
+++ b/application/language/es/config_lang.php
@@ -27,7 +27,9 @@ $lang["config_barcode_width"] = "Ancho (px)";
 $lang["config_barcode_generate_if_empty"] = "Generate if empty";
 $lang["config_company"] = "Nombre del Comercio";
 $lang["config_company_logo"] = "Logotipo del Comercio";
-$lang["config_company_choose_file"] = "";
+$lang["config_company_select_image"] = "";
+$lang["config_company_change_image"] = "";
+$lang["config_company_remove_image"] = "";
 $lang["config_company_required"] = "Nombre del Comercio es requerido";
 $lang["config_company_website_url"] = "Sitio Web no es una URL estándar (http://...)";
 $lang["config_currency_side"] = "Lado derecho";
diff --git a/application/language/fr/config_lang.php b/application/language/fr/config_lang.php
index c5747801a..e17ea1edf 100644
--- a/application/language/fr/config_lang.php
+++ b/application/language/fr/config_lang.php
@@ -27,7 +27,9 @@ $lang["config_barcode_width"] = "Width (px)";
 $lang["config_barcode_generate_if_empty"] = "Generate if empty";
 $lang["config_company"] = "Nome de l\'Entreprise";
 $lang["config_company_logo"] = "Company Logo";
-$lang["config_company_choose_file"] = "";
+$lang["config_company_select_image"] = "";
+$lang["config_company_change_image"] = "";
+$lang["config_company_remove_image"] = "";
 $lang["config_company_required"] = "Le nom d\'entreprise est requis";
 $lang["config_company_website_url"] = "Le site web de l\'entreprise n\'est pas une URL valide (http://...)";
 $lang["config_currency_side"] = "Symbole à droite";
diff --git a/application/language/id/config_lang.php b/application/language/id/config_lang.php
index fc38f2c0c..1835994f8 100644
--- a/application/language/id/config_lang.php
+++ b/application/language/id/config_lang.php
@@ -27,7 +27,9 @@ $lang["config_barcode_width"] = "Width (px)";
 $lang["config_barcode_generate_if_empty"] = "Generate if empty";
 $lang["config_company"] = "Nama Perusahaan";
 $lang["config_company_logo"] = "Company Logo";
-$lang["config_company_choose_file"] = "";
+$lang["config_company_select_image"] = "";
+$lang["config_company_change_image"] = "";
+$lang["config_company_remove_image"] = "";
 $lang["config_company_required"] = "Nama Perusahaan wajib diisi";
 $lang["config_company_website_url"] = "Situs Perusahaan bukan URL yang benar(http://...)";
 $lang["config_currency_side"] = "Sisi Kanan";
diff --git a/application/language/nl-BE/config_lang.php b/application/language/nl-BE/config_lang.php
index 2dee2e016..7828dc2a0 100755
--- a/application/language/nl-BE/config_lang.php
+++ b/application/language/nl-BE/config_lang.php
@@ -27,7 +27,9 @@ $lang["config_barcode_width"] = "Breedte (px)";
 $lang["config_barcode_generate_if_empty"] = "Genereer indien leeg";
 $lang["config_company"] = "Bedrijfsnaam";
 $lang["config_company_logo"] = "Logo";
-$lang["config_company_choose_file"] = "";
+$lang["config_company_select_image"] = "";
+$lang["config_company_change_image"] = "";
+$lang["config_company_remove_image"] = "";
 $lang["config_company_required"] = "De bedrijfsnaam moet ingevuld worden";
 $lang["config_company_website_url"] = "De website van het bedrijf is geen geldige URL (http://...)";
 $lang["config_currency_side"] = "Rechterkant";
diff --git a/application/language/ru/config_lang.php b/application/language/ru/config_lang.php
index c4c5be0c0..06c9536ec 100644
--- a/application/language/ru/config_lang.php
+++ b/application/language/ru/config_lang.php
@@ -27,7 +27,9 @@ $lang["config_barcode_width"] = "Width (px)";
 $lang["config_barcode_generate_if_empty"] = "Generate if empty";
 $lang["config_company"] = "Название Компании";
 $lang["config_company_logo"] = "Company Logo";
-$lang["config_company_choose_file"] = "";
+$lang["config_company_select_image"] = "";
+$lang["config_company_change_image"] = "";
+$lang["config_company_remove_image"] = "";
 $lang["config_company_required"] = "Имя Компании обязательный пробел";
 $lang["config_company_website_url"] = "Веб-сайт Компании не является допустимым URL (http://...)";
 $lang["config_currency_side"] = "Правая сторона";
diff --git a/application/language/th/config_lang.php b/application/language/th/config_lang.php
index beb7a0e3a..5a03f54f4 100644
--- a/application/language/th/config_lang.php
+++ b/application/language/th/config_lang.php
@@ -27,7 +27,9 @@ $lang["config_barcode_width"] = "กว้าง (px)";
 $lang["config_barcode_generate_if_empty"] = "Generate if empty";
 $lang["config_company"] = "ชื่อร้านค้า";
 $lang["config_company_logo"] = "ภาพโลโก้";
-$lang["config_company_choose_file"] = "";
+$lang["config_company_select_image"] = "";
+$lang["config_company_change_image"] = "";
+$lang["config_company_remove_image"] = "";
 $lang["config_company_required"] = "ชื่อร้านค้าต้องกรอก";
 $lang["config_company_website_url"] = "เว็บไซต์ร้านค้าไม่ถูกต้อง";
 $lang["config_currency_side"] = "ด้านขวา";
diff --git a/application/language/tr/config_lang.php b/application/language/tr/config_lang.php
index 371acaaf1..cc32ae946 100644
--- a/application/language/tr/config_lang.php
+++ b/application/language/tr/config_lang.php
@@ -27,7 +27,9 @@ $lang["config_barcode_width"] = "Width (px)";
 $lang["config_barcode_generate_if_empty"] = "Generate if empty";
 $lang["config_company"] = "Şirket Adı";
 $lang["config_company_logo"] = "Company Logo";
-$lang["config_company_choose_file"] = "";
+$lang["config_company_select_image"] = "";
+$lang["config_company_change_image"] = "";
+$lang["config_company_remove_image"] = "";
 $lang["config_company_required"] = "Şirket Adı zorunlu alandır";
 $lang["config_company_website_url"] = "website adresi yanlış (http://...)";
 $lang["config_currency_side"] = "Sağda";
diff --git a/application/language/zh/config_lang.php b/application/language/zh/config_lang.php
index 01c7ec29a..daf95b21a 100755
--- a/application/language/zh/config_lang.php
+++ b/application/language/zh/config_lang.php
@@ -27,7 +27,9 @@ $lang["config_barcode_width"] = "Width (px)";
 $lang["config_barcode_generate_if_empty"] = "Generate if empty";
 $lang["config_company"] = "公司名稱";
 $lang["config_company_logo"] = "Company Logo";
-$lang["config_company_choose_file"] = "";
+$lang["config_company_select_image"] = "";
+$lang["config_company_change_image"] = "";
+$lang["config_company_remove_image"] = "";
 $lang["config_company_required"] = "公司名稱為必填";
 $lang["config_company_website_url"] = "公司網址格式錯誤 (http://...)";
 $lang["config_currency_side"] = "Right side";
diff --git a/application/views/configs/general_config.php b/application/views/configs/general_config.php
index c2acbea2e..fe984e8ff 100644
--- a/application/views/configs/general_config.php
+++ b/application/views/configs/general_config.php
@@ -22,15 +22,15 @@
 			<?php echo form_label($this->lang->line('config_company_logo'), 'company_logo', array('class'=>'control-label col-xs-2')); ?>
 				<div class='col-xs-6'>
 					<div class="fileinput fileinput-new" data-provides="fileinput">
-						<div class="fileinput-new thumbnail" style="width: 200px; height: 150px;">	
-							<img data-src="holder.js/100%x100%" <!-- alt="100%x100%" src="..." style="height: 100%; width: 100%; display: block;" --> >
+						<div class="fileinput-new thumbnail" style="width: 200px; height: 200px;">	
+							<img data-src="holder.js/100%x100%" alt="<?php echo $this->lang->line('config_company_logo'); ?>" src="<?php if($this->Appconfig->get('company_logo') != '') echo base_url('uploads/' . $this->Appconfig->get('company_logo')); else echo ''; ?>" style="max-height: 100%; max-width: 100%;">
 						</div>
-						<div class="fileinput-preview fileinput-exists thumbnail" style="max-width: 200px; max-height: 150px;"></div>
+						<div class="fileinput-preview fileinput-exists thumbnail" style="max-width: 200px; max-height: 200px;"></div>
 						<div>
 							<span class="btn btn-default btn-sm btn-file">
-								<span class="fileinput-new"><!-- Select image --> <?php echo $this->lang->line("config_company_choose_file"); ?></span>
-								<span class="fileinput-exists">Change</span><input type="file" name="company_logo"></span>
-							<a href="#" class="btn btn-default btn-sm fileinput-exists" data-dismiss="fileinput">Remove</a>
+								<span class="fileinput-new"><?php echo $this->lang->line("config_company_select_image"); ?></span>
+								<span class="fileinput-exists"><?php echo $this->lang->line("config_company_change_image"); ?></span><input type="file" name="company_logo"></span>
+							<a href="#" class="btn btn-default btn-sm fileinput-exists" data-dismiss="fileinput"><?php echo $this->lang->line("config_company_remove_image"); ?></a>
 						</div>
 					</div>
 				</div>
diff --git a/translations/config_lang.csv b/translations/config_lang.csv
index 169ceeceb..76911ddba 100644
--- a/translations/config_lang.csv
+++ b/translations/config_lang.csv
@@ -26,7 +26,9 @@ config_barcode_width,Breite (px),Breedte (px),Ancho (px),Width (px),Width (px),W
 config_barcode_generate_if_empty,Generiere Barcode wenn leer,Genereer indien leeg,Generate if empty,Generate if empty,Generate if empty,Generate if empty,Generate if empty,Generate if empty,Generate if empty,Generate if empty
 config_company,Firmenname,Bedrijfsnaam,Nombre del Comercio,Company Name,Nome de l\'Entreprise,公司名稱,Название Компании,ชื่อร้านค้า,Şirket Adı,Nama Perusahaan
 config_company_logo,Logo,Logo,Logotipo del Comercio,Company Logo,Company Logo,Company Logo,Company Logo,ภาพโลโก้,Company Logo,Company Logo
-config_company_choose_file,,,,Choose File,,,,,,
+config_company_select_image,,,,Select Image,,,,,,
+config_company_change_image,,,,Change Image,,,,,,
+config_company_remove_image,,,,Remove Image,,,,,,
 config_company_required,Firmenname ist erforderlich,De bedrijfsnaam moet ingevuld worden,Nombre del Comercio es requerido,Company name is a required field,Le nom d\'entreprise est requis,公司名稱為必填,Имя Компании обязательный пробел,ชื่อร้านค้าต้องกรอก,Şirket Adı zorunlu alandır,Nama Perusahaan wajib diisi
 config_company_website_url,Webseite ist nicht in korrektem Format,De website van het bedrijf is geen geldige URL (http://...),Sitio Web no es una URL estándar (http://...),Company website is not a valid URL (http://...),Le site web de l\'entreprise n\'est pas une URL valide (http://...),公司網址格式錯誤 (http://...),Веб-сайт Компании не является допустимым URL (http://...),เว็บไซต์ร้านค้าไม่ถูกต้อง,website adresi yanlış (http://...),Situs Perusahaan bukan URL yang benar(http://...)
 config_currency_side,Pos. rechts,Rechterkant,Lado derecho,Right side,Symbole à droite,Right side,Правая сторона,ด้านขวา,Sağda,Sisi Kanan