diff --git a/cookbook/forms.py b/cookbook/forms.py
index b5dca7256..621e02192 100644
--- a/cookbook/forms.py
+++ b/cookbook/forms.py
@@ -1,6 +1,7 @@
 from django import forms
 from django.forms import widgets
 from django.utils.translation import gettext as _
+from emoji_picker.widgets import EmojiPickerTextInput
 
 from .models import *
 
@@ -10,11 +11,6 @@ class MultiSelectWidget(widgets.SelectMultiple):
         js = ('custom/js/form_multiselect.js',)
 
 
-class EmojiWidget(forms.TextInput):
-    class Media:
-        js = ('custom/js/form_emoji.js',)
-
-
 class ExternalRecipeForm(forms.ModelForm):
     file_path = forms.CharField(disabled=True, required=False)
     storage = forms.ModelChoiceField(queryset=Storage.objects.all(), disabled=True, required=False)
@@ -65,7 +61,7 @@ class KeywordForm(forms.ModelForm):
     class Meta:
         model = Keyword
         fields = ('name', 'icon', 'description')
-        widgets = {'icon': EmojiWidget}
+        widgets = {'icon': EmojiPickerTextInput}
 
 
 class StorageForm(forms.ModelForm):
diff --git a/cookbook/templates/base.html b/cookbook/templates/base.html
index 3ade8a660..8337df5e9 100644
--- a/cookbook/templates/base.html
+++ b/cookbook/templates/base.html
@@ -45,11 +45,6 @@
     <!-- Fontawesome icons -->
     <link rel="stylesheet" href="{% static "fontawesome/fontawesome_all.min.css" %}">
 
-    <!-- Emojiara stuff for emoji select -->
-    <!--TODO refactor and look for better solution -->
-    <link rel="stylesheet" href="{% static "emojionearea/emojionearea.min.css" %}">
-    <script type="text/javascript" src="{% static "emojionearea/emojionearea.min.js" %}"></script>
-
     {% block extra_head %} <!-- block for templates to put stuff into header -->
     {% endblock %}
 
diff --git a/cookbook/templates/recipe_view.html b/cookbook/templates/recipe_view.html
index 53769c774..84f4fedb7 100644
--- a/cookbook/templates/recipe_view.html
+++ b/cookbook/templates/recipe_view.html
@@ -44,7 +44,7 @@
                     <div class="card-body">
                         <div class="row">
                             <div class="col col-md-9">
-                                <h5 class="card-title">{% trans 'Ingredients' %}</h5>
+                                <h4 class="card-title">{% trans 'Ingredients' %}</h4>
                             </div>
                             <div class="col col-md-3">
 
diff --git a/cookbook/views/edit.py b/cookbook/views/edit.py
index 98dfe326b..0c098d4e5 100644
--- a/cookbook/views/edit.py
+++ b/cookbook/views/edit.py
@@ -232,6 +232,11 @@ class RecipeDelete(LoginRequiredMixin, DeleteView):
     model = Recipe
     success_url = reverse_lazy('index')
 
+    def form_valid(self, form):
+        self.object = form.save(commit=False)
+
+        return super(RecipeDelete, self).form_valid(form)
+
     def get_context_data(self, **kwargs):
         context = super(RecipeDelete, self).get_context_data(**kwargs)
         context['title'] = _("Recipe")
diff --git a/recipes/settings.py b/recipes/settings.py
index 4ba8e717b..5cf981c7e 100644
--- a/recipes/settings.py
+++ b/recipes/settings.py
@@ -50,6 +50,7 @@ INSTALLED_APPS = [
     'django_tables2',
     'django_filters',
     'crispy_forms',
+    'emoji_picker',
     'rest_framework',
     'cookbook.apps.CookbookConfig',
 ]
diff --git a/requirements.txt b/requirements.txt
index 3befe57e3..615f02b71 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,6 +4,7 @@ django-filter
 django-crispy-forms
 djangorestframework
 django-autocomplete-light
+django-emoji-picker
 six
 requests
 markdown