diff --git a/resources/icons/ui/dark/radio_checked.png b/resources/icons/ui/dark/radio_checked.png
new file mode 100644
index 00000000..acb89015
Binary files /dev/null and b/resources/icons/ui/dark/radio_checked.png differ
diff --git a/resources/icons/ui/dark/radio_checked@2x.png b/resources/icons/ui/dark/radio_checked@2x.png
new file mode 100644
index 00000000..e1904762
Binary files /dev/null and b/resources/icons/ui/dark/radio_checked@2x.png differ
diff --git a/resources/icons/ui/dark/radio_checked_disabled.png b/resources/icons/ui/dark/radio_checked_disabled.png
new file mode 100644
index 00000000..49df4392
Binary files /dev/null and b/resources/icons/ui/dark/radio_checked_disabled.png differ
diff --git a/resources/icons/ui/dark/radio_checked_disabled@2x.png b/resources/icons/ui/dark/radio_checked_disabled@2x.png
new file mode 100644
index 00000000..a9ffd40c
Binary files /dev/null and b/resources/icons/ui/dark/radio_checked_disabled@2x.png differ
diff --git a/resources/icons/ui/dark/radio_unchecked.png b/resources/icons/ui/dark/radio_unchecked.png
new file mode 100644
index 00000000..9ffddc4a
Binary files /dev/null and b/resources/icons/ui/dark/radio_unchecked.png differ
diff --git a/resources/icons/ui/dark/radio_unchecked@2x.png b/resources/icons/ui/dark/radio_unchecked@2x.png
new file mode 100644
index 00000000..2160a32e
Binary files /dev/null and b/resources/icons/ui/dark/radio_unchecked@2x.png differ
diff --git a/resources/icons/ui/dark/radio_unchecked_disabled.png b/resources/icons/ui/dark/radio_unchecked_disabled.png
new file mode 100644
index 00000000..7ddff642
Binary files /dev/null and b/resources/icons/ui/dark/radio_unchecked_disabled.png differ
diff --git a/resources/icons/ui/dark/radio_unchecked_disabled@2x.png b/resources/icons/ui/dark/radio_unchecked_disabled@2x.png
new file mode 100644
index 00000000..4de5d0d2
Binary files /dev/null and b/resources/icons/ui/dark/radio_unchecked_disabled@2x.png differ
diff --git a/resources/icons/ui/midnight/radio_checked.png b/resources/icons/ui/midnight/radio_checked.png
new file mode 100644
index 00000000..acb89015
Binary files /dev/null and b/resources/icons/ui/midnight/radio_checked.png differ
diff --git a/resources/icons/ui/midnight/radio_checked@2x.png b/resources/icons/ui/midnight/radio_checked@2x.png
new file mode 100644
index 00000000..e1904762
Binary files /dev/null and b/resources/icons/ui/midnight/radio_checked@2x.png differ
diff --git a/resources/icons/ui/midnight/radio_checked_disabled.png b/resources/icons/ui/midnight/radio_checked_disabled.png
new file mode 100644
index 00000000..49df4392
Binary files /dev/null and b/resources/icons/ui/midnight/radio_checked_disabled.png differ
diff --git a/resources/icons/ui/midnight/radio_checked_disabled@2x.png b/resources/icons/ui/midnight/radio_checked_disabled@2x.png
new file mode 100644
index 00000000..a9ffd40c
Binary files /dev/null and b/resources/icons/ui/midnight/radio_checked_disabled@2x.png differ
diff --git a/resources/icons/ui/midnight/radio_unchecked.png b/resources/icons/ui/midnight/radio_unchecked.png
new file mode 100644
index 00000000..9ffddc4a
Binary files /dev/null and b/resources/icons/ui/midnight/radio_unchecked.png differ
diff --git a/resources/icons/ui/midnight/radio_unchecked@2x.png b/resources/icons/ui/midnight/radio_unchecked@2x.png
new file mode 100644
index 00000000..2160a32e
Binary files /dev/null and b/resources/icons/ui/midnight/radio_unchecked@2x.png differ
diff --git a/resources/icons/ui/midnight/radio_unchecked_disabled.png b/resources/icons/ui/midnight/radio_unchecked_disabled.png
new file mode 100644
index 00000000..7ddff642
Binary files /dev/null and b/resources/icons/ui/midnight/radio_unchecked_disabled.png differ
diff --git a/resources/icons/ui/midnight/radio_unchecked_disabled@2x.png b/resources/icons/ui/midnight/radio_unchecked_disabled@2x.png
new file mode 100644
index 00000000..4de5d0d2
Binary files /dev/null and b/resources/icons/ui/midnight/radio_unchecked_disabled@2x.png differ
diff --git a/resources/images.qrc b/resources/images.qrc
index c3e8aee4..e1253139 100644
--- a/resources/images.qrc
+++ b/resources/images.qrc
@@ -61,6 +61,14 @@
         <file>icons/ui/dark/branch_open.png</file>
         <file>icons/ui/dark/branch_end.png</file>
         <file>icons/ui/dark/branch_more.png</file>
