diff --git a/CHANGELOG.md b/CHANGELOG.md
index 45cdb9429..57136eb77 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,30 +4,17 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
-## Unreleased
+## [0.28.0] - Unreleased
 
 ### Added
 
-- Broken heart icon for unsubscribe ([#2272](https://github.com/lbryio/lbry-desktop/pull/2272)
-
-### Changed
-
-### Fixed
-
-- Inverse button readability on hover ([#2271](https://github.com/lbryio/lbry-desktop/pull/2271)
-
-## [0.28.0] - 2019-2-5
-
-### Added
-
-- Support for sandbox games and applications - `lbry://@OpenSourceGames` ([#2178](https://github.com/lbryio/lbry-desktop/pull/2178))
+- Support for sandbox games and applications - ```lbry://@OpenSourceGames``` ([#2178](https://github.com/lbryio/lbry-desktop/pull/2178))
 - Call to action on invite page during first run ([#2221](https://github.com/lbryio/lbry-desktop/pull/2221))
 - Responsive related content list for smaller screens ([#2226](https://github.com/lbryio/lbry-desktop/pull/2226))
 - Autoplay content in list of related files (experimental feature in settings) ([#2235](https://github.com/lbryio/lbry-desktop/pull/2235))
 - Support for back/forward mouse navigation on Windows ([#2250](https://github.com/lbryio/lbry-desktop/pull/2250))
 
 ### Changed
-
 - Dark theme as default ([#2210](https://github.com/lbryio/lbry-desktop/pull/2210))
 - Invite page improvements including increase of reward to 20 LBC / 10 redemptions ([#2256](https://github.com/lbryio/lbry-desktop/pull/2256))
 - Less intrusive first run flow, email collection ([#2210](https://github.com/lbryio/lbry-desktop/pull/2210))
@@ -41,14 +28,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Video position on previously viewed files ([#2240](https://github.com/lbryio/lbry-desktop/pull/2240))
 - Pass download error details on modal ([#2255](https://github.com/lbryio/lbry-desktop/pull/2255))
 
-## [0.27.1] - 2019-01-22
+## [0.27.1] - 2018-01-22
 
 ### Fixed
 
 - Channel name overlap on homepage when screen size is small
 - Spacing issue/typo on email collection modal
 
-## [0.27.0] - 2019-01-15
+## [0.27.0] - 2018-01-15
 
 ### Added
 
diff --git a/package.json b/package.json
index 595e8be7b..8cf408b46 100644
--- a/package.json
+++ b/package.json
@@ -135,7 +135,7 @@
     "yarn": "^1.3"
   },
   "lbrySettings": {
-    "lbrynetDaemonVersion": "0.30.4",
+    "lbrynetDaemonVersion": "0.31.0",
     "lbrynetDaemonUrlTemplate": "https://github.com/lbryio/lbry/releases/download/vDAEMONVER/lbrynet-OSNAME.zip",
     "lbrynetDaemonDir": "static/daemon",
     "lbrynetDaemonFileName": "lbrynet"
diff --git a/src/renderer/component/common/icon-custom.jsx b/src/renderer/component/common/icon-custom.jsx
index d21c4941d..d6f214f9c 100644
--- a/src/renderer/component/common/icon-custom.jsx
+++ b/src/renderer/component/common/icon-custom.jsx
@@ -110,8 +110,4 @@ export const customIcons = {
       />
     </g>
   ),
-  // Extended from the feather-icons Heart
-  [ICONS.UNSUBSCRIBE]: buildIcon(
-    <path d="M 12,5.67 10.94,4.61 C 5.7533356,-0.57666427 -2.0266644,7.2033357 3.16,12.39 l 1.06,1.06 7.78,7.78 7.78,-7.78 1.06,-1.06 c 2.149101,-2.148092 2.149101,-5.6319078 0,-7.78 -2.148092,-2.1491008 -5.631908,-2.1491008 -7.78,0 L 9.4481298,8.2303201 15.320603,9.2419066 11.772427,13.723825" />
-  ),
 };
diff --git a/src/renderer/component/fileDetails/view.jsx b/src/renderer/component/fileDetails/view.jsx
index aa2eb9f5b..7e71516b3 100644
--- a/src/renderer/component/fileDetails/view.jsx
+++ b/src/renderer/component/fileDetails/view.jsx
@@ -62,7 +62,14 @@ class FileDetails extends PureComponent<Props> {
     const { description, language, license } = metadata;
 
     const mediaType = contentType || 'unknown';
-    const downloadPath = fileInfo ? path.normalize(fileInfo.download_path) : null;
+    let downloadPath =
+      fileInfo && fileInfo.download_path ? path.normalize(fileInfo.download_path) : null;
+    let downloadNote;
+    // If the path is blank, file is not avialable. Create path from name so the folder opens on click.
+    if (fileInfo && fileInfo.download_path === null) {
+      downloadPath = `${fileInfo.download_directory}/${fileInfo.file_name}`;
+      downloadNote = 'This file may have been moved or deleted';
+    }
 
     return (
       <Fragment>
@@ -99,7 +106,7 @@ class FileDetails extends PureComponent<Props> {
                 <Button
                   button="link"
                   onClick={() => openFolder(downloadPath)}
-                  label={downloadPath}
+                  label={downloadNote || downloadPath}
                 />
               </div>
             )}
diff --git a/src/renderer/component/subscribeButton/view.jsx b/src/renderer/component/subscribeButton/view.jsx
index a03d395a8..91a1d13a6 100644
--- a/src/renderer/component/subscribeButton/view.jsx
+++ b/src/renderer/component/subscribeButton/view.jsx
@@ -43,7 +43,7 @@ export default (props: Props) => {
   return (
     <Button
       iconColor="red"
-      icon={isSubscribed ? ICONS.UNSUBSCRIBE : ICONS.SUBSCRIPTION}
+      icon={isSubscribed ? undefined : ICONS.SUBSCRIPTION}
       button={buttonStyle || 'alt'}
       label={subscriptionLabel}
       onClick={e => {
diff --git a/src/renderer/constants/icons.js b/src/renderer/constants/icons.js
index 52754f7d3..e0bf7c67d 100644
--- a/src/renderer/constants/icons.js
+++ b/src/renderer/constants/icons.js
@@ -27,7 +27,6 @@ export const PHONE = 'Phone';
 export const COMPLETE = 'Check';
 export const COMPLETED = 'CheckCircle';
 export const SUBSCRIPTION = 'Heart';
-export const UNSUBSCRIBE = 'BrokenHeart';
 export const UNLOCK = 'Unlock';
 export const WEB = 'Globe';
 export const SHARE = 'Share2';
diff --git a/src/renderer/page/file/view.jsx b/src/renderer/page/file/view.jsx
index 56bcd5392..e106576a2 100644
--- a/src/renderer/page/file/view.jsx
+++ b/src/renderer/page/file/view.jsx
@@ -58,15 +58,13 @@ class FilePage extends React.Component<Props> {
   ];
 
   componentDidMount() {
-    const { uri, fileInfo, fetchFileInfo, fetchCostInfo, setViewed, isSubscribed } = this.props;
+    const { uri, fetchFileInfo, fetchCostInfo, setViewed, isSubscribed } = this.props;
 
     if (isSubscribed) {
       this.removeFromSubscriptionNotifications();
     }
-
-    if (fileInfo === undefined) {
-      fetchFileInfo(uri);
-    }
+    // always refresh file info when entering file page
+    fetchFileInfo(uri);
 
     // See https://github.com/lbryio/lbry-desktop/pull/1563 for discussion
     fetchCostInfo(uri);
diff --git a/src/renderer/page/settings/view.jsx b/src/renderer/page/settings/view.jsx
index bb821cdd7..a711e1154 100644
--- a/src/renderer/page/settings/view.jsx
+++ b/src/renderer/page/settings/view.jsx
@@ -12,16 +12,17 @@ export type Price = {
   amount: number,
 };
 
+type SetDaemonSettingArg = boolean | string | number | Price;
+
 type DaemonSettings = {
-  download_directory: string,
-  disable_max_key_fee: boolean,
+  download_dir: string,
   share_usage_data: boolean,
   max_key_fee?: Price,
 };
 
 type Props = {
-  setDaemonSetting: (string, boolean | string | Price) => void,
-  setClientSetting: (string, boolean | string | number | Price) => void,
+  setDaemonSetting: (string, ?SetDaemonSettingArg) => void,
+  setClientSetting: (string, SetDaemonSettingArg) => void,
   clearCache: () => Promise<any>,
   getThemes: () => void,
   daemonSettings: DaemonSettings,
@@ -54,6 +55,7 @@ class SettingsPage extends React.PureComponent<Props, State> {
 
     (this: any).onDownloadDirChange = this.onDownloadDirChange.bind(this);
     (this: any).onKeyFeeChange = this.onKeyFeeChange.bind(this);
+    (this: any).onKeyFeeDisableChange = this.onKeyFeeDisableChange.bind(this);
     (this: any).onInstantPurchaseMaxChange = this.onInstantPurchaseMaxChange.bind(this);
     (this: any).onShowNsfwChange = this.onShowNsfwChange.bind(this);
     (this: any).onShareDataChange = this.onShareDataChange.bind(this);
@@ -80,7 +82,7 @@ class SettingsPage extends React.PureComponent<Props, State> {
   }
 
   onDownloadDirChange(newDirectory: string) {
-    this.setDaemonSetting('download_directory', newDirectory);
+    this.setDaemonSetting('download_dir', newDirectory);
   }
 
   onKeyFeeChange(newValue: Price) {
@@ -88,7 +90,7 @@ class SettingsPage extends React.PureComponent<Props, State> {
   }
 
   onKeyFeeDisableChange(isDisabled: boolean) {
-    this.setDaemonSetting('disable_max_key_fee', isDisabled);
+    if (isDisabled) this.setDaemonSetting('max_key_fee');
   }
 
   onThemeChange(event: SyntheticInputEvent<*>) {
@@ -138,7 +140,7 @@ class SettingsPage extends React.PureComponent<Props, State> {
     this.props.setClientSetting(SETTINGS.OS_NOTIFICATIONS_ENABLED, event.target.checked);
   }
 
-  setDaemonSetting(name: string, value: boolean | string | Price) {
+  setDaemonSetting(name: string, value: ?SetDaemonSettingArg): void {
     this.props.setDaemonSetting(name, value);
   }
 
@@ -173,6 +175,9 @@ class SettingsPage extends React.PureComponent<Props, State> {
     const noDaemonSettings = !daemonSettings || Object.keys(daemonSettings).length === 0;
     const isDarkModeEnabled = currentTheme === 'dark';
 
+    const defaultMaxKeyFee = { currency: 'USD', amount: 50 };
+    const disableMaxKeyFee = !(daemonSettings && daemonSettings.max_key_fee);
+
     return (
       <Page>
         {noDaemonSettings ? (
@@ -190,7 +195,7 @@ class SettingsPage extends React.PureComponent<Props, State> {
               <div className="card__content">
                 <FileSelector
                   type="openDirectory"
-                  currentPath={daemonSettings.download_directory}
+                  currentPath={daemonSettings.download_dir}
                   onFileChosen={this.onDownloadDirChange}
                 />
               </div>
@@ -210,7 +215,7 @@ class SettingsPage extends React.PureComponent<Props, State> {
                 <FormField
                   type="radio"
                   name="no_max_purchase_limit"
-                  checked={daemonSettings.disable_max_key_fee}
+                  checked={disableMaxKeyFee}
                   postfix={__('No Limit')}
                   onChange={() => {
                     this.onKeyFeeDisableChange(true);
@@ -219,22 +224,21 @@ class SettingsPage extends React.PureComponent<Props, State> {
                 <FormField
                   type="radio"
                   name="max_purchase_limit"
+                  checked={!disableMaxKeyFee}
                   onChange={() => {
                     this.onKeyFeeDisableChange(false);
+                    this.onKeyFeeChange(defaultMaxKeyFee);
                   }}
-                  checked={!daemonSettings.disable_max_key_fee}
                   postfix={__('Choose limit')}
                 />
-                {!daemonSettings.disable_max_key_fee && (
+                {!disableMaxKeyFee && (
                   <FormFieldPrice
                     name="max_key_fee"
                     label="Max purchase price"
                     min={0}
                     onChange={this.onKeyFeeChange}
                     price={
-                      daemonSettings.max_key_fee
-                        ? daemonSettings.max_key_fee
-                        : { currency: 'USD', amount: 50 }
+                      daemonSettings.max_key_fee ? daemonSettings.max_key_fee : defaultMaxKeyFee
                     }
                   />
                 )}
diff --git a/src/renderer/redux/actions/publish.js b/src/renderer/redux/actions/publish.js
index feda7b504..7c7d556e4 100644
--- a/src/renderer/redux/actions/publish.js
+++ b/src/renderer/redux/actions/publish.js
@@ -1,6 +1,6 @@
 // @flow
 import type { Dispatch, GetState } from 'types/redux';
-import type { Source, Metadata } from 'types/claim';
+import type { Metadata } from 'types/claim';
 import type {
   UpdatePublishFormData,
   UpdatePublishFormAction,
@@ -226,7 +226,6 @@ export const doPublish = (params: PublishParams) => (
     contentIsFree,
     price,
     uri,
-    sources,
   } = params;
 
   // get the claim id from the channel name, we will use that instead
@@ -250,7 +249,6 @@ export const doPublish = (params: PublishParams) => (
     bid: ?number,
     metadata: ?Metadata,
     file_path?: string,
-    sources?: Source,
   } = {
     name,
     channel_id: channelId,
@@ -264,12 +262,8 @@ export const doPublish = (params: PublishParams) => (
       amount: creditsToString(fee.amount),
     };
   }
-
-  if (filePath) {
-    publishPayload.file_path = filePath;
-  } else {
-    publishPayload.sources = sources;
-  }
+  // only pass file on new uploads, not metadata only edits.
+  if (filePath) publishPayload.file_path = filePath;
 
   dispatch({ type: ACTIONS.PUBLISH_START });
 
diff --git a/src/renderer/redux/actions/settings.js b/src/renderer/redux/actions/settings.js
index 08a4626ae..0f20917dc 100644
--- a/src/renderer/redux/actions/settings.js
+++ b/src/renderer/redux/actions/settings.js
@@ -22,8 +22,10 @@ export function doFetchDaemonSettings() {
 
 export function doSetDaemonSetting(key, value) {
   return dispatch => {
-    const newSettings = {};
-    newSettings[key] = value;
+    const newSettings = {
+      key,
+      value: !value && value !== false ? null : value,
+    };
     Lbry.settings_set(newSettings).then(newSettings);
     Lbry.settings_get().then(settings => {
       analytics.toggle(settings.share_usage_data, true);
@@ -71,7 +73,8 @@ export function doUpdateIsNight() {
 export function doUpdateIsNightAsync() {
   return dispatch => {
     dispatch(doUpdateIsNight());
-    const updateIsNightInterval = setInterval(
+
+    setInterval(
       () => dispatch(doUpdateIsNight()),
       UPDATE_IS_NIGHT_INTERVAL
     );
diff --git a/src/renderer/scss/component/_button.scss b/src/renderer/scss/component/_button.scss
index 974c19856..718bc186f 100644
--- a/src/renderer/scss/component/_button.scss
+++ b/src/renderer/scss/component/_button.scss
@@ -124,7 +124,6 @@
 
     html[data-theme='dark'] & {
       background-color: rgba($lbry-white, 0.1);
-      color: $lbry-white;
     }
   }