diff --git a/app/src/main/res/layouts/main_layouts/layout/gists_pager_layout.xml b/app/src/main/res/layouts/main_layouts/layout/gists_pager_layout.xml
index 2218bb2f..85818570 100644
--- a/app/src/main/res/layouts/main_layouts/layout/gists_pager_layout.xml
+++ b/app/src/main/res/layouts/main_layouts/layout/gists_pager_layout.xml
@@ -37,8 +37,8 @@
                     android:layout_gravity="center|end"
                     android:contentDescription="@string/star"
                     android:background="?selectableItemBackgroundBorderless"
-                    android:padding="@dimen/spacing_xs_large"
-                    android:scaleType="centerCrop"
+                    android:padding="@dimen/spacing_normal"
+                    
                     android:src="@drawable/ic_star"/>
 
                 <com.fastaccess.ui.widgets.ForegroundImageView
@@ -48,8 +48,8 @@
                     android:layout_gravity="center|end"
                     android:contentDescription="@string/fork"
                     android:background="?selectableItemBackgroundBorderless"
-                    android:padding="@dimen/spacing_xs_large"
-                    android:scaleType="centerCrop"
+                    android:padding="@dimen/spacing_normal"
+                    
                     android:src="@drawable/ic_fork"/>
             </android.support.v7.widget.Toolbar>
 
diff --git a/app/src/main/res/layouts/main_layouts/layout/issue_pager_activity.xml b/app/src/main/res/layouts/main_layouts/layout/issue_pager_activity.xml
index 2836dda5..097c0a2e 100644
--- a/app/src/main/res/layouts/main_layouts/layout/issue_pager_activity.xml
+++ b/app/src/main/res/layouts/main_layouts/layout/issue_pager_activity.xml
@@ -33,22 +33,22 @@
                 <com.fastaccess.ui.widgets.ForegroundImageView
                     android:id="@+id/startGist"
                     android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
+                    android:layout_height="wrap_content"
                     android:layout_gravity="center|end"
-                    android:contentDescription="@string/star"
                     android:background="?selectableItemBackgroundBorderless"
-                    android:padding="@dimen/spacing_xs_large"
+                    android:contentDescription="@string/star"
+                    android:padding="@dimen/spacing_normal"
                     android:scaleType="centerCrop"
                     android:src="@drawable/ic_star"/>
 
                 <com.fastaccess.ui.widgets.ForegroundImageView
                     android:id="@+id/forkGist"
                     android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
+                    android:layout_height="wrap_content"
                     android:layout_gravity="center|end"
-                    android:contentDescription="@string/fork"
                     android:background="?selectableItemBackgroundBorderless"
-                    android:padding="@dimen/spacing_xs_large"
+                    android:contentDescription="@string/fork"
+                    android:padding="@dimen/spacing_normal"
                     android:scaleType="centerCrop"
                     android:src="@drawable/ic_fork"/>
             </android.support.v7.widget.Toolbar>
diff --git a/app/src/main/res/layouts/main_layouts/layout/search_layout.xml b/app/src/main/res/layouts/main_layouts/layout/search_layout.xml
index 52d6020a..881e87e7 100644
--- a/app/src/main/res/layouts/main_layouts/layout/search_layout.xml
+++ b/app/src/main/res/layouts/main_layouts/layout/search_layout.xml
@@ -53,14 +53,11 @@
                     <com.fastaccess.ui.widgets.ForegroundImageView
                         android:id="@+id/clear"
                         android:layout_width="wrap_content"
-                        android:layout_height="match_parent"
+                        android:layout_height="wrap_content"
                         android:layout_gravity="center"
                         android:contentDescription="@string/clear"
                         android:background="?selectableItemBackgroundBorderless"
-                        android:paddingBottom="@dimen/spacing_xs_large"
-                        android:paddingEnd="@dimen/spacing_xs_large"
-                        android:paddingStart="@dimen/spacing_xs_large"
-                        android:paddingTop="@dimen/spacing_xs_large"
+                        android:padding="@dimen/spacing_normal"
                         android:scaleType="centerCrop"
                         android:src="@drawable/ic_clear"
                         android:visibility="invisible"/>
diff --git a/app/src/main/res/layouts/other_layouts/layout/appbar_search_elevation.xml b/app/src/main/res/layouts/other_layouts/layout/appbar_search_elevation.xml
index 107d8418..c83f3a46 100644
--- a/app/src/main/res/layouts/other_layouts/layout/appbar_search_elevation.xml
+++ b/app/src/main/res/layouts/other_layouts/layout/appbar_search_elevation.xml
@@ -29,11 +29,11 @@
         <com.fastaccess.ui.widgets.ForegroundImageView
             android:id="@+id/searchIcon"
             android:layout_width="wrap_content"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:background="?selectableItemBackgroundBorderless"
+            android:padding="@dimen/spacing_normal"
             android:scaleType="centerCrop"
-            android:padding="@dimen/spacing_xs_large"
             android:src="@drawable/ic_search"/>
 
         <com.fastaccess.ui.widgets.FontEditText
@@ -58,10 +58,9 @@
             android:layout_height="match_parent"
             android:layout_gravity="center"
             android:background="?selectableItemBackgroundBorderless"
-            android:scaleType="centerCrop"
             android:src="@drawable/ic_clear"
             tools:visibility="visible"
-            android:padding="@dimen/spacing_xs_large"
+            android:padding="@dimen/spacing_normal"
             android:visibility="invisible"/>
 
     </LinearLayout>