diff --git a/gui/newrecipedialog.cpp b/gui/newrecipedialog.cpp
index 4cfaeea..0517fd9 100644
--- a/gui/newrecipedialog.cpp
+++ b/gui/newrecipedialog.cpp
@@ -138,7 +138,31 @@ void NewRecipeDialog::on_newIngredientButton_clicked(){
 }
 
 void NewRecipeDialog::on_newTagButton_clicked(){
-	newTagDialog
+	NewTagDialog d(this);
 	d.show();
+	if (d.exec() == QDialog::Accepted){
+		RecipeTag tag = d.getTag();
+		//Temporarily add this to the tags list, and it will be saved if the recipe is saved.
+		this->tags.push_back(tag);
+		ui->tagsComboBox->clear();
+		for (unsigned int i = 0; i < this->tags.size(); i++){
+			QString s = QString::fromStdString(this->tags[i].getValue());
+			ui->tagsComboBox->insertItem(i, s);
+		}
+	}
 
 }
+
+void NewRecipeDialog::on_removeTagButton_clicked(){
+	int index = ui->tagsComboBox->currentIndex();
+	if (index < 0 || index >= this->tags.size()){
+		return;
+	}
+	RecipeTag tag = this->tags[ui->tagsComboBox->currentIndex()];
+	string content = "Are you sure you wish to delete the following tag:\n"+tag.getValue();
+	QMessageBox::StandardButton reply = QMessageBox::question(this, QString("Delete Tag"), QString(content.c_str()));
+	if (reply == QMessageBox::Yes){
+		this->recipeDB->deleteTag(tag);
+		this->populateTagsBox();
+	}
+}
diff --git a/gui/newrecipedialog.h b/gui/newrecipedialog.h
index 43ff140..f1c87cb 100644
--- a/gui/newrecipedialog.h
+++ b/gui/newrecipedialog.h
@@ -5,6 +5,7 @@
 #include <QTextCharFormat>
 #include <QFileDialog>
 #include <QPixmap>
+#include <QMessageBox>
 
 #include "model/database/recipedatabase.h"
 #include "model/recipe/ingredients/ingredientlistmodel.h"
@@ -51,6 +52,8 @@ class NewRecipeDialog : public QDialog
 
 		void on_newTagButton_clicked();
 
+		void on_removeTagButton_clicked();
+
 	private:
 		Ui::NewRecipeDialog *ui;
 		RecipeDatabase *recipeDB;
diff --git a/gui/newrecipedialog.ui b/gui/newrecipedialog.ui
index 9a72e5e..82afc1d 100644
--- a/gui/newrecipedialog.ui
+++ b/gui/newrecipedialog.ui
@@ -279,12 +279,34 @@
                 <number>0</number>
                </property>
                <item>
-                <widget class="QComboBox" name="tagsComboBox"/>
+                <widget class="QComboBox" name="tagsComboBox">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                </widget>
                </item>
-               <item>
+               <item alignment="Qt::AlignRight">
                 <widget class="QPushButton" name="newTagButton">
-                 <property name="text">
-                  <string>New</string>
+                 <property name="toolTip">
+                  <string>Create a new tag</string>
+                 </property>
+                 <property name="icon">
+                  <iconset resource="../images.qrc">
+                   <normaloff>:/images/images/plus_icon.png</normaloff>:/images/images/plus_icon.png</iconset>
+                 </property>
+                </widget>
+               </item>
+               <item alignment="Qt::AlignRight">
+                <widget class="QPushButton" name="removeTagButton">
+                 <property name="toolTip">
+                  <string>Permanently delete this tag</string>
+                 </property>
+                 <property name="icon">
+                  <iconset resource="../images.qrc">
+                   <normaloff>:/images/images/minus_icon.png</normaloff>:/images/images/minus_icon.png</iconset>
                  </property>
                 </widget>
                </item>
@@ -460,6 +482,9 @@
                          <verstretch>0</verstretch>
                         </sizepolicy>
                        </property>
+                       <property name="editable">
+                        <bool>false</bool>
+                       </property>
                        <property name="currentText">
                         <string/>
                        </property>
@@ -467,8 +492,12 @@
                      </item>
                      <item>
                       <widget class="QPushButton" name="newIngredientButton">
-                       <property name="text">
-                        <string>New</string>
+                       <property name="toolTip">
+                        <string>Create a new ingredient</string>
+                       </property>
+                       <property name="icon">
+                        <iconset resource="../images.qrc">
+                         <normaloff>:/images/images/plus_icon.png</normaloff>:/images/images/plus_icon.png</iconset>
                        </property>
                       </widget>
                      </item>
@@ -532,12 +561,20 @@
                       </widget>
                      </item>
                      <item>
-                      <widget class="QComboBox" name="unitComboBox"/>
+                      <widget class="QComboBox" name="unitComboBox">
+                       <property name="sizePolicy">
+                        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                         <horstretch>0</horstretch>
+                         <verstretch>0</verstretch>
+                        </sizepolicy>
+                       </property>
+                      </widget>
                      </item>
-                     <item>
+                     <item alignment="Qt::AlignRight">
                       <widget class="QPushButton" name="newUnitButton">
-                       <property name="text">
-                        <string>New</string>
+                       <property name="icon">
+                        <iconset resource="../images.qrc">
+                         <normaloff>:/images/images/plus_icon.png</normaloff>:/images/images/plus_icon.png</iconset>
                        </property>
                       </widget>
                      </item>
diff --git a/images.qrc b/images.qrc
index 5f9348c..2391914 100644
--- a/images.qrc
+++ b/images.qrc
@@ -2,5 +2,7 @@
     <qresource prefix="/images">
         <file>images/no_image.png</file>
         <file>images/icon.png</file>
+        <file>images/plus_icon.png</file>
+        <file>images/minus_icon.png</file>
     </qresource>
 </RCC>
diff --git a/images/minus_icon.png b/images/minus_icon.png
new file mode 100644
index 0000000..f806792
Binary files /dev/null and b/images/minus_icon.png differ
diff --git a/images/plus_icon.png b/images/plus_icon.png
new file mode 100644
index 0000000..88d151b
Binary files /dev/null and b/images/plus_icon.png differ
diff --git a/model/database/recipedatabase.cpp b/model/database/recipedatabase.cpp
index b64a660..5ab05fd 100644
--- a/model/database/recipedatabase.cpp
+++ b/model/database/recipedatabase.cpp
@@ -223,6 +223,10 @@ vector<RecipeTag> RecipeDatabase::retrieveAllTags(){
 	return tags;
 }
 
+void RecipeDatabase::deleteTag(RecipeTag tag){
+	ResultTable t = this->executeSQL("DELETE FROM recipeTag WHERE tagName="+surroundString(tag.getValue(), "'"));
+}
+
 void RecipeDatabase::ensureTablesExist(){
 	//Make sure that foreign keys are enabled.
 	this->executeSQL("PRAGMA foreign_keys = ON;");
diff --git a/model/database/recipedatabase.h b/model/database/recipedatabase.h
index f1d9867..099c233 100644
--- a/model/database/recipedatabase.h
+++ b/model/database/recipedatabase.h
@@ -37,6 +37,9 @@ class RecipeDatabase : public Database
 		vector<UnitOfMeasure> retrieveAllUnitsOfMeasure();
 		vector<RecipeTag> retrieveTags(int recipeId);
 		vector<RecipeTag> retrieveAllTags();
+
+		//Deletion.
+		void deleteTag(RecipeTag tag);
 	private:
 
 		//Utility methods.