diff --git a/site/plugins/admin/app/Controllers/ApiController.php b/site/plugins/admin/app/Controllers/ApiController.php
index fba03755..4f681ee7 100644
--- a/site/plugins/admin/app/Controllers/ApiController.php
+++ b/site/plugins/admin/app/Controllers/ApiController.php
@@ -208,7 +208,11 @@ class ApiController extends Controller
             $this->flash->addMessage('error', __('admin_message_delvery_entries_api_token_was_not_created2'));
         }
 
-        return $response->withRedirect($this->router->pathFor('admin.api_delivery_entries.index'));
+        if (isset($post_data['create-and-edit'])) {
+            return $response->withRedirect($this->router->pathFor('admin.api_delivery_entries.edit') . '?token=' . $api_token);
+        } else {
+            return $response->withRedirect($this->router->pathFor('admin.api_delivery_entries.index'));
+        }
     }
 
     /**
diff --git a/site/plugins/admin/templates/content/entries/add.html b/site/plugins/admin/templates/content/entries/add.html
index 0ddc5cf4..bb4ad09e 100644
--- a/site/plugins/admin/templates/content/entries/add.html
+++ b/site/plugins/admin/templates/content/entries/add.html
@@ -41,13 +41,15 @@
                         </div>
                     </div>
                 </div>
-                <div class="btn-group custom-btn-group">
-                    <input type="submit" id="create" name="create" value="{{ tr('admin_create') }}" class="button">
-                    <button type="button" class="buttondropdown-toggle dropdown-toggle-split" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                        <span class="sr-only">Toggle Dropdown</span>
-                    </button>
-                    <div class="dropdown">
-                        <input type="submit" id="create-and-edit" name="create-and-edit" value="{{ tr('admin_create_and_edit') }}" class="dropdown-item">
+                <div class="button-group">
+                    <div class="button-dropdown">
+                        <input type="submit" id="create" name="create" value="{{ tr('admin_create') }}" class="button">
+                        <a href="javascript:;" class="button js-dropdown-btn" data-dropdown="dropdown-list-create-new-entry">
+                            <i class="icon icon--white">{{ icon('fas fa-sort-down') }}</i>
+                        </a>
+                        <div id="dropdown-list-create-new-entry" class="dropdown">
+                            <input type="submit" id="create-and-edit" name="create-and-edit" value="{{ tr('admin_create_and_edit') }}" class="dropdown__item">
+                        </div>
                     </div>
                 </div>
             </form>
diff --git a/site/plugins/admin/templates/content/entries/index.html b/site/plugins/admin/templates/content/entries/index.html
index dc37188f..05498046 100644
--- a/site/plugins/admin/templates/content/entries/index.html
+++ b/site/plugins/admin/templates/content/entries/index.html
@@ -10,7 +10,7 @@
                     {% else %}
                         {% set _entries = entries.fetch(entry.slug, {}) %}
                         {% set _entries_length = _entries | length %}
-                        {% do 
+                        {% do
                             cache.save(entry.slug ~ '_counter', _entries_length) %}
                     {% endif %}
                     <div class="w-full md:w-3/12 lg:w-2/12 text-center p-4 relative">
@@ -145,7 +145,7 @@
                                 {% else %}
                                     {% set _entries = entries.fetch(entry.slug, {}) %}
                                     {% set _entries_length = _entries | length %}
-                                    {% do 
+                                    {% do
                                         cache.save(entry.slug ~ '_counter', _entries_length) %}
                                 {% endif %}
                                 <a href="{% if _entries_length > 0 %}{{ path_for('admin.entries.index') }}?id={{ entry.slug }}{% else %}{{ path_for('admin.entries.edit') }}?id={{ entry.slug }}&type=editor{% endif %}">
@@ -290,4 +290,4 @@
             });
         }
     </script>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/site/plugins/admin/templates/extends/fieldsets/add.html b/site/plugins/admin/templates/extends/fieldsets/add.html
index cddf7275..43b88d9a 100644
--- a/site/plugins/admin/templates/extends/fieldsets/add.html
+++ b/site/plugins/admin/templates/extends/fieldsets/add.html
@@ -35,15 +35,17 @@
                     </div>
                 </div>
                 <div class="button-group">
-                    <input type="submit" id="create" name="create" value="{{ tr('admin_create') }}" class="button">
-                    <button type="button" class="buttondropdown-toggle dropdown-toggle-split" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                        <span class="sr-only">Toggle Dropdown</span>
-                    </button>
-                    <div class="dropdown">
-                        <input type="submit" id="create-and-edit" name="create-and-edit" value="{{ tr('admin_create_and_edit') }}" class="dropdown-item">
+                    <div class="button-dropdown">
+                        <input type="submit" id="create" name="create" value="{{ tr('admin_create') }}" class="button">
+                        <a href="javascript:;" class="button js-dropdown-btn" data-dropdown="dropdown-list-create-new-fieldset">
+                            <i class="icon icon--white">{{ icon('fas fa-sort-down') }}</i>
+                        </a>
+                        <div id="dropdown-list-create-new-fieldset" class="dropdown">
+                            <input type="submit" id="create-and-edit" name="create-and-edit" value="{{ tr('admin_create_and_edit') }}" class="dropdown__item">
+                        </div>
                     </div>
                 </div>
             </div>
         </div>
     </form>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/site/plugins/admin/templates/extends/snippets/add.html b/site/plugins/admin/templates/extends/snippets/add.html
index 5de7f842..dfe0de52 100644
--- a/site/plugins/admin/templates/extends/snippets/add.html
+++ b/site/plugins/admin/templates/extends/snippets/add.html
@@ -11,12 +11,14 @@
                     <small>{{ tr('admin_help_text_for_snippets_name') }}</small>
                 </div>
                 <div class="button-group">
-                    <input type="submit" id="create" name="create" value="{{ tr('admin_create') }}" class="button">
-                    <button type="button" class="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                        <span class="sr-only">Toggle Dropdown</span>
-                    </button>
-                    <div class="dropdown">
-                        <input type="submit" id="create-and-edit" name="create-and-edit" value="{{ tr('admin_create_and_edit') }}" class="dropdown-item">
+                    <div class="button-dropdown">
+                        <input type="submit" id="create" name="create" value="{{ tr('admin_create') }}" class="button">
+                        <a href="javascript:;" class="button js-dropdown-btn" data-dropdown="dropdown-list-create-new-snippet">
+                            <i class="icon icon--white">{{ icon('fas fa-sort-down') }}</i>
+                        </a>
+                        <div id="dropdown-list-create-new-snippet" class="dropdown">
+                            <input type="submit" id="create-and-edit" name="create-and-edit" value="{{ tr('admin_create_and_edit') }}" class="dropdown__item">
+                        </div>
                     </div>
                 </div>
             </div>
diff --git a/site/plugins/admin/templates/extends/snippets/index.html b/site/plugins/admin/templates/extends/snippets/index.html
index 69c732bf..87e4312e 100644
--- a/site/plugins/admin/templates/extends/snippets/index.html
+++ b/site/plugins/admin/templates/extends/snippets/index.html
@@ -80,8 +80,8 @@
         <br>
         <label for="template_code">{{ tr('admin_template_code') }}</label>
         <div id="template_code" class="form-control text-left">
-            <span id="html">&lcub;&lcub; snippets.exec('<span class="js-snippets-snippet-placeholder"></span>') &rcub;&rcub;</span>
-            <button class="js-clipboard-btn button" data-clipboard-target="#html">
+            <span id="template_code_html">&lcub;&lcub; snippets.exec('<span class="js-snippets-snippet-placeholder"></span>') &rcub;&rcub;</span>
+            <button class="js-clipboard-btn button" data-clipboard-text="">
                 {{ tr('admin_copy') }}
             </button>
         </div>
diff --git a/site/plugins/admin/templates/extends/themes/templates/add.html b/site/plugins/admin/templates/extends/themes/templates/add.html
index 45c2e80e..5baa7990 100644
--- a/site/plugins/admin/templates/extends/themes/templates/add.html
+++ b/site/plugins/admin/templates/extends/themes/templates/add.html
@@ -5,7 +5,7 @@
         {{ csrf() }}
         <input type="hidden" name="theme" value="{{ theme }}">
         <div class="flex row">
-            <div class="w-full lg:w-4/12">
+            <div class="col w-full lg:w-4/12">
                 <div class="form-group">
                     <label for="id" class="form-control-title">{{ tr('admin_name') }}</label>
                     <input type="text" id="id" name="id" value="" class="form-control" required="required" data-parsley-minlength="1" data-parsley-error-message="{{ tr('admin_error_name_empty_input') }}" data-parsley-required="true">
@@ -19,12 +19,14 @@
                     </select>
                 </div>
                 <div class="button-group">
-                    <input type="submit" id="create" name="create" value="{{ tr('admin_create') }}" class="button">
-                    <button type="button" class="buttondropdown-toggle dropdown-toggle-split" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                        <span class="sr-only">Toggle Dropdown</span>
-                    </button>
-                    <div class="dropdown">
-                        <input type="submit" id="create-and-edit" name="create-and-edit" value="{{ tr('admin_create_and_edit') }}" class="dropdown-item">
+                    <div class="button-dropdown">
+                        <input type="submit" id="create" name="create" value="{{ tr('admin_create') }}" class="button">
+                        <a href="javascript:;" class="button js-dropdown-btn" data-dropdown="dropdown-list-create-new-template">
+                            <i class="icon icon--white">{{ icon('fas fa-sort-down') }}</i>
+                        </a>
+                        <div id="dropdown-list-create-new-template" class="dropdown">
+                            <input type="submit" id="create-and-edit" name="create-and-edit" value="{{ tr('admin_create_and_edit') }}" class="dropdown__item">
+                        </div>
                     </div>
                 </div>
             </div>
diff --git a/site/plugins/admin/templates/system/api/delivery/entries/add.html b/site/plugins/admin/templates/system/api/delivery/entries/add.html
index 79f7aacf..8bebc23a 100644
--- a/site/plugins/admin/templates/system/api/delivery/entries/add.html
+++ b/site/plugins/admin/templates/system/api/delivery/entries/add.html
@@ -39,7 +39,15 @@
                     </select>
                 </div>
                 <div class="button-group">
-                    <input type="submit" id="create" name="create" value="{{ tr('admin_create') }}" class="button mr-3">
+                    <div class="button-dropdown">
+                        <input type="submit" id="create" name="create" value="{{ tr('admin_create') }}" class="button">
+                        <a href="javascript:;" class="button js-dropdown-btn" data-dropdown="dropdown-list-create-new-token">
+                            <i class="icon icon--white">{{ icon('fas fa-sort-down') }}</i>
+                        </a>
+                        <div id="dropdown-list-create-new-token" class="dropdown">
+                            <input type="submit" id="create-and-edit" name="create-and-edit" value="{{ tr('admin_create_and_edit') }}" class="dropdown__item">
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>