diff --git a/app/src/main/java/ca/pkay/rcloneexplorer/Fragments/FileExplorerFragment.java b/app/src/main/java/ca/pkay/rcloneexplorer/Fragments/FileExplorerFragment.java
index df9b794..2e26352 100644
--- a/app/src/main/java/ca/pkay/rcloneexplorer/Fragments/FileExplorerFragment.java
+++ b/app/src/main/java/ca/pkay/rcloneexplorer/Fragments/FileExplorerFragment.java
@@ -125,6 +125,10 @@ public class FileExplorerFragment extends Fragment implements   FileExplorerRecy
     private boolean isInMoveMode;
     private SpeedDialView fab;
     private MenuItem menuSelectAll;
+    private MenuItem menuGoTo;
+    private MenuItem menuLink;
+    private MenuItem menuHttpServe;
+    private MenuItem menuEmptyTrash;
     private Boolean isDarkTheme;
     private Boolean isSearchMode;
     private String searchString;
@@ -490,10 +494,11 @@ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         super.onCreateOptionsMenu(menu, inflater);
         inflater.inflate(R.menu.file_explorer_folder_menu, menu);
         menuSelectAll = menu.findItem(R.id.action_select_all);
+        menuGoTo = menu.findItem(R.id.action_go_to);
+        menuLink = menu.findItem(R.id.action_link);
+        menuHttpServe = menu.findItem(R.id.action_http_serve);
+        menuEmptyTrash = menu.findItem(R.id.action_empty_trash);
 
-        if (isInMoveMode) {
-            menuSelectAll.setVisible(false);
-        }
         if (!remote.hasTrashCan()) {
             menu.findItem(R.id.action_empty_trash).setVisible(false);
         }
@@ -504,6 +509,32 @@ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
             menu.findItem(R.id.action_go_to).setVisible(false);
         }
         menu.findItem(R.id.action_wrap_filenames).setChecked(true);
+
+        if (isInMoveMode || recyclerViewAdapter.isInSelectMode()) {
+            setOptionsMenuVisibility(false);
+        }
+    }
+
+    private void setOptionsMenuVisibility(boolean setVisible) {
+        if (menuSelectAll == null || menuGoTo == null || menuLink == null || menuHttpServe == null || menuEmptyTrash == null) {
+            return;
+        }
+
+        menuHttpServe.setVisible(setVisible);
+        if (!setVisible && isInMoveMode) {
+            menuSelectAll.setVisible(false);
+        } else {
+            menuSelectAll.setVisible(true);
+        }
+        if (!remote.isCrypt()) {
+            menuLink.setVisible(setVisible);
+        }
+        if (remote.hasTrashCan()) {
+            menuEmptyTrash.setVisible(setVisible);
+        }
+        if (remote.isRemoteType(RemoteItem.SFTP)) {
+            menuGoTo.setVisible(setVisible);
+        }
     }
 
     @Override
@@ -778,7 +809,7 @@ private void cancelMoveClicked() {
         hideMoveBar();
         fab.show();
         fab.setVisibility(View.VISIBLE);
-        menuSelectAll.setVisible(true);
+        setOptionsMenuVisibility(true);
         recyclerViewAdapter.refreshData();
 
         if (moveStartPath != null && !moveStartPath.equals(directoryObject.getCurrentPath())) {
@@ -808,7 +839,7 @@ private void moveLocationSelected() {
         hideMoveBar();
         fab.show();
         fab.setVisibility(View.VISIBLE);
-        menuSelectAll.setVisible(true);
+        setOptionsMenuVisibility(true);
         recyclerViewAdapter.setMoveMode(false);
         recyclerViewAdapter.refreshData();
         isInMoveMode = false;
@@ -990,6 +1021,9 @@ public boolean onBackButtonPressed() {
         } else if (pathStack.isEmpty()) {
             return false;
         }
+        if (!isInMoveMode && !recyclerViewAdapter.isInSelectMode()) {
+            fab.show();
+        }
         if (fetchDirectoryTask != null) {
             fetchDirectoryTask.cancel(true);
         }
@@ -1043,6 +1077,9 @@ public void onDirectoryClicked(FileItem fileItem, int position) {
         breadcrumbView.addCrumb(fileItem.getName(), fileItem.getPath());
         swipeRefreshLayout.setRefreshing(true);
         pathStack.push(directoryObject.getCurrentPath());
+        if (!isInMoveMode && !recyclerViewAdapter.isInSelectMode()) {
+            fab.show();
+        }
 
         if (isSearchMode) {
             searchClicked();
@@ -1083,6 +1120,7 @@ private void handleFilesSelected() {
             showBottomBar();
             fab.hide();
             fab.setVisibility(View.INVISIBLE);
+            setOptionsMenuVisibility(false);
             if (numOfSelected > 1) {
                 ((FragmentActivity) context).findViewById(R.id.file_rename).setAlpha(.5f);
                 ((FragmentActivity) context).findViewById(R.id.file_rename).setClickable(false);
@@ -1100,6 +1138,7 @@ public void onFileDeselected() {
             hideBottomBar();
             fab.show();
             fab.setVisibility(View.VISIBLE);
+            setOptionsMenuVisibility(true);
         }
     }
 
@@ -1172,6 +1211,9 @@ public void onBreadCrumbClicked(String path) {
         if (isSearchMode) {
             searchClicked();
         }
+        if (!isInMoveMode && !recyclerViewAdapter.isInSelectMode()) {
+            fab.show();
+        }
         if (directoryObject.getCurrentPath().equals(path)) {
             return;
         }
@@ -1298,7 +1340,7 @@ private void moveFiles(List<FileItem> moveItems) {
         isInMoveMode = true;
         ((FragmentActivity) context).setTitle(getString(R.string.select_destination));
         ((FragmentActivity) context).findViewById(R.id.move_bar).setVisibility(View.VISIBLE);
-        menuSelectAll.setVisible(false);
+        setOptionsMenuVisibility(false);
         fab.hide();
         fab.setVisibility(View.INVISIBLE);
     }
diff --git a/app/src/main/res/layout/dialog_file_properties.xml b/app/src/main/res/layout/dialog_file_properties.xml
index b297986..9a7a213 100644
--- a/app/src/main/res/layout/dialog_file_properties.xml
+++ b/app/src/main/res/layout/dialog_file_properties.xml
@@ -11,7 +11,7 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="?attr/textColorPrimary"
+        android:textColor="?attr/colorAccent"
         android:textStyle="bold"
         android:text="@string/filename"/>
     <TextView
@@ -26,7 +26,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:paddingTop="16dp"
-        android:textColor="?attr/textColorPrimary"
+        android:textColor="?attr/colorAccent"
         android:textStyle="bold"
         android:text="@string/modified_time"/>
     <TextView
@@ -41,7 +41,7 @@
         android:id="@+id/file_size_label"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="?attr/textColorPrimary"
+        android:textColor="?attr/colorAccent"
         android:paddingTop="16dp"
         android:textStyle="bold"
         android:text="@string/size"/>
@@ -71,7 +71,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="?attr/textColorPrimary"
+            android:textColor="?attr/colorAccent"
             android:textStyle="bold"
             android:text="@string/md5"/>
         <TextView
@@ -90,7 +90,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="?attr/textColorPrimary"
+            android:textColor="?attr/colorAccent"
             android:paddingTop="16dp"
             android:textStyle="bold"
             android:text="@string/sha1"/>