diff --git a/ui/grammar-and-copy.html b/ui/grammar-and-copy.html
index a6bccec..90b0597 100644
--- a/ui/grammar-and-copy.html
+++ b/ui/grammar-and-copy.html
@@ -380,11 +380,11 @@ <h2>Glossary: Button Labels</h2>
 										<td>Add</td>
 										<td>Hinzufügen</td>
 										<td>Yes</td>
-										<td>glyphicon-plus</td>
+										<td>fa fa-plus</td>
 										<td></td>
 										<td>
 											<button class="btn btn-primary">
-												<i class="glyphicon glyphicon-plus"></i>
+												<i class="fa fa-plus"></i>
 												&nbsp;Add
 											</button>
 										</td>
@@ -405,11 +405,11 @@ <h2>Glossary: Button Labels</h2>
 										<td>Approve</td>
 										<td>Genehmigen</td>
 										<td>Yes</td>
-										<td>glyphicon-ok</td>
+										<td>fa-check</td>
 										<td></td>
 										<td>
 											<button class="btn btn-primary">
-												<i class="glyphicon glyphicon-ok"></i>
+												<i class="fa fa-check"></i>
 												&nbsp;Approve
 											</button>
 										</td>
@@ -418,11 +418,11 @@ <h2>Glossary: Button Labels</h2>
 										<td>Assign</td>
 										<td>Zuweisen</td>
 										<td>Yes</td>
-										<td>glyphicon-retweet</td>
+										<td>fa-retweet</td>
 										<td></td>
 										<td>
 											<button class="btn btn-primary">
-												<i class="glyphicon glyphicon-retweet"></i>
+												<i class="fa fa-retweet"></i>
 												&nbsp;Assign
 											</button>
 										</td>
@@ -519,11 +519,11 @@ <h2>Glossary: Button Labels</h2>
 										<td>Create</td>
 										<td>Erstellen</td>
 										<td>Yes</td>
-										<td>glyphicon glyphicon-plus</td>
+										<td>fa-plus</td>
 										<td>Do not mistake with "Add"</td>
 										<td>
 											<button class="btn btn-primary">
-												<i class="glyphicon glyphicon-plus"></i>
+												<i class="fa fa-plus"></i>
 												&nbsp;Create
 											</button>
 										</td>
@@ -558,11 +558,11 @@ <h2>Glossary: Button Labels</h2>
 										<td>Export</td>
 										<td>Exportieren</td>
 										<td>Yes</td>
-										<td>glyphicon-save</td>
+										<td>fa-download</td>
 										<td></td>
 										<td>
 											<button class="btn btn-primary">
-												<i class="glyphicon glyphicon-save"></i>
+												<i class="fa fa-download"></i>
 												&nbsp;Export
 											</button>
 										</td>
@@ -571,11 +571,11 @@ <h2>Glossary: Button Labels</h2>
 										<td>Finish</td>
 										<td>Beenden</td>
 										<td>Yes</td>
-										<td>glyphicon-stop</td>
+										<td>fa-stop</td>
 										<td></td>
 										<td>
 											<button class="btn btn-primary">
-												<i class="glyphicon glyphicon-stop"></i>
+												<i class="fa fa-stop"></i>
 												&nbsp;Finish
 											</button>
 										</td>
@@ -584,11 +584,11 @@ <h2>Glossary: Button Labels</h2>
 										<td>History</td>
 										<td>Verlauf</td>
 										<td>Yes</td>
-										<td>glyphicon-list</td>
+										<td>fa-history</td>
 										<td></td>
 										<td>
 											<button class="btn btn-primary">
-												<i class="glyphicon glyphicon-list"></i>
+												<i class="fa fa-history"></i>
 												&nbsp;History
 											</button>
 										</td>
@@ -597,11 +597,11 @@ <h2>Glossary: Button Labels</h2>
 										<td>Import</td>
 										<td>Importieren</td>
 										<td>Yes</td>