+        <file>icons/ui/dark/radio_checked_disabled.png</file>
+        <file>icons/ui/dark/radio_checked_disabled@2x.png</file>
+        <file>icons/ui/dark/radio_checked.png</file>
+        <file>icons/ui/dark/radio_checked@2x.png</file>
+        <file>icons/ui/dark/radio_unchecked_disabled.png</file>
+        <file>icons/ui/dark/radio_unchecked_disabled@2x.png</file>
+        <file>icons/ui/dark/radio_unchecked.png</file>
+        <file>icons/ui/dark/radio_unchecked@2x.png</file>
         <file>icons/ui/midnight/checkbox_checked_disabled.png</file>
         <file>icons/ui/midnight/checkbox_checked_disabled@2x.png</file>
         <file>icons/ui/midnight/checkbox_checked.png</file>
@@ -73,6 +81,14 @@
         <file>icons/ui/midnight/branch_open.png</file>
         <file>icons/ui/midnight/branch_end.png</file>
         <file>icons/ui/midnight/branch_more.png</file>
+        <file>icons/ui/midnight/radio_checked_disabled.png</file>
+        <file>icons/ui/midnight/radio_checked_disabled@2x.png</file>
+        <file>icons/ui/midnight/radio_checked.png</file>
+        <file>icons/ui/midnight/radio_checked@2x.png</file>
+        <file>icons/ui/midnight/radio_unchecked_disabled.png</file>
+        <file>icons/ui/midnight/radio_unchecked_disabled@2x.png</file>
+        <file>icons/ui/midnight/radio_unchecked.png</file>
+        <file>icons/ui/midnight/radio_unchecked@2x.png</file>
         <file>images/blank_tileset.png</file>
         <file>images/collisions.png</file>
         <file>images/collisions_unknown.png</file>
diff --git a/resources/themes/dark.qss b/resources/themes/dark.qss
index cf240867..69dc7cd5 100644
--- a/resources/themes/dark.qss
+++ b/resources/themes/dark.qss
@@ -198,16 +198,23 @@ QCheckBox QWidget:disabled {
 }
 
 QCheckBox::indicator {
-    margin-left: 4px;
     height: 16px;
     width: 16px;
 }
 
