diff --git a/app/assets/javascripts/admin.js b/app/assets/javascripts/admin.js
index d8615d56da421ea23bafb29f4904777d9bba9d4d..20f2a4a00fdaa93d960d110a25eb866c6b758959 100644
--- a/app/assets/javascripts/admin.js
+++ b/app/assets/javascripts/admin.js
@@ -10,7 +10,6 @@
 //= require gdpr/cookie_consent
 //= require sortablejs/Sortable
 //= require summernote/summernote-bs5
-//= require summernote-rails
 //= require slug/slug
 //= require cocoon
 //= require_self
diff --git a/app/assets/javascripts/admin/plugins/summernote.js b/app/assets/javascripts/admin/plugins/summernote.js
index 58a7a777b5be3eedf1319c9a4d6af2e4568b29e8..38f2cf166fd46ca3a4329ee4586a10dd5024e7db 100644
--- a/app/assets/javascripts/admin/plugins/summernote.js
+++ b/app/assets/javascripts/admin/plugins/summernote.js
@@ -3,6 +3,7 @@ $(function () {
     'use strict';
 
     var configs = [];
+
     configs['mini'] = {
         toolbar: [
             ['font', ['bold', 'italic']],
@@ -26,7 +27,8 @@ $(function () {
         disableDragAndDrop: true
     };
 
-    configs['default'] = {
+
+    configs['full'] = {
         popover: {
             image: [
                 ['remove', ['removeMedia']]
@@ -37,6 +39,8 @@ $(function () {
             ['font', ['bold', 'italic']],
             ['position', ['superscript', 'subscript']],
             ['para', ['ul', 'ol']],
+            ['table', ['table']],
+            ['insert', ['link', 'picture', 'video']],
             ['view', ['codeview']]
         ],
         styleTags: [
@@ -66,16 +70,49 @@ $(function () {
         }
     };
 
+
+    configs['default'] = {
+        popover: {
+            image: [
+                ['remove', ['removeMedia']]
+            ]
+        },
+        toolbar: [
+            ['style', ['style']],
+            ['font', ['bold', 'italic']],
+            ['position', ['superscript', 'subscript']],
+            ['para', ['ul', 'ol']],
+            ['view', ['codeview']]
+        ],
+        styleTags: [
+            'p',
+            'blockquote',
+            'pre',
+            'h2',
+            'h3',
+            'h4'
+        ],
+        followingToolbar: true,
+        disableDragAndDrop: true
+    };
+
     $.extend($.summernote.lang['en-US'].image, {
         dragImageHere: 'Drag file here',
         dropImage: 'Drop file'
     });
 
     $('[data-provider="summernote"]').each(function () {
-        var config = $(this).attr('data-summernote-config');
+        var config = $(this).attr('data-summernote-config'),
+            options = {};
         config = config || 'default';
-        $(this).summernote(configs[config]);
+        options = configs[config];
+        $(this).summernote(options);
     });
 
+    // https://github.com/summernote/summernote/issues/4170
+    $("button[data-toggle='dropdown']").each(function (index) { 
+        $(this).removeAttr("data-toggle").attr("data-bs-toggle", "dropdown"); 
+    }); 
+
     window.SUMMERNOTE_CONFIGS = configs;
 });
diff --git a/app/assets/stylesheets/commons/_summernote.sass b/app/assets/stylesheets/commons/_summernote.sass
index 37a6859b7fced83deed697d7ebc43c2980716afb..4f074176c76db1c91180eb4b690bef1f88d09359 100644
--- a/app/assets/stylesheets/commons/_summernote.sass
+++ b/app/assets/stylesheets/commons/_summernote.sass
@@ -4,7 +4,7 @@
         color: black
         font-weight: bold
     .note-btn.dropdown-toggle:after
-        content: none
+        margin-left: 10px
     .note-editable
         img, video
             height: auto
@@ -12,6 +12,7 @@
     button
         background: transparent
         border: none
+        margin-right: 10px
         &.active
             color: #666666 !important
     blockquote