diff --git a/cookbook/models.py b/cookbook/models.py
index cb3a6d17d..ea2332d94 100644
--- a/cookbook/models.py
+++ b/cookbook/models.py
@@ -74,7 +74,10 @@ class Keyword(models.Model):
     updated_at = models.DateTimeField(auto_now=True)
 
     def __str__(self):
-        return "{0} {1}".format(self.icon, self.name)
+        if self.icon:
+            return f"{self.icon} {self.name}"
+        else:
+            return f"{self.name}"
 
 
 class Recipe(models.Model):
@@ -99,7 +102,7 @@ class Recipe(models.Model):
 
     @property
     def all_tags(self):
-        return ' '.join([(x.icon + x.name) for x in self.keywords.all()])
+        return ' '.join([(str(x)) for x in self.keywords.all()])
 
 
 class Unit(models.Model):
diff --git a/cookbook/templates/recipe_view.html b/cookbook/templates/recipe_view.html
index 3fca0f352..c79df2782 100644
--- a/cookbook/templates/recipe_view.html
+++ b/cookbook/templates/recipe_view.html
@@ -70,11 +70,12 @@
 
     {% if recipe.internal %}
         <small>{% trans 'by' %} {{ recipe.created_by.username }}<br/></small>
-        <br/>
     {% endif %}
 
-    {% if recipe.all_tags %}
-        {{ recipe.all_tags }}
+    {% if recipe.keywords %}
+        {% for x in recipe.keywords.all %}
+            <span class="badge badge-pill badge-light">{{ x }}</span>
+        {% endfor %}
         <br/>
         <br/>
     {% endif %}