diff --git a/templates/simple/_details.phtml b/templates/simple/_details.phtml
index 300266d..7249496 100644
--- a/templates/simple/_details.phtml
+++ b/templates/simple/_details.phtml
@@ -15,7 +15,7 @@
 <? endif ?>
 <? foreach ($dlist->list as $key => $item): ?>
 	<tr>
-		<td class="icon"><a href="<?=DIR_URL.$item['name']?><? if($item['type'] == 'dir') echo '/'; ?>"><img src="<?=Icon::get_url($item['name'], 'small', $item['type'])?>" alt="icon" /></a></td>
+		<td class="icon"><a href="<?=rawurlencode(DIR_URL.$item['name'])?><? if($item['type'] == 'dir') echo '/'; ?>"><img src="<?=Icon::get_url($item['name'], 'small', $item['type'])?>" alt="icon" /></a></td>
 		<? foreach ($fields as $key => $value):
 		if ($key == 'name'):?><td class="name"><a href="<?=DIR_URL.$item['name']?><? if($item['type'] == 'dir') echo '/'; ?>"><?=$item['name']?></a></td>
 		<? else: ?><td class="<?=$key?>"><?=$item[$key]?></td><? endif ?><? endforeach ?>
diff --git a/templates/simple/_icons.phtml b/templates/simple/_icons.phtml
index 7f449b1..689ec32 100644
--- a/templates/simple/_icons.phtml
+++ b/templates/simple/_icons.phtml
@@ -10,7 +10,7 @@
 <li><a href="../"><p class="icon"><img src="<?=Icon::get_parent('large')?>" alt="" /></p><p class="name">..</p><p class="info"><?=$lang->parent_dir?></p></a></li>
 	<? endif ?>
 	<? foreach ($dlist->list as $key => $item): $info = ($item['type'] == 'file') ? $item['size'] : $item['mtime'] ;?>
-<li><a href="<?=urlencode($item['name'])?><? if($item['type'] == 'dir') echo '/'; ?>" title="<?=$item['name']?>"><p class="icon"><img src="<?=Icon::get_url($item['name'], 'large', $item['type'], true)?>" alt="" /></p><p class="name"><?=Path::breakFilename($item['name'], $config->tpl_file_maxlength, $config->tpl_wordbreak)?></p><p class="info"><?=$info?></p></a></li>
+<li><a href="<?=rawurlencode($item['name'])?><? if($item['type'] == 'dir') echo '/'; ?>" title="<?=$item['name']?>"><p class="icon"><img src="<?=Icon::get_url($item['name'], 'large', $item['type'], true)?>" alt="" /></p><p class="name"><?=Path::breakFilename($item['name'], $config->tpl_file_maxlength, $config->tpl_wordbreak)?></p><p class="info"><?=$info?></p></a></li>
 	<? endforeach ?>
 </ul>	
 </td></tr></table>
\ No newline at end of file