diff --git a/data/common.css b/data/common.css
new file mode 100644
index 00000000..0acd83b4
--- /dev/null
+++ b/data/common.css
@@ -0,0 +1,6 @@
+/* Theme independent style */
+
+sq_view.pin sq_button {
+    border-radius: 0px;
+    margin: 1px 1px 1px 1px;
+}
diff --git a/data/squeekboard.gresources.xml b/data/squeekboard.gresources.xml
index 8e98c977..795d22b7 100644
--- a/data/squeekboard.gresources.xml
+++ b/data/squeekboard.gresources.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/sm/puri/squeekboard">
+   <file compressed="true">common.css</file>
    <file compressed="true">style.css</file>
    <file compressed="true">style-Adwaita:dark.css</file>
    <file compressed="true" preprocess="xml-stripblanks">popup.ui</file>
diff --git a/data/style-Adwaita:dark.css b/data/style-Adwaita:dark.css
index 6b52750f..8a89a4d4 100644
--- a/data/style-Adwaita:dark.css
+++ b/data/style-Adwaita:dark.css
@@ -58,3 +58,5 @@ sq_button.small {
     background: #1c71d8;
     border-color: #3584e4;
 }
+
+@import url("resource:///sm/puri/squeekboard/common.css");
diff --git a/data/style.css b/data/style.css
index 40b8ffa6..3feec5c7 100644
--- a/data/style.css
+++ b/data/style.css
@@ -61,3 +61,5 @@ sq_button.small {
     background: mix(@theme_selected_bg_color, @theme_bg_color, 0.4); /*#1c71d8;*/
     border-color: @borders; /*#3584e4;*/
 }
+
+@import url("resource:///sm/puri/squeekboard/common.css");