diff --git a/server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.java b/server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.java
index 6673449370..934fdc58b0 100644
--- a/server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.java
+++ b/server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.java
@@ -22,6 +22,7 @@
 
 import java.util.Map;
 
+import org.zanata.webtrans.client.editor.table.TableResources;
 import org.zanata.webtrans.client.presenter.TransUnitNavigationPresenter;
 import org.zanata.webtrans.client.resources.EditorConfigConstants;
 import org.zanata.webtrans.client.resources.NavigationMessages;
@@ -33,6 +34,7 @@
 import com.google.gwt.uibinder.client.UiField;
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.Image;
+import com.google.gwt.user.client.ui.PushButton;
 import com.google.gwt.user.client.ui.Widget;
 import com.google.inject.Inject;
 
@@ -45,8 +47,8 @@ interface TransUnitNavigationViewUiBinder extends UiBinder<Widget, TransUnitNavi
    {
    }
 
-   @UiField
-   Image nextEntry, prevEntry, prevState, nextState, firstEntry, lastEntry;
+   @UiField(provided = true)
+   PushButton nextEntry, prevEntry, prevState, nextState, firstEntry, lastEntry;
 
    private final NavigationMessages messages;
 
@@ -58,6 +60,14 @@ public TransUnitNavigationView(final NavigationMessages messages, final Resource
    {
       this.resources = resources;
       this.messages = messages;
+
+      nextEntry = new PushButton(new Image(resources.nextEntry()));
+      prevEntry = new PushButton(new Image(resources.prevEntry()));
+      prevState = new PushButton(new Image(resources.prevState()));
+      nextState = new PushButton(new Image(resources.nextState()));
+      firstEntry = new PushButton(new Image(resources.firstEntry()));
+      lastEntry = new PushButton(new Image(resources.lastEntry()));
+
       initWidget(uiBinder.createAndBindUi(this));
 
       prevEntry.setTitle(messages.actionToolTip(messages.prevEntry(), messages.prevEntryShortcut()));
diff --git a/server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.ui.xml b/server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.ui.xml
index 4f73791257..28f12a93ba 100644
--- a/server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.ui.xml
+++ b/server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.ui.xml
@@ -10,13 +10,27 @@
 	       cursor: pointer;
 	       margin-left:40px;
             }
+            
+        .nav-button {
+	       width:35px;
+	       height:12px;
+	       border-radius:5px;   
+        }
+        
+        .rootContainer{
+	    }
+	    
+	    .rootContainer td {
+	       padding-right:5px;
+	
+        }
 	</ui:style>
-	<g:HTMLPanel>
-		    <g:Image resource="{resources.firstEntry}" ui:field="firstEntry" styleName="{style.imageAnchor}"/>
-			<g:Image resource="{resources.prevState}" ui:field="prevState" styleName="{style.imageAnchor}"/>
-			<g:Image resource="{resources.prevEntry}" ui:field="prevEntry" styleName="{style.imageAnchor}"/>
-			<g:Image resource="{resources.nextEntry}" ui:field="nextEntry" styleName="{style.imageAnchor}"/>
-			<g:Image resource="{resources.nextState}" ui:field="nextState" styleName="{style.imageAnchor}"/>
-		    <g:Image resource="{resources.lastEntry}" ui:field="lastEntry" styleName="{style.imageAnchor}"/>
-	</g:HTMLPanel>
+	<g:HorizontalPanel styleName="{style.rootContainer}">
+	   <g:PushButton ui:field="firstEntry" addStyleNames="{style.nav-button}"/>
+	   <g:PushButton ui:field="prevState" addStyleNames="{style.nav-button}"/>
+	   <g:PushButton ui:field="prevEntry" addStyleNames="{style.nav-button}"/>
+	   <g:PushButton ui:field="nextEntry" addStyleNames="{style.nav-button}"/>
+	   <g:PushButton ui:field="nextState" addStyleNames="{style.nav-button}"/>
+	   <g:PushButton ui:field="lastEntry" addStyleNames="{style.nav-button}"/>
+	</g:HorizontalPanel>
 </ui:UiBinder> 
\ No newline at end of file
diff --git a/server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.ui.xml b/server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.ui.xml
index 1088b9e76c..2e9c2edd05 100644
--- a/server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.ui.xml
+++ b/server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.ui.xml
@@ -36,7 +36,7 @@
 	            <g:layer left="7px" width="40%" top="2px" height="23px">
 		            <g:LayoutPanel ui:field="filterPanelContainer" />			    
 	            </g:layer>
-				<g:layer width="50%" right="30px" top="2px" height="23px">
+				<g:layer width="50%" right="30px" top="1px" height="23px">
 						<g:FlowPanel ui:field="transUnitNavigationContainer"  styleName="{style.centerText}"/>
 				</g:layer>
 				<g:layer top="25px" bottom="2em">
diff --git a/server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.ui.xml b/server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.ui.xml
index 13d76d1d2f..76d99b8a3a 100644
--- a/server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.ui.xml
+++ b/server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.ui.xml
@@ -34,7 +34,7 @@
 							<g:LayoutPanel ui:field="editorContainer" />
 						</g:layer>
 
-						<g:layer height="23px" width="80px" right="5px" top="2px">
+						<g:layer height="23px" width="80px" right="5px" top="3px">
 							<g:FlowPanel>
 							    <g:ToggleButton ui:field="toogleOptionsButton"/>
 							</g:FlowPanel>
diff --git a/server/zanata-war/src/main/resources/org/zanata/webtrans/images/first_entry.png b/server/zanata-war/src/main/resources/org/zanata/webtrans/images/first_entry.png
index c4731cff84..d193c63f7a 100644
Binary files a/server/zanata-war/src/main/resources/org/zanata/webtrans/images/first_entry.png and b/server/zanata-war/src/main/resources/org/zanata/webtrans/images/first_entry.png differ
diff --git a/server/zanata-war/src/main/resources/org/zanata/webtrans/images/last_entry.png b/server/zanata-war/src/main/resources/org/zanata/webtrans/images/last_entry.png
index 2c8c717763..7a06f7436f 100644
Binary files a/server/zanata-war/src/main/resources/org/zanata/webtrans/images/last_entry.png and b/server/zanata-war/src/main/resources/org/zanata/webtrans/images/last_entry.png differ
diff --git a/server/zanata-war/src/main/resources/org/zanata/webtrans/images/next_entry.png b/server/zanata-war/src/main/resources/org/zanata/webtrans/images/next_entry.png
index 7a306f465a..9b1cc3411a 100644
Binary files a/server/zanata-war/src/main/resources/org/zanata/webtrans/images/next_entry.png and b/server/zanata-war/src/main/resources/org/zanata/webtrans/images/next_entry.png differ
diff --git a/server/zanata-war/src/main/resources/org/zanata/webtrans/images/next_mode.png b/server/zanata-war/src/main/resources/org/zanata/webtrans/images/next_mode.png
index 804214d3e8..9e92ccd792 100644
Binary files a/server/zanata-war/src/main/resources/org/zanata/webtrans/images/next_mode.png and b/server/zanata-war/src/main/resources/org/zanata/webtrans/images/next_mode.png differ
diff --git a/server/zanata-war/src/main/resources/org/zanata/webtrans/images/prev_entry.png b/server/zanata-war/src/main/resources/org/zanata/webtrans/images/prev_entry.png
index e4184a860b..71311b053c 100644
Binary files a/server/zanata-war/src/main/resources/org/zanata/webtrans/images/prev_entry.png and b/server/zanata-war/src/main/resources/org/zanata/webtrans/images/prev_entry.png differ
diff --git a/server/zanata-war/src/main/resources/org/zanata/webtrans/images/prev_mode.png b/server/zanata-war/src/main/resources/org/zanata/webtrans/images/prev_mode.png
index 4c4c7e6694..08a2005fd9 100644
Binary files a/server/zanata-war/src/main/resources/org/zanata/webtrans/images/prev_mode.png and b/server/zanata-war/src/main/resources/org/zanata/webtrans/images/prev_mode.png differ