diff --git a/admin-dev/themes/template/modules/list.tpl b/admin-dev/themes/template/modules/list.tpl
index 096c5c855..4cf2bf74b 100644
--- a/admin-dev/themes/template/modules/list.tpl
+++ b/admin-dev/themes/template/modules/list.tpl
@@ -191,7 +191,7 @@
 					{foreach from=$modules item=module}
 						<tr>
 							<td><input type="checkbox" name="modules" value="{$module->name}" class="noborder"></td>
-							<td><img class="imgm" alt="" src="../modules/{$module->name}/logo.gif"></td>
+							<td><img class="imgm" alt="" src="../modules/{$module->name}/{$module->logo}"></td>
 							<td>
 								<div class="moduleDesc" id="anchor{$module->name|ucfirst}">
 									<h3>{$module->displayName}{if isset($module->id) && $module->id gt 0}<span class="setup{if isset($module->active) && $module->active eq 0} off{/if}">{l s='Installed'}</span>{else}<span class="setup non-install">{l s='Not installed'}</span>{/if}</h3>
@@ -225,4 +225,4 @@
 			</table>
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/controllers/admin/AdminModulesController.php b/controllers/admin/AdminModulesController.php
index 994d1b304..175ad5df0 100644
--- a/controllers/admin/AdminModulesController.php
+++ b/controllers/admin/AdminModulesController.php
@@ -746,6 +746,9 @@ class AdminModulesControllerCore extends AdminController
 			else
 			{
 				// Fill module data
+				$modules[$km]->logo = 'logo.gif';
+				if (file_exists('../modules/'.$module->name.'/logo.png'))
+					$modules[$km]->logo = 'logo.png';
 				$modules[$km]->optionsHtml = $this->displayModuleOptions($module);
 				$modules[$km]->categoryName = (isset($this->list_modules_categories[$module->tab]['name']) ? $this->list_modules_categories[$module->tab]['name'] : $this->list_modules_categories['others']['name']);
 				$modules[$km]->options['install_url'] = self::$currentIndex.'&install='.urlencode($module->name).'&token='.$this->token.'&tab_module='.$module->tab.'&module_name='.$module->name.'#anchor'.ucfirst($module->name);