diff --git a/views/res/hdpi/hdpi_find_case_sensitive.png b/views/res/hdpi/hdpi_find_case_sensitive.png
new file mode 100644
index 00000000..272c39dd
Binary files /dev/null and b/views/res/hdpi/hdpi_find_case_sensitive.png differ
diff --git a/views/res/hdpi/hdpi_find_whole_words.png b/views/res/hdpi/hdpi_find_whole_words.png
new file mode 100644
index 00000000..d0789656
Binary files /dev/null and b/views/res/hdpi/hdpi_find_whole_words.png differ
diff --git a/views/res/theme_default.xml b/views/res/theme_default.xml
index 98c77170..8d67e502 100644
--- a/views/res/theme_default.xml
+++ b/views/res/theme_default.xml
@@ -308,15 +308,15 @@ OB        fontSize="10pt"
 
     <style id="EDIT_LINE"
         backgroundImageId="editbox_background"
-        padding="4,4,4,4"
-        margins="2,2,2,2"
+        padding="3pt,3pt,3pt,3pt"
+        margins="1pt,1pt,1pt,1pt"
         minWidth="40"
         />
     <style id="EDIT_BOX"
         fontFace="Menlo,Consolas,DejaVuSansMono,Lucida Sans Typewriter,Courier New,Lucida Console"
         backgroundImageId="editbox_background"
-        padding="2,2,2,2"
-        margins="2,2,2,2"
+        padding="2pt,2pt,2pt,2pt"
+        margins="2pt,2pt,2pt,2pt"
         minWidth="100"
         minHeight="60"
         layoutWidth="FILL_PARENT"
@@ -327,8 +327,8 @@ OB        fontSize="10pt"
         fontSize="9pt"
         fontFamily="MonoSpace"
         backgroundImageId="editbox_background"
-        padding="2,2,2,2"
-        margins="2,2,2,2"
+        padding="2pt,2pt,2pt,2pt"
+        margins="2pt,2pt,2pt,2pt"
         minWidth="100"
         minHeight="60"
         layoutWidth="FILL_PARENT"
@@ -336,16 +336,16 @@ OB        fontSize="10pt"
         />
     <style id="LIST_BOX"
         backgroundImageId="editbox_background"
-        padding="2,2,2,2"
-        margins="2,2,2,2"
+        padding="2pt,2pt,2pt,2pt"
+        margins="2pt,2pt,2pt,2pt"
         layoutWidth="FILL_PARENT"
         layoutHeight="FILL_PARENT"
         />
     <style id="EDIT_BOX_NO_FRAME"
         fontFace="Menlo,Consolas,DejaVuSansMono,Lucida Sans Typewriter,Courier New,Lucida Console"
         backgroundColor="#FFFFFF"
-        padding="2,2,2,2"
-        margins="2,2,2,2"
+        padding="2pt,2pt,2pt,2pt"
+        margins="2pt,2pt,2pt,2pt"
         minWidth="100"
         minHeight="60"
         layoutWidth="FILL_PARENT"
@@ -353,8 +353,8 @@ OB        fontSize="10pt"
         />
     <style id="STRING_GRID"
         backgroundImageId="editbox_background"
-        padding="2,2,2,2"
-        margins="2,2,2,2"
+        padding="2pt,2pt,2pt,2pt"
+        margins="2pt,2pt,2pt,2pt"
         minWidth="100"
         minHeight="60"
         layoutWidth="FILL_PARENT"
@@ -362,8 +362,8 @@ OB        fontSize="10pt"
         />
     <style id="FILE_DIALOG_GRID"
         backgroundImageId="editbox_background"
-        padding="2,2,2,2"
-        margins="2,2,2,2"
+        padding="2pt,2pt,2pt,2pt"
+        margins="2pt,2pt,2pt,2pt"
         minWidth="100"
         minHeight="60"
         layoutWidth="FILL_PARENT"
@@ -373,20 +373,20 @@ OB        fontSize="10pt"
         backgroundColor="#eceffa"
         layoutWidth="FILL_PARENT"
         layoutHeight="WRAP_CONTENT"
-        padding="1,1,1,1"
+        padding="1pt,1pt,1pt,1pt"
 	layoutWeight="0"
         />
     <style id="DOCK_HOST"
         backgroundColor="#eceffa"
         layoutWidth="FILL_PARENT"
         layoutHeight="FILL_PARENT"
-        padding="2,2,2,2"
+        padding="2pt,2pt,2pt,2pt"
         />
     <style id="DOCK_HOST_BODY"
         layoutWidth="FILL_PARENT"
         layoutHeight="FILL_PARENT"
         padding="0,0,0,0"
-        margins="3,3,3,3"
+        margins="3pt,3pt,3pt,3pt"
         />
     <style id="DOCK_WINDOW"
         backgroundImageId="dock_window_background"
@@ -399,20 +399,20 @@ OB        fontSize="10pt"
         backgroundImageId="popup_window_background"
         layoutWidth="FILL_PARENT"
         layoutHeight="FILL_PARENT"