-										<td>glyphicon-open</td>
+										<td>fa-upload</td>
 										<td></td>
 										<td>
 											<button class="btn btn-primary">
-												<i class="glyphicon glyphicon-open"></i>
+												<i class="fa fa-upload"></i>
 												&nbsp;Import
 											</button>
 										</td>
@@ -704,11 +704,11 @@ <h2>Glossary: Button Labels</h2>
 										<td>Refresh</td>
 										<td>Aktualisieren</td>
 										<td>Yes</td>
-										<td>glyphicon-refresh</td>
+										<td>fa-sync</td>
 										<td>Do not use "Reload" as label</td>
 										<td>
 											<button class="btn btn-primary">
-												<i class="glyphicon glyphicon-refresh"></i>
+												<i class="fa fa-sync"></i>
 												&nbsp;Refresh
 											</button>
 										</td>
@@ -717,11 +717,11 @@ <h2>Glossary: Button Labels</h2>
 										<td>Reject</td>
 										<td>Ablehnen</td>
 										<td>Yes</td>
-										<td>glyphicon-ban-circle</td>
+										<td>fa-ban</td>
 										<td></td>
 										<td>
 											<button class="btn btn-primary">
-												<i class="glyphicon glyphicon-ban-circle"></i>
+												<i class="fa fa-ban"></i>
 												&nbsp;Reject
 											</button>
 										</td>
@@ -730,11 +730,11 @@ <h2>Glossary: Button Labels</h2>
 										<td>Remove</td>
 										<td>Entfernen</td>
 										<td>Yes</td>
-										<td>glyphicon-remove</td>
+										<td>fa-times</td>
 										<td></td>
 										<td>
 											<button class="btn btn-primary">
-												<i class="glyphicon glyphicon-remove"></i>
+												<i class="fa fa-times"></i>
 												&nbsp;Remove
 											</button>
 										</td>
@@ -756,11 +756,11 @@ <h2>Glossary: Button Labels</h2>
 										<td>Run</td>
 										<td>Ausführen</td>
 										<td>Yes</td>
-										<td>glyphicon-play</td>
+										<td>fa-play</td>
 										<td>Do not use "Execute" as label</td>
 										<td>
 											<button class="btn btn-primary">
-												<i class="glyphicon glyphicon-play"></i>
+												<i class="fa fa-play"></i>
 												&nbsp;Run
 											</button>
 										</td>
@@ -805,11 +805,11 @@ <h2>Glossary: Button Labels</h2>
 										<td>Schedule</td>
 										<td>Planen</td>
 										<td>Yes</td>
-										<td>glyphicon-time</td>
+										<td>fa-clock</td>
 										<td></td>
 										<td>
 											<button class="btn btn-primary">
-												<i class="glyphicon glyphicon-time"></i>
+												<i class="fa fa-clock"></i>
 												&nbsp;Schedule
 											</button>
 										</td>
@@ -818,11 +818,11 @@ <h2>Glossary: Button Labels</h2>
 										<td>Search</td>
 										<td>Suchen</td>
 										<td>Yes</td>
-										<td>glyphicon-search</td>
+										<td>fa-search</td>
 										<td></td>
 										<td>
 											<button class="btn btn-primary">
-												<i class="glyphicon glyphicon-search"></i>
+												<i class="fa fa-search"></i>
 												&nbsp;Search
 											</button>
 										</td>
@@ -858,11 +858,11 @@ <h2>Glossary: Button Labels</h2>
 										<td>Start</td>
 										<td>Starten</td>
 										<td>Yes</td>
-										<td>glyphicon glyphicon-play</td>
+										<td>fa-play</td>
 										<td></td>
 										<td>
 											<button class="btn btn-primary">
-												<i class="glyphicon glyphicon-play"></i>
+												<i class="fa fa-play"></i>
 												&nbsp;Start
 											</button>
 										</td>