diff --git a/src/components/com_kunena/template/crypsis/assets/less/icons.less b/src/components/com_kunena/template/crypsis/assets/less/icons.less
index 06b8e9166d..9094923d92 100644
--- a/src/components/com_kunena/template/crypsis/assets/less/icons.less
+++ b/src/components/com_kunena/template/crypsis/assets/less/icons.less
@@ -114,7 +114,7 @@ div.krss-block {
 	display: inline-block;
 }
 
-.kicon-folder-new {
+.kicon-folder.knewchar {
 	background: url(assets/images/icons/folder.png) no-repeat left center;
 	width: 32px;
 	height: 32px;
diff --git a/src/libraries/kunena/icons/icons.php b/src/libraries/kunena/icons/icons.php
index 6a52c46559..a33947d64b 100644
--- a/src/libraries/kunena/icons/icons.php
+++ b/src/libraries/kunena/icons/icons.php
@@ -1098,6 +1098,11 @@ static public function caticon($categoryicon, $new = null, $big = true)
 				{
 					$bigicon = ' fa-big fa-folder-open ';
 				}
+
+				if ($categoryicon)
+				{
+					$bigicon = ' fa-big ';
+				}
 			}
 			elseif ($topicicontype == 'B2')
 			{
@@ -1109,6 +1114,11 @@ static public function caticon($categoryicon, $new = null, $big = true)
 				{
 					$bigicon = ' icon-big icon-folder ';
 				}
+
+				if ($categoryicon)
+				{
+					$bigicon = ' icon-big ';
+				}
 			}
 			elseif ($topicicontype == 'B3')
 			{
@@ -1120,17 +1130,27 @@ static public function caticon($categoryicon, $new = null, $big = true)
 				{
 					$bigicon = ' glyphicon-big glyphicon-folder-open ';
 				}
+
+				if ($categoryicon)
+				{
+					$bigicon = ' glyphicon-big ';
+				}
 			}
 			elseif ($topicicontype == 'image')
 			{
-				if ($new)
+				if (!empty($caticon))
 				{
-					$bigicon = ' kicon-folder-new ';
+					$bigicon = ' kicon-foldernew ';
 				}
 				else
 				{
 					$bigicon = ' kicon-folder ';
 				}
+
+				if ($categoryicon)
+				{
+					$bigicon = ' icon-big ';
+				}
 			}
 			else
 			{
@@ -1141,28 +1161,38 @@ static public function caticon($categoryicon, $new = null, $big = true)
 		{
 			$bigicon = ' ';
 
-			if ($topicicontype == 'image')
+			if ($topicicontype == 'fa')
 			{
 				if (!$categoryicon)
 				{
-					if ($new)
-					{
-						$bigicon = 'kicon-folder-sm-new';
-					}
-					else
-					{
-						$bigicon = 'kicon-folder-sm';
-					}
+					$bigicon = 'fa-folder-open ';
 				}
-				else
+			}
+			elseif ($topicicontype == 'B2')
+			{
+				if (!$categoryicon)
+				{
+					$bigicon = 'icon-folder ';
+				}
+			}
+			if ($topicicontype == 'B3')
+			{
+				if (!$categoryicon)
+				{
+					$bigicon = 'glyphicon-folder-open ';
+				}
+			}
+			elseif ($topicicontype == 'image')
+			{
+				if (!$categoryicon)
 				{
 					if ($new)
 					{
-						$bigicon = $categoryicon . ' knewchar';
+						$bigicon = 'kicon-folder-sm-new ';
 					}
 					else
 					{
-						$bigicon = $categoryicon;
+						$bigicon = 'kicon-folder-sm ';
 					}
 				}
 			}
@@ -1182,7 +1212,7 @@ static public function caticon($categoryicon, $new = null, $big = true)
 		}
 		elseif ($topicicontype == 'image')
 		{
-			return '<span class="' . $bigicon . '" alt="' . JText::_('COM_KUNENA_GEN_FORUM_NEWPOST') . '"> </span>';
+			return '<span class="' . $categoryicon . $bigicon . $newchar . '" alt="' . JText::_('COM_KUNENA_GEN_FORUM_NEWPOST') . '"> </span>';
 		}
 		else
 		{