diff --git a/css/style.css b/css/style.css
index 45e2c9805..469f093ae 100644
--- a/css/style.css
+++ b/css/style.css
@@ -755,7 +755,7 @@ button.button-inline:hover {
 #boardlist span.icon {
 	width: 30px;
 	height: 30px;
-	display: inline-block;
+	margin: 2px 0px;
 }
 
 .cell-board-bullet {
@@ -816,7 +816,7 @@ button.button-inline:hover {
 	display: flex;
 }
 
-#boardlist .app-navigation-entry-edit input {
+#boardlist input {
 	margin: 0px;
 }
 
diff --git a/templates/part.boardlist.php b/templates/part.boardlist.php
index 73b55c8da..1ca997c4f 100644
--- a/templates/part.boardlist.php
+++ b/templates/part.boardlist.php
@@ -102,11 +102,15 @@
 							 ng-click="selectColor(c)"
 							 ng-class="{'selected': (c == newBoard.color), 'dark': (newBoard.color | textColorFilter) === '#ffffff' }"></div>
 					</div>
-					<input type="submit" value="" class="icon-checkmark svg" />
 				</form>
 			</td>
 			<td></td>
-			<td></td>
+			<td>
+				<div class="board-edit-controls">
+					<span class="icon icon-checkmark" ng-click="boardCreate()"></span>
+					<span class="icon icon-close" ng-click="status.addBoard=!status.addBoard"></span>
+				</div>
+			</td>
 		</tr>
 		</tbody>
 	</table>