diff --git a/etc/Makefile.am b/etc/Makefile.am
index 2e8af80e39..bb6b7f431a 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -2,7 +2,7 @@
 
 gimpsysconf = \
 	controllerrc	\
-	gtkrc		\
+	gimp.css	\
 	menurc		\
 	sessionrc	\
 	templaterc	\
diff --git a/etc/gimp.css b/etc/gimp.css
new file mode 100644
index 0000000000..01d1365531
--- /dev/null
+++ b/etc/gimp.css
@@ -0,0 +1,9 @@
+/* You can add your own GIMP-specific GTK styles here */
+
+
+/* Adjust the size of previews in plug-in dialogs */
+/*
+GimpPreview {
+  -GimpPreview-size: 256;
+}
+*/
diff --git a/etc/gtkrc b/etc/gtkrc
deleted file mode 100644
index f4efa07c7e..0000000000
--- a/etc/gtkrc
+++ /dev/null
@@ -1,24 +0,0 @@
-# pixmap_path "<dir 1>:<dir 2>:<dir 3>:..."
-#
-# include "rc-file"
-#
-# style <name> [= <name>]
-# {
-#   <option>
-# }
-#
-# widget <widget_set>       style <style_name>
-# class  <widget_class_set> style <style_name>
-#
-# You can add your own GIMP-specific GTK styles here.
-
-
-#
-# Adjust the size of previews in plug-in dialogs:
-#
-style "gimp-large-preview"
-{
-  GimpPreview::size = 256
-}
-
-# class "GimpPreview" style "gimp-large-preview"
diff --git a/libgimp/gimpui.c b/libgimp/gimpui.c
index 5a33ffa214..d433ae5945 100644
--- a/libgimp/gimpui.c
+++ b/libgimp/gimpui.c
@@ -176,7 +176,6 @@ gimp_ui_init (const gchar *prog_name,
   [NSApp activateIgnoringOtherApps:YES];
 #endif
 
-  gimp_ui_fix_pixbuf_style ();
   gimp_ui_initialized = TRUE;
 }
 
diff --git a/themes/Small/gimp.css b/themes/Small/gimp.css
new file mode 100644
index 0000000000..a8ceef692d
--- /dev/null
+++ b/themes/Small/gimp.css
@@ -0,0 +1,69 @@
+/* GIMP theme css file */
+
+* {
+/*
+  stock["gtk-dialog-error"] =
+    {
+      { "images/stock-error-64.png", *, *, "gtk-dialog" }
+    }
+  stock["gtk-dialog-info"] =
+    {
+      { "images/stock-info-64.png", *, *, "gtk-dialog" }
+    }
+  stock["gtk-dialog-question"] =
+    {
+      { "images/stock-question-64.png", *, *, "gtk-dialog" }
+    }
+  stock["gtk-dialog-warning"] =
+    {
+      { "images/stock-warning-64.png", *, *, "gtk-dialog" }
+    }
+*/
+
+  -GtkPaned-handle-size:             5;
+  -GimpDockWindow-default-height:    240;
+  -GimpDock-font-scale:              0.8333;
+  -GimpMenuDock-minimal-width:       200;
+  -GimpDockWindow-menu-preview-size: small-toolbar;
+  -GimpToolPalette-tool-icon-size:   menu;
+  -GimpToolPalette-button-relief:    none;
+  -GimpDockbook-tab-border:          0;
+  -GimpDockbook-tab-icon-size:       menu;
+  -GimpColorNotebook-tab-border:     0;
+  -GimpColorNotebook-tab-icon-size:  menu;
+  -GimpDeviceEditor-handle-size:     12;
+  -GimpDockable-content-border:      1;
+  -GimpEditor-content-spacing:       1;
+  -GimpEditor-button-spacing:        1;
+  -GimpEditor-button-icon-size:      menu;
+  -GimpDataEditor-minimal-height:    64;
+  -GtkDialog-content-area-border:    0;
+  -GtkDialog-button-spacing:         6;
+  -GtkDialog-action-area-border:     12;
+  -GimpUnitComboBox-appears-as-list: 0;
+}
+
+GimpToolDialog {
+  -GtkDialog-action-area-border: 6;
+}
+
+GimpDockable {
+  -GimpFrame-label-bold:       0;
+  -GimpFrame-label-spacing:    0;
+  -GtkButton-focus-line-width: 1;
+  -GtkButton-focus-padding:    0;
+}
+
+GimpDisplayShell {
+  -GimpRuler-font-scale:          0.6444;
+  -GimpUnitComboBox-label-scale:  0.8333;
+  -GimpScaleComboBox-label-scale: 0.8333;
+  -GtkComboBox-arrow-size:        8;
+  -GtkButton-inner-border:        0 0 0 0;
+  -GtkButton-focus-line_width:    0;
+  -GtkButton-focus-padding:       0;
+}
+
+GimpOverlayFrame {
+  -GtkButton-focus-line-width: 1;
+}
diff --git a/themes/System/Makefile.am b/themes/System/Makefile.am
index cbfcc22969..496ca988f6 100644
--- a/themes/System/Makefile.am
+++ b/themes/System/Makefile.am
@@ -2,6 +2,6 @@
 
 themedatadir = $(gimpdatadir)/themes/System
 
