diff --git a/src/common/components/pin/draw-bar/draw-bar.component.ts b/src/common/components/pin/draw-bar/draw-bar.component.ts
index 418fd0c..daa23eb 100644
--- a/src/common/components/pin/draw-bar/draw-bar.component.ts
+++ b/src/common/components/pin/draw-bar/draw-bar.component.ts
@@ -203,8 +203,8 @@ export class DrawBarComponent implements HtmlComponent<HTMLElement>, HtmlCompone
 
     // this.placeComponent(this.drawTest.render(), 220);
 
-    this.placeComponent(this.drawSave.render(), this.model.rect.width - 56);
-    this.placeComponent(this.drawCancel.render(), this.model.rect.width - 28);
+    this.placeComponent(this.drawSave.render(), 222);
+    this.placeComponent(this.drawCancel.render(), 244);
 
     this.adjustTop();
 
diff --git a/src/common/components/pin/draw-bar/draw-main-buttons/draw-edit.button.ts b/src/common/components/pin/draw-bar/draw-main-buttons/draw-edit.button.ts
index fe3ef1c..14f88e9 100644
--- a/src/common/components/pin/draw-bar/draw-main-buttons/draw-edit.button.ts
+++ b/src/common/components/pin/draw-bar/draw-main-buttons/draw-edit.button.ts
@@ -26,16 +26,18 @@ export class DrawEditButton implements HtmlComponent<HTMLElement> {
   }
 
   render(): HTMLElement {
-    this.el.innerText = 'Edit';
+    this.el.innerHTML = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 62 20">
+<style>.ft {
+    color: #000;
+    font-size: 1em;
+    font-weight: normal;
+    margin-left: 10px;
+    line-height: 1.5;
+    font-family: Roboto, sans-serif;
+}</style>
+<text x="5" y="17" class="ft">Edit</text>
+</svg>`;
     this.el.addEventListener('click', this.handleClick);
-
-    applyStylesToElement(this.el, {
-      cursor: 'pointer',
-      color: '#000',
-      'font-size': '1em',
-      'font-weight': 'bold',
-      'margin-left': '10px'
-    });
     return this.el;
   }
 
diff --git a/src/common/components/pin/draw-bar/draw-main-buttons/draw-new-cancel.button.ts b/src/common/components/pin/draw-bar/draw-main-buttons/draw-new-cancel.button.ts
index c0cde55..ef8df2c 100644
--- a/src/common/components/pin/draw-bar/draw-main-buttons/draw-new-cancel.button.ts
+++ b/src/common/components/pin/draw-bar/draw-main-buttons/draw-new-cancel.button.ts
@@ -26,16 +26,20 @@ export class DrawNewCancelButton implements HtmlComponent<HTMLElement> {
   }
 
   render(): HTMLElement {
-    this.el.innerText = 'Cancel';
+    this.el.innerHTML = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 62 20">
+<style>.ft {
+    color: #000;
+    font-size: 1em;
+    font-weight: normal;
+    margin-left: 10px;
+    line-height: 1.5;
+    font-family: Roboto, sans-serif;
+}</style>
+<text x="5" y="17" class="ft">Cancel</text>
+</svg>`;
     this.el.addEventListener('click', this.handleClick);
 
-    applyStylesToElement(this.el, {
-      cursor: 'pointer',
-      color: '#000',
-      'font-size': '1em',
-      'font-weight': 'bold',
-      'margin-left': '10px'
-    });
+    applyStylesToElement(this.el, { cursor: 'pointer', width: '62px' });
     return this.el;
   }
 
diff --git a/src/common/components/pin/draw-bar/draw-main-buttons/draw-new.button.ts b/src/common/components/pin/draw-bar/draw-main-buttons/draw-new.button.ts
index beafc8c..a2f1b1d 100644
--- a/src/common/components/pin/draw-bar/draw-main-buttons/draw-new.button.ts
+++ b/src/common/components/pin/draw-bar/draw-main-buttons/draw-new.button.ts
@@ -26,16 +26,20 @@ export class DrawNewButton implements HtmlComponent<HTMLElement> {
   }
 
   render(): HTMLElement {
-    this.el.innerText = 'New';
+    this.el.innerHTML = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 20">
+<style>.ft {
+    color: #000;
+    font-size: 1em;
+    font-weight: normal;
+    margin-left: 10px;
+    line-height: 1.5;
+    font-family: Roboto, sans-serif;
+}</style>
+<text x="5" y="17" class="ft">New</text>
+</svg>`;
     this.el.addEventListener('click', this.handleClick);
 
-    applyStylesToElement(this.el, {
-      cursor: 'pointer',
-      color: '#000',
-      'font-size': '1em',
-      'font-weight': 'bold',
-      'margin-left': '10px'
-    });
+    applyStylesToElement(this.el, { cursor: 'pointer', width: '40px' });
     return this.el;
   }