diff --git a/src/components/com_kunena/layout/category/item.php b/src/components/com_kunena/layout/category/item.php
index ed2782e0691..73b12cc2c40 100644
--- a/src/components/com_kunena/layout/category/item.php
+++ b/src/components/com_kunena/layout/category/item.php
@@ -80,6 +80,11 @@ public function getCategoryActions()
 				$actions['create'] = $this->subLayout('Widget/Button')
 					->setProperties(array('url' => $url,'name' => 'create','scope' => 'topic','type' => 'communication','success' => true,'icon' => 'fa fa-pencil'));
 			}
+			elseif ($url && $topicicontype == 'image')
+			{
+				$actions['create'] = $this->subLayout('Widget/Button')
+					->setProperties(array('url' => $url,'name' => 'create','scope' => 'topic','type' => 'communication','success' => true,'icon' => ''));
+			}
 			else
 			{
 				$actions['create'] = $this->subLayout('Widget/Button')
@@ -104,6 +109,11 @@ public function getCategoryActions()
 					$actions['markread'] = $this->subLayout('Widget/Button')
 						->setProperties(array('url' => $url, 'name' => 'markread', 'scope' => 'category', 'type' => 'user', 'icon' => 'fa fa-book'));
 				}
+				elseif ($url && $topicicontype == 'image')
+				{
+					$actions['markread'] = $this->subLayout('Widget/Button')
+						->setProperties(array('url' => $url, 'name' => 'markread', 'scope' => 'category', 'type' => 'user', 'icon' => ''));
+				}
 				else
 				{
 					$actions['markread'] = $this->subLayout('Widget/Button')
@@ -146,6 +156,21 @@ public function getCategoryActions()
 							->setProperties(array('url' => $url,'name' => 'unsubscribe','scope' => 'category','type' => 'user','icon' => 'fa fa-bookmark-o'));
 					}
 				}
+				elseif ($url && $topicicontype == 'image')
+				{
+					if (!$subscribed)
+					{
+						$url                 = "index.php?option=com_kunena&view=category&task=subscribe&catid={$category->id}{$token}";
+						$actions['subscribe'] = $this->subLayout('Widget/Button')
+							->setProperties(array('url' => $url,'name' => 'subscribe','scope' => 'category','type' => 'user','icon' => ''));
+					}
+					else
+					{
+						$url                   = "index.php?option=com_kunena&view=category&task=unsubscribe&catid={$category->id}{$token}";
+						$actions['unsubscribe'] = $this->subLayout('Widget/Button')
+							->setProperties(array('url' => $url,'name' => 'unsubscribe','scope' => 'category','type' => 'user','icon' => ''));
+					}
+				}
 				else
 				{
 					if (!$subscribed)
diff --git a/src/libraries/kunena/icons/icons.php b/src/libraries/kunena/icons/icons.php
index 156b244b5e0..a6a1fd80001 100644
--- a/src/libraries/kunena/icons/icons.php
+++ b/src/libraries/kunena/icons/icons.php
@@ -223,6 +223,10 @@ static public function star()
 		{
 			return '<span class="glyphicon glyphicon-star"></span>';
 		}
+		elseif ($topicicontype == 'image')
+		{
+			return '<span class="kicon kfavoritestar ksmall"></span>';
+		}
 		else
 		{
 			return '<span class="icon icon-star"></span>';
@@ -283,6 +287,10 @@ static public function flag()
 		{
 			return '<span class="glyphicon glyphicon-flag"></span>';
 		}
+		elseif ($topicicontype == 'image')
+		{
+			return '<span class="kicon ktopicmy ksmall"></span>';
+		}
 		else
 		{
 			return '<span class="icon icon-flag"></span>';
@@ -743,6 +751,10 @@ static public function attach()
 		{
 			return '<span class="glyphicon glyphicon-paperclip"></span>';
 		}
+		elseif ($topicicontype == 'image')
+		{
+			return '<span class="kicon ktopicattach ksmall"></span>';
+		}
 		else
 		{
 			return '<i class="icon icon-flag-2 icon-white"></i>';