diff --git a/src/components/sharing/linkSharing.vue b/src/components/sharing/linkSharing.vue
index 1f3f7737..59b231b6 100644
--- a/src/components/sharing/linkSharing.vue
+++ b/src/components/sharing/linkSharing.vue
@@ -7,14 +7,13 @@
 		</header>
 		<div class="card-content content sharables-list">
 			<form @submit.prevent="add()" class="add-form">
-				<div class="field is-grouped">
-					<div class="control">
-						<!-- TODO: maybe move this into a modal? -->
-						Add a new link share:
-					</div>
+				<p>
+					Share with a link:
+				</p>
+				<div class="field has-addons">
 					<div class="control">
 						<div class="select">
-							<select v-model="selectedRight" class="button buttonright">
+							<select v-model="selectedRight">
 								<option :value="rights.READ">Read only</option>
 								<option :value="rights.READ_WRITE">Read & write</option>
 								<option :value="rights.ADMIN">Admin</option>
@@ -23,15 +22,12 @@
 					</div>
 					<div class="control">
 						<button type="submit" class="button is-success">
-							<span class="icon is-small">
-								<icon icon="plus"/>
-							</span>
-							Add
+							Share
 						</button>
 					</div>
 				</div>
 			</form>
-			<table class="table is-striped is-hoverable is-fullwidth">
+			<table class="table is-striped is-hoverable is-fullwidth link-share-list">
 				<tbody>
 				<tr>
 					<th>Link</th>
@@ -48,7 +44,7 @@
 							</div>
 							<div class="control">
 								<a class="button is-success noshadow" @click="copy(getShareLink(s.hash))">
-									<span class="icon is-small">
+									<span class="icon">
 										<icon icon="paste"/>
 									</span>
 								</a>
@@ -80,7 +76,7 @@
 					</td>
 					<td class="actions">
 						<button @click="linkIDToDelete = s.id; showDeleteModal = true" class="button is-danger icon-only">
-							<span class="icon is-small">
+							<span class="icon">
 								<icon icon="trash-alt"/>
 							</span>
 						</button>
diff --git a/src/styles/theme/link-share.scss b/src/styles/theme/link-share.scss
index 02caca83..97d534d7 100644
--- a/src/styles/theme/link-share.scss
+++ b/src/styles/theme/link-share.scss
@@ -13,3 +13,29 @@
     max-width: 100%;
   }
 }
+
+.link-share-list {
+  .field.has-addons {
+    .control:first-child{
+      width: 100%;
+    }
+
+    .button {
+      height: 40px;
+    }
+
+    @media screen and (max-width: $tablet) {
+      .control:first-child {
+        display: none;
+      }
+
+      .button {
+        border-radius: $radius !important;
+      }
+    }
+  }
+}
+
+.sharables-list {
+  overflow-y: auto
+}
\ No newline at end of file