diff --git a/src/index.tsx b/src/index.tsx
index 8aeac9330..b5e0a93d7 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -151,7 +151,7 @@ function hitTest(element: ExcalidrawElement, x: number, y: number): boolean {
     });
 
     return Math.hypot(a * tx - px, b * ty - py) < lineThreshold;
-  } else if (element.type === "rectangle") {
+  } else if (element.type === "rectangle" || element.type === "diamond") {
     const x1 = getElementAbsoluteX1(element);
     const x2 = getElementAbsoluteX2(element);
     const y1 = getElementAbsoluteY1(element);
@@ -731,6 +731,34 @@ function generateDraw(element: ExcalidrawElement) {
       rc.draw(shape);
       context.translate(-element.x - scrollX, -element.y - scrollY);
     };
+  } else if (element.type === "diamond") {
+    const shape = withCustomMathRandom(element.seed, () => {
+      const rightEdgeY = Math.PI + element.height / 2;
+      const rightEdgeX = element.width;
+      const topEdgeY = element.height - element.height;
+      const topEdgeX = Math.PI + element.width / 2;
+      const bottomEdgeX = topEdgeX;
+      const bottomEdgeY = element.height;
+      const leftEdgeX = topEdgeY;
+      const leftEdgeY = rightEdgeY;
+      return generator.polygon(
+        [
+          [topEdgeX, topEdgeY],
+          [rightEdgeX, rightEdgeY],
+          [bottomEdgeX, bottomEdgeY],
+          [leftEdgeX, leftEdgeY]
+        ],
+        {
+          stroke: element.strokeColor,
+          fill: element.backgroundColor
+        }
+      );
+    });
+    element.draw = (rc, context, { scrollX, scrollY }) => {
+      context.translate(element.x + scrollX, element.y + scrollY);
+      rc.draw(shape);
+      context.translate(-element.x - scrollX, -element.y - scrollY);
+    };
   } else if (element.type === "ellipse") {
     const shape = withCustomMathRandom(element.seed, () =>
       generator.ellipse(
@@ -921,6 +949,15 @@ const SHAPES = [
     ),
     value: "rectangle"
   },
+  {
+    icon: (
+      // custom
+      <svg viewBox="0 0 223.646 223.646">
+        <path d="M111.823 0L16.622 111.823 111.823 223.646 207.025 111.823z"></path>
+      </svg>
+    ),
+    value: "diamond"
+  },
   {
     icon: (
       // fa-circle
diff --git a/src/styles.scss b/src/styles.scss
index eb1e721bb..0a05831cf 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -31,10 +31,11 @@ body {
 
   .panelTools {
     display: flex;
+    flex-wrap: wrap;
     justify-content: space-between;
 
     label {
-      margin: 0;
+      margin: 2px 0;
     }
   }