diff --git a/apps/documenteditor/main/resources/less/toolbar.less b/apps/documenteditor/main/resources/less/toolbar.less
index e5f253f668..c6c00fdc39 100644
--- a/apps/documenteditor/main/resources/less/toolbar.less
+++ b/apps/documenteditor/main/resources/less/toolbar.less
@@ -322,3 +322,51 @@
         }
     }
 }
+
+#id-toolbar-menu-item-border-width,
+#format-rules-borders-border-width {
+    .border-size-item {
+        display: flex; 
+        justify-content: space-between; 
+        align-items: center; 
+        .border-size-text {
+            margin-right: 8px;
+        }
+        svg {
+            width: 60px;
+            height: 8px;
+            fill: var(--text-normal);
+            shape-rendering: crispEdges;
+        }
+    }   
+}
+
+#id-toolbar-mnu-item-border-color {
+    > span {
+        background-image: none;
+        width: 12px;
+        height: 12px;
+        margin: 2px 8px 0 -20px;
+        border-style: solid;
+        border-width: 3px;
+        border-color: #000;
+
+        .rtl & {
+            margin: 2px -20px 0 8px;
+        }
+    }
+}
+
+#id-toolbar-menu-auto-bordercolor {
+    .color-auto {
+        background-image: none;
+        width: 12px;
+        height: 12px;
+        margin: 1px 7px 0 1px;
+        background-color: #000;
+
+        .rtl & {
+            margin: 1px 1px 0 7px;
+        }
+    }
+}
\ No newline at end of file
diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.25x/btn-border-style.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.25x/btn-border-style.png
deleted file mode 100644
index 9e9cc994dd..0000000000
Binary files a/apps/spreadsheeteditor/main/resources/img/toolbar/1.25x/btn-border-style.png and /dev/null differ
diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.5x/btn-border-style.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.5x/btn-border-style.png
deleted file mode 100644
index 8761a28ac6..0000000000
Binary files a/apps/spreadsheeteditor/main/resources/img/toolbar/1.5x/btn-border-style.png and /dev/null differ
diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-border-style.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-border-style.png
deleted file mode 100644
index 668079a88c..0000000000
Binary files a/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-border-style.png and /dev/null differ
diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-border-style.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-border-style.png
deleted file mode 100644
index 469c84ca20..0000000000
Binary files a/apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-border-style.png and /dev/null differ
diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/2.5x/btn-border-style.svg b/apps/spreadsheeteditor/main/resources/img/toolbar/2.5x/btn-border-style.svg
deleted file mode 100644
index 73e1ba2747..0000000000
--- a/apps/spreadsheeteditor/main/resources/img/toolbar/2.5x/btn-border-style.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M4 5H16V7H4V5ZM4 15H6V16H4V15ZM7 15V16H9V15H7ZM10 16V15H12V16H10ZM16 15H13V16H16V15ZM4 9H8V10H4V9ZM11 9H9V10H11V9ZM12 9H16V10H12V9ZM16 12H4V13H16V12Z" fill="black"/>
-</svg>
diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/2x/btn-border-style.png b/apps/spreadsheeteditor/main/resources/img/toolbar/2x/btn-border-style.png
deleted file mode 100644
index f87b3e9e4f..0000000000
Binary files a/apps/spreadsheeteditor/main/resources/img/toolbar/2x/btn-border-style.png and /dev/null differ