diff --git a/pages/create.js b/pages/create.js
index 1ef0fd3..9eca46d 100644
--- a/pages/create.js
+++ b/pages/create.js
@@ -11,6 +11,7 @@ import EditableStringList from '../js/components/EditableStringList';
 import {createTournament} from '../js/api';
 
 import '../static/css/everypage.css';
+import '../static/css/create.css';
 import RequireLogin from '../js/components/RequireLogin';
 
 class CreatePage extends React.Component {
@@ -73,9 +74,10 @@ class CreateTournamentForm extends React.Component {
         this.handleNameInput = this.handleNameInput.bind(this);
         this.handleDescriptionInput = this.handleDescriptionInput.bind(this);
         this.handlePublicInput = this.handlePublicInput.bind(this);
-        this.handleGroupSizeInput = this.handleGroupSizeInput.bind(this);
         this.increaseGroupAdvance = this.increaseGroupAdvance.bind(this);
         this.decreaseGroupAdvance = this.decreaseGroupAdvance.bind(this);
+        this.increaseGroupSize = this.increaseGroupSize.bind(this);
+        this.decreaseGroupSize = this.decreaseGroupSize.bind(this);
         this.generateTournamentCreationObject = this.generateTournamentCreationObject.bind(this);
 
         this.create = this.create.bind(this);
@@ -107,24 +109,32 @@ class CreateTournamentForm extends React.Component {
                     className="groupphasefader">
                     <FormGroup>
                         <Label for="teams-per-group">Anzahl Teams pro Gruppe</Label>
-                        <Input type="number" name="teams-per-group" min="3"
-                            value={this.state.groupSize} onChange={this.handleGroupSizeInput}/>
+                        <InputGroup>
+                            <InputGroupAddon addonType="prepend">
+                                <Button onClick={this.decreaseGroupSize} className="btn-width"
+                                    color='primary' outline>-1</Button>
+                            </InputGroupAddon>
+                            <Input className='font-weight-bold' value={this.state.groupSize}
+                                disabled type='number' step='1' placeholder='0'/>
+                            <InputGroupAddon addonType="append">
+                                <Button onClick={this.increaseGroupSize} className="btn-width"
+                                    color='primary' outline>+1</Button>
+                            </InputGroupAddon>
+                        </InputGroup>
                     </FormGroup>
                     <FormGroup>
                         <Label for="teams-group-to-playoff">Wie viele Teams sollen nach der Gruppenphase
                                 weiterkommen?</Label>
                         <InputGroup>
                             <InputGroupAddon addonType="prepend">
-                                <Button onClick={this.decreaseGroupAdvance} color='primary' outline>
-                                    <img src="../static/icons/chevron-left.svg"/>
-                                </Button>
+                                <Button onClick={this.decreaseGroupAdvance} className="btn-width"
+                                    color='primary' outline>&#247;2</Button>
                             </InputGroupAddon>
                             <Input className='font-weight-bold' value={this.state.groupAdvance}
                                 disabled type='number' step='1' placeholder='0'/>
                             <InputGroupAddon addonType="append">
-                                <Button onClick={this.increaseGroupAdvance} color='primary' outline>
-                                    <img src="../static/icons/chevron-right.svg"/>
-                                </Button>
+                                <Button onClick={this.increaseGroupAdvance} className="btn-width"
+                                    color='primary' outline>&#215;2</Button>
                             </InputGroupAddon>
                         </InputGroup>
                     </FormGroup>
@@ -175,19 +185,22 @@ class CreateTournamentForm extends React.Component {
         }
     }
 
-    handleGroupSizeInput(input) {
-        const newSize = input.target.value;
+    increaseGroupSize() {
+        this.setState({groupSize: this.state.groupSize+1});
+    }
 
-        if (newSize === undefined || newSize < 2) {
-            return;
-        }
+    decreaseGroupSize() {
+        const newGroupSize = this.state.groupSize - 1;
 
-        if (newSize < this.state.groupAdvance) {
-            this.setState({
-                groupSize: newSize, groupAdvance: Math.floor(this.state.groupAdvance / 2)
-            });
-        } else {
-            this.setState({groupSize: newSize});
+        if (newGroupSize >= 3) {
+            if (newGroupSize >= this.state.groupAdvance) {
+                this.setState({groupSize: newGroupSize});
+            } else {
+                this.setState({
+                    groupSize: newGroupSize,
+                    groupAdvance: Math.floor(this.state.groupAdvance / 2)
+                });
+            }
         }
     }
 
diff --git a/static/css/create.css b/static/css/create.css
new file mode 100644
index 0000000..0577cc2
--- /dev/null
+++ b/static/css/create.css
@@ -0,0 +1,4 @@
+
+.btn-width {
+    width: 48px;
+}
\ No newline at end of file
diff --git a/static/icons/chevron-left.svg b/static/icons/chevron-left.svg
deleted file mode 100644
index 256902c..0000000
--- a/static/icons/chevron-left.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="8" height="8" viewBox="0 0 8 8">
-  <path d="M4 0l-4 4 4 4 1.5-1.5-2.5-2.5 2.5-2.5-1.5-1.5z" transform="translate(1)" />
-</svg>
\ No newline at end of file
diff --git a/static/icons/chevron-right.svg b/static/icons/chevron-right.svg
deleted file mode 100644
index 2da0760..0000000
--- a/static/icons/chevron-right.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="8" height="8" viewBox="0 0 8 8">
-  <path d="M1.5 0l-1.5 1.5 2.5 2.5-2.5 2.5 1.5 1.5 4-4-4-4z" transform="translate(1)" />
-</svg>
\ No newline at end of file