diff --git a/Icons/Chicago95-tux/devices/16/printer-remote-symbolic.png b/Icons/Chicago95-tux/devices/16/printer-remote-symbolic.png
new file mode 120000
index 0000000..a8ee2d7
--- /dev/null
+++ b/Icons/Chicago95-tux/devices/16/printer-remote-symbolic.png
@@ -0,0 +1 @@
+printer.png
\ No newline at end of file
diff --git a/Icons/Chicago95-tux/devices/16/printer-symbolic.png b/Icons/Chicago95-tux/devices/16/printer-symbolic.png
new file mode 120000
index 0000000..a8ee2d7
--- /dev/null
+++ b/Icons/Chicago95-tux/devices/16/printer-symbolic.png
@@ -0,0 +1 @@
+printer.png
\ No newline at end of file
diff --git a/Icons/Chicago95-tux/devices/16/printer1-symbolic.png b/Icons/Chicago95-tux/devices/16/printer1-symbolic.png
new file mode 120000
index 0000000..a8ee2d7
--- /dev/null
+++ b/Icons/Chicago95-tux/devices/16/printer1-symbolic.png
@@ -0,0 +1 @@
+printer.png
\ No newline at end of file
diff --git a/Icons/Chicago95/devices/16/printer-remote-symbolic.png b/Icons/Chicago95/devices/16/printer-remote-symbolic.png
new file mode 120000
index 0000000..a8ee2d7
--- /dev/null
+++ b/Icons/Chicago95/devices/16/printer-remote-symbolic.png
@@ -0,0 +1 @@
+printer.png
\ No newline at end of file
diff --git a/Icons/Chicago95/devices/16/printer-symbolic.png b/Icons/Chicago95/devices/16/printer-symbolic.png
new file mode 120000
index 0000000..a8ee2d7
--- /dev/null
+++ b/Icons/Chicago95/devices/16/printer-symbolic.png
@@ -0,0 +1 @@
+printer.png
\ No newline at end of file
diff --git a/Icons/Chicago95/devices/16/printer1-symbolic.png b/Icons/Chicago95/devices/16/printer1-symbolic.png
new file mode 120000
index 0000000..a8ee2d7
--- /dev/null
+++ b/Icons/Chicago95/devices/16/printer1-symbolic.png
@@ -0,0 +1 @@
+printer.png
\ No newline at end of file
diff --git a/Theme/Chicago95/gtk-3.0/gtk-buttons.css b/Theme/Chicago95/gtk-3.0/gtk-buttons.css
index 88961d6..49370af 100644
--- a/Theme/Chicago95/gtk-3.0/gtk-buttons.css
+++ b/Theme/Chicago95/gtk-3.0/gtk-buttons.css
@@ -233,8 +233,7 @@ box-shadow: inset 1px 1px @border_color, inset -1px -1px @border_color; }
 /* image buttons */
 .image-button {
   padding: 0px;
-  min-width: 20px;
-  min-height: 20px; }
+  color: @text_color; }
   .image-button label {
     padding-left: 4px;
     padding-right: 4px; }
diff --git a/Theme/Chicago95/gtk-3.0/gtk-headerbars.css b/Theme/Chicago95/gtk-3.0/gtk-headerbars.css
index 270b770..648f009 100644
--- a/Theme/Chicago95/gtk-3.0/gtk-headerbars.css
+++ b/Theme/Chicago95/gtk-3.0/gtk-headerbars.css
@@ -36,20 +36,6 @@ headerbar,
     margin: 3px;
     padding-top: 1px;
     padding-bottom: 1px; }
