diff --git a/src/containers/SendMessageForm/SendMessageForm.css b/src/containers/SendMessageForm/SendMessageForm.css
index 20e0cc27..e9062c41 100644
--- a/src/containers/SendMessageForm/SendMessageForm.css
+++ b/src/containers/SendMessageForm/SendMessageForm.css
@@ -1,11 +1,82 @@
 @import '../../marketplace.css';
 
 .root {
+  position: relative;
+  box-shadow: var(--boxShadowBottomForm);
+
+  @media (--viewportLarge) {
+    box-shadow: none;
+
+    /* Clearfix */
+    width: 100%;
+    overflow: hidden;
+  }
 }
 
 .textarea {
-  border-bottom-color: var(--attentionColor);
+  @apply --marketplaceH4FontStyles;
+  border-bottom-width: 0;
+
+  /* Avoid text going behind the submit button */
+  padding: 22px 76px 25px 24px;
+
+  margin: 0;
+  max-height: 183px;
+
+  background-color: var(--matterColorLight);
+
+  @media (--viewportMedium) {
+    margin: 0;
+  }
+  @media (--viewportLarge) {
+    padding: 0 0 5px 0;
+    margin: 0;
+    max-height: initial;
+    border-bottom-width: 2px;
+    border-bottom-color: var(--attentionColor);
+    background-color: transparent;
+  }
 }
 
-.submitButton {
+.submitButtonMobile {
+  position: absolute;
+  top: -28px;
+  right: 20px;
+  width: 56px;
+  height: 56px;
+  border: none;
+  padding: 0;
+
+  @media (--viewportLarge) {
+    display: none;
+  }
+}
+
+.fillSuccess {
+  fill: var(--successColor);
+}
+
+.strokeMatter {
+  stroke: var(--matterColor);
+}
+
+.submitButtonDesktop {
+  @apply --marketplaceH5FontStyles;
+  font-weight: var(--fontWeightMedium);
+  display: none;
+
+  float: right;
+  padding: 0 16px;
+  min-height: auto;
+  height: 41px;
+
+  @media (--viewportLarge) {
+    display: inline-block;
+    margin: 17px 0 0 0;
+    width: auto;
+  }
+}
+
+.sendIconDesktop {
+  margin: -3px 5px 0 0;
 }
diff --git a/src/containers/SendMessageForm/SendMessageForm.js b/src/containers/SendMessageForm/SendMessageForm.js
index cf40f5d0..3da792eb 100644
--- a/src/containers/SendMessageForm/SendMessageForm.js
+++ b/src/containers/SendMessageForm/SendMessageForm.js
@@ -10,6 +10,59 @@ import css from './SendMessageForm.css';
 
 const BLUR_TIMEOUT_MS = 100;
 
+const IconSendMessageMobile = () => {
+  return (
+    <svg width="56" height="56" viewBox="0 0 56 56" xmlns="http://www.w3.org/2000/svg">
+      <defs>
+        <filter
+          x="-1.9%"
+          y="-8.5%"
+          width="103.7%"
+          height="113.2%"
+          filterUnits="objectBoundingBox"
+          id="a"
+        >
+          <feOffset dy="-2" in="SourceAlpha" result="shadowOffsetOuter1" />
+          <feGaussianBlur stdDeviation="2" in="shadowOffsetOuter1" result="shadowBlurOuter1" />
+          <feColorMatrix
+            values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.1 0"
+            in="shadowBlurOuter1"
+            result="shadowMatrixOuter1"
+          />
+          <feMerge>
+            <feMergeNode in="shadowMatrixOuter1" />
+            <feMergeNode in="SourceGraphic" />
+          </feMerge>
+        </filter>
+      </defs>
+      <g transform="translate(4 6)" filter="url(#a)" fill="none" fillRule="evenodd">
+        <rect className={css.fillSuccess} width="48" height="48" rx="24" />
+        <g fill="#FFF">
+          <path d="M14.47 23.048c-.14.05-.237.193-.25.36-.013.163.062.317.19.39l4.623 2.688 12.162-10.593-16.726 7.155zM20.47 27.327l-.97 6.59c0 .228.184.416.417.416.145 0 .284-.076.36-.206l2.94-4.823 4.833 2.894c.118.066.26.067.373.015.12-.055.207-.162.234-.292l3.315-15.328-11.5 10.735z" />
+        </g>
+      </g>
+    </svg>
+  );
+};
+
+const IconSendMessageDesktop = () => {
+  return (
+    <svg
+      className={css.sendIconDesktop}
+      width="14"
+      height="14"
+      viewBox="0 0 14 14"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <g className={css.strokeMatter} fill="none" fillRule="evenodd" strokeLinejoin="round">
+        <path d="M12.91 1L0 7.003l5.052 2.212z" />
+        <path d="M10.75 11.686L5.042 9.222l7.928-8.198z" />
+        <path d="M5.417 8.583v4.695l2.273-2.852" />
+      </g>
+    </svg>
+  );
+};
+
 class SendMessageFormComponent extends Component {
   constructor(props) {
     super(props);
@@ -57,13 +110,17 @@ class SendMessageFormComponent extends Component {
           onFocus={this.handleFocus}
           onBlur={this.handleBlur}
         />
+        <button className={css.submitButtonMobile}>
+          <IconSendMessageMobile />
+        </button>
         <SecondaryButton
-          className={css.submitButton}
+          className={css.submitButtonDesktop}
           inProgress={submitInProgress}
           disabled={submitDisabled}
           onFocus={this.handleFocus}
           onBlur={this.handleBlur}
         >
+          <IconSendMessageDesktop />
           <FormattedMessage id="SendMessageForm.sendMessage" />
         </SecondaryButton>
       </Form>
diff --git a/src/marketplace.css b/src/marketplace.css
index 37204eb3..1bac4dfe 100644
--- a/src/marketplace.css
+++ b/src/marketplace.css
@@ -63,6 +63,7 @@
   --boxShadowListingCard: 0 0 50px 0 rgba(0, 0, 0, 0.1);
   --boxShadowNotFoundPageSearch: 0 2px 4px 0 rgba(0, 0, 0, 0.5);
   --boxShadowSectionLocationHover: 0 10px 30px 0 rgba(0, 0, 0, 0.1);
+  --boxShadowBottomForm: 0 -2px 4px 0 rgba(0, 0, 0, 0.05);
 
   /* ================ Z-index base levels ================ */