-themedata_DATA = gtkrc
+themedata_DATA = gimp.css
 
 EXTRA_DIST = $(themedata_DATA)
diff --git a/themes/System/gimp.css b/themes/System/gimp.css
new file mode 100644
index 0000000000..cb6aa45025
--- /dev/null
+++ b/themes/System/gimp.css
@@ -0,0 +1,69 @@
+/* GIMP theme css file */
+
+* {
+/*
+  stock["gtk-dialog-error"] =
+    {
+      { "images/stock-error-64.png", *, *, "gtk-dialog" }
+    }
+  stock["gtk-dialog-info"] =
+    {
+      { "images/stock-info-64.png", *, *, "gtk-dialog" }
+    }
+  stock["gtk-dialog-question"] =
+    {
+      { "images/stock-question-64.png", *, *, "gtk-dialog" }
+    }
+  stock["gtk-dialog-warning"] =
+    {
+      { "images/stock-warning-64.png", *, *, "gtk-dialog" }
+    }
+*/
+
+  -GtkPaned-handle-size:             6;
+  -GimpDockWindow-default-height:    300;
+  -GimpDock-font-scale:              0.8333;
+  -GimpMenuDock-minimal-width:       200;
+  -GimpDockWindow-menu-preview-size: button;
+  -GimpToolPalette-tool-icon-size:   button;
+  -GimpToolPalette-button-relief:    none;
+  -GimpDockbook-tab-border:          0;
+  -GimpDockbook-tab-icon-size:       button;
+  -GimpColorNotebook-tab-border:     0;
+  -GimpColorNotebook-tab-icon-size:  button;
+  -GimpDeviceEditor-handle-size:     12;
+  -GimpDockable-content-border:      2;
+  -GimpEditor-content-spacing:       2;
+  -GimpEditor-button-spacing:        2;
+  -GimpEditor-button-icon-size:      menu;
+  -GimpDataEditor-minimal-height:    96;
+  -GtkDialog-content-area-border:    0;
+  -GtkDialog-button-spacing:         6;
+  -GtkDialog-action-area-border:     12;
+  -GimpUnitComboBox-appears-as-list: 0;
+}
+
+GimpToolDialog {
+  -GtkDialog-action-area-border: 6;
+}
+
+GimpDockable {
+  -GimpFrame-label-bold:       0;
+  -GimpFrame-label-spacing:    2;
+  -GtkButton-focus-line-width: 1;
+  -GtkButton-focus-padding:    0;
+}
+
+GimpDisplayShell {
+  -GimpRuler-font-scale:          0.8333;
+  -GimpUnitComboBox-label-scale:  0.8333;
+  -GimpScaleComboBox-label-scale: 0.8333;
+  -GtkComboBox-arrow-size:        8;
+  -GtkButton-inner-border:        0 0 0 0;
+  -GtkButton-focus-line_width:    0;
+  -GtkButton-focus-padding:       0;
+}
+
+GimpOverlayFrame {
+  -GtkButton-focus-line-width: 1;
+}
diff --git a/themes/System/gtkrc b/themes/System/gtkrc
deleted file mode 100644
index 3da549e26d..0000000000
--- a/themes/System/gtkrc
+++ /dev/null
@@ -1,107 +0,0 @@
-# pixmap_path "<dir 1>:<dir 2>:<dir 3>:..."
-#
-# include "rc-file"
-#
-# style <name> [= <name>]
-# {
-#   <option>
-# }
-#
-# widget <widget_set> style <style_name>
-# widget_class <widget_class_set> style <style_name>
-
-
-# Don't define icons for the Default theme as they are compiled in
-#
-# include "imagerc"
-
-# Do override some GTK stock icons however.
-
-style "gimp-default-style"
-{
-  stock["gtk-dialog-error"] =
-    {
-      { "../../icons/Color/64x64/apps/gimp-error.png", *, *, "gtk-dialog" }
-    }
-  stock["gtk-dialog-info"] =
-    {
-      { "../../icons/Color/64x64/apps/gimp-info.png", *, *, "gtk-dialog" }
-    }
-  stock["gtk-dialog-question"] =
-    {
-      { "../../icons/Color/64x64/apps/gimp-question.png", *, *, "gtk-dialog" }
-    }
-  stock["gtk-dialog-warning"] =
-    {
-      { "../../icons/Color/64x64/apps/gimp-warning.png", *, *, "gtk-dialog" }
-    }
-
-# Uncommenting this line allows to set a different font for GIMP.
-#
-# font_name = "sans 10"
-
-  GtkPaned::handle-size             = 6
-  GimpDockWindow::default-height    = 300
-  GimpDock::font-scale              = 0.8333
-  GimpMenuDock::minimal-width       = 200
-  GimpDockWindow::menu-preview-size = button
-  GimpToolPalette::tool-icon-size   = button
-  GimpToolPalette::button-relief    = none
-  GimpDockbook::tab-border          = 0
-  GimpDockbook::tab-icon-size       = button
-  GimpColorNotebook::tab-border     = 0
-  GimpColorNotebook::tab-icon-size  = button
-  GimpDeviceEditor::handle-size     = 12
-  GimpDockable::content-border      = 2
-  GimpEditor::content-spacing       = 2
-  GimpEditor::button-spacing        = 2
-  GimpEditor::button-icon-size      = menu
-  GimpDataEditor::minimal-height    = 96
-  GtkDialog::content-area-border    = 0
-  GtkDialog::button-spacing         = 6
-  GtkDialog::action-area-border     = 12
-  GimpUnitComboBox::appears-as-list = 0
-}
-
-class "GtkWidget" style "gimp-default-style"
-
-
-style "gimp-tool-dialog-style" = "gimp-default-style"
-{
-  GtkDialog::action-area-border = 6
-}
-
-class "GimpToolDialog" style "gimp-tool-dialog-style"
-
-
-style "gimp-grid-view-style" = "gimp-default-style"
-{
-  bg[NORMAL] = { 1.0, 1.0, 1.0 }
-}
-
-widget "*GimpContainerGridView*GtkViewport*" style "gimp-grid-view-style"
-
-
-style "gimp-dockable-style" = "gimp-default-style"
-{
-  GimpFrame::label-bold       = 0
-  GimpFrame::label-spacing    = 2
-  GtkWidget::focus-line_width = 1
-  GtkWidget::focus-padding    = 0
-}
-
-widget "*GimpDockable.*" style "gimp-dockable-style"
-
-
-style "gimp-display-style" = "gimp-default-style"
-{
-  GimpRuler::font-scale          = 0.8333
-  GimpUnitComboBox::label-scale  = 0.8333
-  GimpScaleComboBox::label-scale = 0.8333
-  GtkComboBox::arrow-size        = 8
-  GtkButton::inner-border        = { 0, 0, 0, 0 }
-  GtkWidget::focus-line_width    = 1
-  GtkWidget::focus-padding       = 0
-}
-
-widget "*GimpDisplayShell.*" style "gimp-display-style"