--- a/gtk-3.0/gtk.scss	Sat Jul 09 11:48:31 2016 +0100
+++ b/gtk-3.0/gtk.scss	Sat Jul 09 15:25:37 2016 +0100
@@ -527,6 +527,7 @@
 
 
 /* Fix Meld dialog buttons and try not to break anything else */
+/* FIXME GTK3.18 theme update broke this when used with GTK3.16 */
 .message-dialog.csd .dialog-action-area .button {
   border-bottom-style: solid;
   &:last-child {
@@ -578,4 +579,25 @@
  */
 GtkTextView {
     background-color: #eee
+}
+
+/*
+ * Fix GTK3.18 change that makes .list-row.button items look like buttons
+ */
+.list-row.button,
+.list-row.button:backdrop,
+.list-row.button:backdrop:active,
+.list-row.button:backdrop:checked,
+.list-row.button:backdrop:insensitive,
+.list-row.button:backdrop:insensitive:active,
+.list-row.button:backdrop:insensitive:checked,
+.list-row.button:insensitive:active,
+.list-row.button:insensitive:checked {
+  // reset button inherited stuff
+  @extend %undecorated_button;
+  background-color: transparentize($base_color,1); // for the transition
+  border-style: none; // I need no borders here
+  border-radius: 0;   // and no rounded corners
+  box-shadow: none;   // and no box-shadow
+
 }
\ No newline at end of file