diff --git a/.gitignore b/.gitignore
index 4002e45e5..6bfc03c06 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,10 +44,6 @@ nosetests.xml
 coverage.xml
 *,cover
 
-# Translations
-*.mo
-*.pot
-
 # Django stuff:
 *.log
 
diff --git a/cookbook/locale/de/LC_MESSAGES/django.mo b/cookbook/locale/de/LC_MESSAGES/django.mo
new file mode 100644
index 000000000..2640e2a90
Binary files /dev/null and b/cookbook/locale/de/LC_MESSAGES/django.mo differ
diff --git a/cookbook/templates/include/storage_backend_warning.html b/cookbook/templates/include/storage_backend_warning.html
index 817a5840c..356b001e7 100644
--- a/cookbook/templates/include/storage_backend_warning.html
+++ b/cookbook/templates/include/storage_backend_warning.html
@@ -1,7 +1,7 @@
 {% load i18n %}
 
 <div class="alert alert-danger" role="alert">
-    <h4 class="alert-heading"><i class="far fa-exclamation-triangle"></i> {% trans 'Security Warning' %}</h4>
+    <h4 class="alert-heading"><i class="fas fa-exclamation-triangle"></i> {% trans 'Security Warning' %}</h4>
     <p>{% blocktrans %}
         The <b>Password and Token</b> field are stored as <b>plain text</b> inside the database.
         This is necessary because they are needed to make API requests, but it also increases the risk of
diff --git a/cookbook/urls.py b/cookbook/urls.py
index d1ac1a6ea..933ee6222 100644
--- a/cookbook/urls.py
+++ b/cookbook/urls.py
@@ -28,7 +28,7 @@ urlpatterns = [
     path('edit/keyword/<int:pk>/', edit.KeywordUpdate.as_view(), name='edit_keyword'),
     path('edit/sync/<int:pk>/', edit.SyncUpdate.as_view(), name='edit_sync'),
     path('edit/import/<int:pk>/', edit.ImportUpdate.as_view(), name='edit_import'),
-    path('edit/storage/<int:pk>/', edit.StorageUpdate.as_view(), name='edit_storage'),
+    path('edit/storage/<int:pk>/', edit.edit_storage, name='edit_storage'),
     path('edit/comment/<int:pk>/', edit.CommentUpdate.as_view(), name='edit_comment'),
 
     path('redirect/delete/<slug:name>/<int:pk>/', edit.delete_redirect, name='redirect_delete'),
diff --git a/cookbook/views/edit.py b/cookbook/views/edit.py
index fd6968cf4..a11e2f96f 100644
--- a/cookbook/views/edit.py
+++ b/cookbook/views/edit.py
@@ -147,9 +147,9 @@ def edit_storage(request, pk):
         pseudo_instance = instance
         pseudo_instance.password = '__NO__CHANGE__'
         pseudo_instance.token = '__NO__CHANGE__'
-        form = InternalRecipeForm(instance=pseudo_instance)
+        form = StorageForm(instance=pseudo_instance)
 
-    return render(request, 'forms/edit_internal_recipe.html',
+    return render(request, 'generic/edit_template.html',
                   {'form': form, 'view_url': reverse('view_recipe', args=[pk])})
 
 
diff --git a/recipes/locale/de/LC_MESSAGES/django.mo b/recipes/locale/de/LC_MESSAGES/django.mo
new file mode 100644
index 000000000..24682470f
Binary files /dev/null and b/recipes/locale/de/LC_MESSAGES/django.mo differ