diff --git a/View/Helper/BootstrapHtmlHelper.php b/View/Helper/BootstrapHtmlHelper.php
index <HASH>..<HASH> 100644
--- a/View/Helper/BootstrapHtmlHelper.php
+++ b/View/Helper/BootstrapHtmlHelper.php
@@ -341,7 +341,8 @@ class BootstrapHtmlHelper extends HtmlHelper {
  * @return string
  */
 	public function icon($type, $text = '', $options = array()) {
-		$class = "icon icon-$type";
+		$icon = $this->icon;
+		$class = "$icon $icon-$type";
 
 		if (isset($options['class']) && !empty($class)) {
 			$options['class'] = $class . ' ' . $options['class'];
Merge origin/master

Conflicts:
	README.md