-QRadioButton::indicator::unchecked, QCheckBox::indicator::unchecked {
+QCheckBox::indicator::unchecked {
     image: url(:/icons/ui/dark/checkbox_unchecked.png)
 }
 
-QRadioButton::indicator:unchecked:hover, QCheckBox::indicator:unchecked:hover {
+QCheckBox::indicator::checked {
+    image: url(":/icons/ui/dark/checkbox_checked.png");
+}
+
+QCheckBox::indicator:unchecked:hover {
+
+}
+
+QCheckBox::indicator:checked:hover {
 
 }
 
@@ -215,18 +222,61 @@ QCheckBox::indicator:unchecked:disabled {
     image: url(":/icons/ui/dark/checkbox_unchecked_disabled.png");
 }
 
-QRadioButton::indicator::checked, QCheckBox::indicator::checked {
-    image: url(":/icons/ui/dark/checkbox_checked.png");
-}
-
-QRadioButton::indicator:checked:hover, QCheckBox::indicator:checked:hover {
-
-}
-
 QCheckBox::indicator:checked:disabled {
     image: url(":/icons/ui/dark/checkbox_checked_disabled.png");
 }
 
+
+/* Radio Buttons */
+
+QRadioButton {
+    background-color: #19232D;
+    color: #F0F0F0;
+    spacing: 4px;
+    outline: none;
+    padding-top: 4px;
+    padding-bottom: 4px;
+}
+
+QRadioButton:focus {
+    border: none;
+}
+
+QRadioButton QWidget:disabled {
+    background-color: #19232D;
+    color: #787878;
+}
+
+QRadioButton::indicator {
+    height: 16px;
+    width: 16px;
+}
+
+QRadioButton::indicator::unchecked {
+    image: url(:/icons/ui/dark/radio_unchecked.png)
+}
+
+QRadioButton::indicator::checked {
+    image: url(":/icons/ui/dark/radio_checked.png");
+}
+
+QRadioButton::indicator:unchecked:hover {
+
+}
+
+QRadioButton::indicator:checked:hover {
+
+}
+
+QRadioButton::indicator:unchecked:disabled {
+    image: url(":/icons/ui/dark/radio_unchecked_disabled.png");
+}
+
+QRadioButton::indicator:checked:disabled {
+    image: url(":/icons/ui/dark/radio_checked_disabled.png");
+}
+
+
 /* Map List View */
 
 QTreeView {
diff --git a/resources/themes/midnight.qss b/resources/themes/midnight.qss
index 6b9e6bfa..734dffa1 100644
--- a/resources/themes/midnight.qss
+++ b/resources/themes/midnight.qss
@@ -178,6 +178,8 @@ QLineEdit {
     color: #F8F8F2;
 }
 
+/* Checkboxes */
+
 QCheckBox {
     background-color: #31332b;
     color: #F8F8F2;
@@ -197,16 +199,23 @@ QCheckBox QWidget:disabled {
 }
 
 QCheckBox::indicator {
-    margin-left: 4px;
     height: 16px;
     width: 16px;
 }
 
-QRadioButton::indicator::unchecked, QCheckBox::indicator::unchecked {
+QCheckBox::indicator::unchecked {
     image: url(:/icons/ui/midnight/checkbox_unchecked.png)
 }
 
-QRadioButton::indicator:unchecked:hover, QCheckBox::indicator:unchecked:hover {
+QCheckBox::indicator::checked {
+    image: url(":/icons/ui/midnight/checkbox_checked.png");
+}
+
+QCheckBox::indicator:unchecked:hover {
+
+}
+
+QCheckBox::indicator:checked:hover {
 
 }
 
@@ -214,18 +223,61 @@ QCheckBox::indicator:unchecked:disabled {
     image: url(":/icons/ui/midnight/checkbox_unchecked_disabled.png");
 }
 
-QRadioButton::indicator::checked, QCheckBox::indicator::checked {
-    image: url(":/icons/ui/midnight/checkbox_checked.png");
-}
-
-QRadioButton::indicator:checked:hover, QCheckBox::indicator:checked:hover {
-
-}
-
 QCheckBox::indicator:checked:disabled {
     image: url(":/icons/ui/midnight/checkbox_checked_disabled.png");
 }
 
+
+/* Radio Buttons */
+
+QRadioButton {
+    background-color: #31332b;
+    color: #F8F8F2;
+    spacing: 4px;
+    outline: none;
+    padding-top: 4px;
+    padding-bottom: 4px;
+}
+
+QRadioButton:focus {
+    border: none;
+}
+
+QRadioButton QWidget:disabled {
+    background-color: #49483E;
+    color: #F8F8F2;
+}
+
+QRadioButton::indicator {
+    height: 16px;
+    width: 16px;
+}
+
+QRadioButton::indicator::unchecked {
+    image: url(:/icons/ui/midnight/radio_unchecked.png)
+}
+
+QRadioButton::indicator::checked {
+    image: url(":/icons/ui/midnight/radio_checked.png");
+}
+
+QRadioButton::indicator:unchecked:hover {
+
+}
+
+QRadioButton::indicator:checked:hover {
+
+}
+
+QRadioButton::indicator:unchecked:disabled {
+    image: url(":/icons/ui/midnight/radio_unchecked_disabled.png");
+}
+
+QRadioButton::indicator:checked:disabled {
+    image: url(":/icons/ui/midnight/radio_checked_disabled.png");
+}
+
+
 /* Map List View */
 
 QTreeView {