-        padding="1,1,1,1"
-        margins="4,4,4,4"
+        padding="1pt,1pt,1pt,1pt"
+        margins="4pt,4pt,4pt,4pt"
         />
     <style id="DOCK_WINDOW_CAPTION"
         backgroundImageId="dock_window_caption_background"
         layoutWidth="FILL_PARENT"
         layoutHeight="WRAP_CONTENT"
-        padding="1,1,1,1"
+        padding="1pt,1pt,1pt,1pt"
         />
     <style id="DOCK_WINDOW_CAPTION_LABEL"
         textColor="#000000"
         layoutWidth="FILL_PARENT"
         layoutHeight="WRAP_CONTENT"
-        padding="3,3,3,3"
+        padding="3pt,3pt,3pt,3pt"
         align="Left|VCenter"
         />
     <style id="DOCK_WINDOW_BODY"
@@ -425,35 +425,35 @@ OB        fontSize="10pt"
         backgroundImageId="toolbar_host_background"
         layoutWidth="FILL_PARENT"
         layoutHeight="WRAP_CONTENT"
-        padding="1,1,1,1"
+        padding="1pt,1pt,1pt,1pt"
         />
     <style id="TOOLTIP"
         backgroundImageId="tooltip_background"
         layoutWidth="WRAP_CONTENT"
         layoutHeight="WRAP_CONTENT"
-        margins="2,7,2,1"
-        padding="3,3,3,3"
+        margins="2pt,5pt,2pt,1pt"
+        padding="2pt,2pt,2pt,2pt"
 	textColor="#404040"
         />
     <style id="TOOLBAR"
         backgroundImageId="toolbar_background"
         layoutWidth="WRAP_CONTENT"
         layoutHeight="WRAP_CONTENT"
-        margins="2,1,2,1"
+        margins="2pt,1pt,2pt,1pt"
         />
     <style id="TOOLBAR_BUTTON"
         backgroundImageId="toolbar_button_background"
         align="Center"
-        margins="1,1,1,1"
-        padding="2,2,2,2"
+        margins="1pt,1pt,1pt,1pt"
+        padding="2pt,2pt,2pt,2pt"
         >
         <state state_enabled="false" alpha="160" backgroundImageId="toolbar_button_null"/>
     </style>
     <style id="TOOLBAR_CONTROL"
         backgroundImageId="toolbar_control_background"
         align="Center"
-        margins="1,1,1,1"
-        padding="2,2,2,2"
+        margins="1pt,1pt,1pt,1pt"
+        padding="2pt,2pt,2pt,2pt"
         >
         <state state_enabled="false" alpha="160" backgroundImageId="@null"/>
     </style>
@@ -491,20 +491,20 @@ OB        fontSize="10pt"
     </style>
 
     <style id="SETTINGS_TREE"
-        margins="8,8,8,8"
+        margins="5pt,5pt,5pt,5pt"
         backgroundColor="#FFFFFF"
         layoutWeight="3"
     />
 
     <style id="SETTINGS_PAGES"
-        margins="0,8,8,8"
-        padding="4,4,4,4"
+        margins="0,8pt,8pt,8pt"
+        padding="4pt,4pt,4pt,4pt"
         layoutWidth="FILL_PARENT"
         layoutWeight="5"
     />
 
     <style id="SETTINGS_PAGE_TITLE"
-        margins="4,4,4,14"
+        margins="4pt,4pt,4pt,10pt"
 	fontSize="120%"
 	layoutWeight="0"
         layoutWidth="FILL_PARENT"
@@ -513,8 +513,8 @@ OB        fontSize="10pt"
     <style id="RESIZER_VERTICAL"
         layoutWidth="FILL_PARENT"
         layoutHeight="WRAP_CONTENT"
-	minHeight="7"
-	maxHeight="7"
+	minHeight="7pt"
+	maxHeight="7pt"
 	backgroundColor="#E0E0E0">
         <state state_focused="true" backgroundColor="#40C0C000"/>
         <state state_pressed="true" backgroundColor="#4080C000"/>
@@ -524,8 +524,8 @@ OB        fontSize="10pt"
     <style id="RESIZER_HORIZONTAL"
         layoutWidth="FILL_PARENT"
         layoutHeight="WRAP_CONTENT"
-	minWidth="7"
-	maxWidth="7"
+	minWidth="7pt"
+	maxWidth="7pt"
 	backgroundColor="#E0E0E0">
         <state state_focused="true" backgroundColor="#40C0C000"/>
         <state state_pressed="true" backgroundColor="#4080C000"/>
diff --git a/views/standard_resources.list b/views/standard_resources.list
index c793bf17..f0b770c6 100644
--- a/views/standard_resources.list
+++ b/views/standard_resources.list
@@ -133,6 +133,8 @@ res/hdpi/hdpi_switch_on.png
 res/hdpi/hdpi_switch_on_disabled.png
 res/hdpi/hdpi_scrollbar_indicator_horizontal.png
 res/hdpi/hdpi_scrollbar_indicator_vertical.png
+res/hdpi/hdpi_find_case_sensitive.png
+res/hdpi/hdpi_find_whole_words.png
 res/mdpi/applications-internet.png
 res/mdpi/arrow_right_down_black.png
 res/mdpi/arrow_right_down_black_dark.png