-  headerbar button:not(.titlebutton) > image {
-    border: solid 1px;
-    border-color: transparent;
-    padding-left: 3px;
-    padding-right: 3px;
-    margin-top: -3px;
-    margin-bottom: -3px; }
-    headerbar button:active:not(.titlebutton) > image {
-      border: solid;
-      border-color: transparent;
-      border-left-width: 2px;
-      border-right-width: 0px;
-      border-top-width: 2px;
-      border-bottom-width: 0px; }
   headerbar separator {
     margin-right: 3px;
     border-left-width: 1px;
diff --git a/Theme/Chicago95/gtk-3.0/gtk-paned.css b/Theme/Chicago95/gtk-3.0/gtk-paned.css
index f277e00..cae9729 100644
--- a/Theme/Chicago95/gtk-3.0/gtk-paned.css
+++ b/Theme/Chicago95/gtk-3.0/gtk-paned.css
@@ -3,7 +3,8 @@
  *********/
 
 paned  {
-  margin: 0px; }
+  margin: 0px;
+  padding: 1px; }
 
 /* GTK has the panes flipped. the .horizontal is ACTUALLY a vertical.*/
 paned.horizontal > separator {
diff --git a/Theme/Chicago95/gtk-3.0/gtk-titlebars.css b/Theme/Chicago95/gtk-3.0/gtk-titlebars.css
index 7614a86..bf0a7bf 100644
--- a/Theme/Chicago95/gtk-3.0/gtk-titlebars.css
+++ b/Theme/Chicago95/gtk-3.0/gtk-titlebars.css
@@ -20,13 +20,13 @@
   /* The following button definitions allows us to have slim buttons on
    * headerbars with no big elements while still maintaining a good
    * looking headerbar with big elements */
-  .titlebar button:not(.titlebutton) {
+  .titlebar button {
     padding-top: 0px;
     padding-bottom: 0px;
     padding-left: 1px;
     padding-right: 1px;
-    margin-top: 2px;
-    margin-bottom: 2px;
+    margin-top: 4px;
+    margin-bottom: 4px;
     min-height: 16px;
     min-width: 16px; }
 
diff --git a/Theme/Chicago95/gtk-3.0/gtk-widgets.css b/Theme/Chicago95/gtk-3.0/gtk-widgets.css
index 26e02f1..b0bb016 100644
--- a/Theme/Chicago95/gtk-3.0/gtk-widgets.css
+++ b/Theme/Chicago95/gtk-3.0/gtk-widgets.css
@@ -417,14 +417,9 @@ headerbar .title {
 headerbar .subtitle {
   font-size: smaller; }
 
-headerbar box {
-  margin: 1px; }
-
-headerbar button image {
-  padding: 1px; }
-
-headerbar box button image {
-  padding: 1px; }
+/**************
+ * rubberband *
+ **************/
 
 .rubberband,
 rubberband,
@@ -451,3 +446,11 @@ grid viewport box box textview {
 /* dialog-vbox */
 .dialog-vbox flowbox flowboxchild:focus {
   outline-color: @selected_fg_color; }
+
+.dialog-vbox > grid {
+  border: 1px solid red;
+  border: 2px solid @border_dark;
+  border-image: url("assets/frame_inset.png");
+  border-image-slice: 2 2 2 2;
+  border-radius: 0px;
+  box-shadow: none; }
diff --git a/Theme/Chicago95/gtk-3.24/gtk-buttons.css b/Theme/Chicago95/gtk-3.24/gtk-buttons.css
index 88961d6..49370af 100644
--- a/Theme/Chicago95/gtk-3.24/gtk-buttons.css
+++ b/Theme/Chicago95/gtk-3.24/gtk-buttons.css
@@ -233,8 +233,7 @@ box-shadow: inset 1px 1px @border_color, inset -1px -1px @border_color; }
 /* image buttons */
 .image-button {
   padding: 0px;
-  min-width: 20px;
-  min-height: 20px; }
+  color: @text_color; }
   .image-button label {
     padding-left: 4px;
     padding-right: 4px; }
diff --git a/Theme/Chicago95/gtk-3.24/gtk-headerbars.css b/Theme/Chicago95/gtk-3.24/gtk-headerbars.css
index 270b770..648f009 100644
--- a/Theme/Chicago95/gtk-3.24/gtk-headerbars.css
+++ b/Theme/Chicago95/gtk-3.24/gtk-headerbars.css
@@ -36,20 +36,6 @@ headerbar,
     margin: 3px;
     padding-top: 1px;
     padding-bottom: 1px; }
-  headerbar button:not(.titlebutton) > image {
-    border: solid 1px;
-    border-color: transparent;
-    padding-left: 3px;
-    padding-right: 3px;
-    margin-top: -3px;
-    margin-bottom: -3px; }
-    headerbar button:active:not(.titlebutton) > image {
-      border: solid;
-      border-color: transparent;
-      border-left-width: 2px;
-      border-right-width: 0px;
-      border-top-width: 2px;
-      border-bottom-width: 0px; }
   headerbar separator {
     margin-right: 3px;
     border-left-width: 1px;
diff --git a/Theme/Chicago95/gtk-3.24/gtk-paned.css b/Theme/Chicago95/gtk-3.24/gtk-paned.css
index f277e00..cae9729 100644
--- a/Theme/Chicago95/gtk-3.24/gtk-paned.css
+++ b/Theme/Chicago95/gtk-3.24/gtk-paned.css
@@ -3,7 +3,8 @@
  *********/
 
 paned  {
-  margin: 0px; }
+  margin: 0px;
+  padding: 1px; }
 
 /* GTK has the panes flipped. the .horizontal is ACTUALLY a vertical.*/
 paned.horizontal > separator {
diff --git a/Theme/Chicago95/gtk-3.24/gtk-titlebars.css b/Theme/Chicago95/gtk-3.24/gtk-titlebars.css
index 7614a86..bf0a7bf 100644
--- a/Theme/Chicago95/gtk-3.24/gtk-titlebars.css
+++ b/Theme/Chicago95/gtk-3.24/gtk-titlebars.css
@@ -20,13 +20,13 @@
   /* The following button definitions allows us to have slim buttons on
    * headerbars with no big elements while still maintaining a good
    * looking headerbar with big elements */
-  .titlebar button:not(.titlebutton) {
+  .titlebar button {
     padding-top: 0px;
     padding-bottom: 0px;
     padding-left: 1px;
     padding-right: 1px;
-    margin-top: 2px;
-    margin-bottom: 2px;
+    margin-top: 4px;
+    margin-bottom: 4px;
     min-height: 16px;
     min-width: 16px; }
 
diff --git a/Theme/Chicago95/gtk-3.24/gtk-widgets.css b/Theme/Chicago95/gtk-3.24/gtk-widgets.css
index 26e02f1..b0bb016 100644
--- a/Theme/Chicago95/gtk-3.24/gtk-widgets.css
+++ b/Theme/Chicago95/gtk-3.24/gtk-widgets.css
@@ -417,14 +417,9 @@ headerbar .title {
 headerbar .subtitle {
   font-size: smaller; }
 
-headerbar box {
-  margin: 1px; }
-
-headerbar button image {
-  padding: 1px; }
-
-headerbar box button image {
-  padding: 1px; }
+/**************
+ * rubberband *
+ **************/
 
 .rubberband,
 rubberband,
@@ -451,3 +446,11 @@ grid viewport box box textview {
 /* dialog-vbox */
 .dialog-vbox flowbox flowboxchild:focus {
   outline-color: @selected_fg_color; }
+
+.dialog-vbox > grid {
+  border: 1px solid red;
+  border: 2px solid @border_dark;
+  border-image: url("assets/frame_inset.png");
+  border-image-slice: 2 2 2 2;
+  border-radius: 0px;
+  box-shadow: none; }