diff --git a/library/eclair-mr1/res/layout/suw_items_switch.xml b/library/eclair-mr1/res/layout/suw_items_switch.xml
index 62bb479..4cae23d 100644
--- a/library/eclair-mr1/res/layout/suw_items_switch.xml
+++ b/library/eclair-mr1/res/layout/suw_items_switch.xml
@@ -68,8 +68,9 @@
 
     <android.support.v7.widget.SwitchCompat
         android:id="@+id/suw_items_switch"
+        style="@style/SuwSwitchStyle"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:layout_gravity="center_vertical" />
 
 </LinearLayout>
diff --git a/library/eclair-mr1/res/values/styles.xml b/library/eclair-mr1/res/values/styles.xml
index 25e7757..728bdda 100644
--- a/library/eclair-mr1/res/values/styles.xml
+++ b/library/eclair-mr1/res/values/styles.xml
@@ -146,6 +146,13 @@
         <item name="android:textAppearance">?attr/textAppearanceListItemSmall</item>
     </style>
 
+    <style name="SuwSwitchStyle">
+        <item name="android:paddingEnd" tools:ignore="NewApi">@dimen/suw_switch_padding_end</item>
+        <item name="android:paddingLeft">@dimen/suw_switch_padding_start</item>
+        <item name="android:paddingRight">@dimen/suw_switch_padding_end</item>
+        <item name="android:paddingStart" tools:ignore="NewApi">@dimen/suw_switch_padding_start</item>
+    </style>
+
     <!-- Button styles -->
 
     <style name="SuwButtonItem" />
diff --git a/library/main/res/values/dimens.xml b/library/main/res/values/dimens.xml
index 2e89936..ef2471e 100644
--- a/library/main/res/values/dimens.xml
+++ b/library/main/res/values/dimens.xml
@@ -119,4 +119,7 @@
     <dimen name="suw_progress_bar_margin_vertical">-7dp</dimen>
     <dimen name="suw_glif_progress_bar_margin_vertical">7dp</dimen>
 
+    <dimen name="suw_switch_padding_start">16dp</dimen>
+    <dimen name="suw_switch_padding_end">0dp</dimen>
+
 </resources>